Plan 9 from Bell Labs 2005-09-16

dist/replica/_plan9.db

@@ -9506,7 +9506,7 @@ sys/src/cmd/aux/antiword/xmalloc.c - 664 sys sys 1069793877 2185
 sys/src/cmd/aux/antiword/xml.c - 664 sys sys 1069793877 30883
 sys/src/cmd/aux/apm.c - 664 sys sys 1084472324 20263
 sys/src/cmd/aux/astarld.c - 664 sys sys 1015008684 4638
-sys/src/cmd/aux/cddb.c - 664 sys sys 1032059267 4303
+sys/src/cmd/aux/cddb.c - 664 sys sys 1126795279 4610
 sys/src/cmd/aux/clog.c - 664 sys sys 1014925109 1000
 sys/src/cmd/aux/consolefs.c - 664 sys sys 1123094543 20187
 sys/src/cmd/aux/conswdir.c - 664 sys sys 1045504955 2077
@@ -14963,3 +14963,4 @@ usr/glenda/lib/profile - 664 glenda glenda 1105128663 890
 usr/glenda/readme.acme - 664 glenda glenda 1019860628 4753
 usr/glenda/readme.rio - 664 glenda glenda 1019860628 6370
 usr/glenda/tmp - 20000000775 glenda glenda 1018802620 0
+386/bin/aux/cddb - 775 sys sys 1126840256 72218

dist/replica/plan9.db

@@ -87,7 +87,7 @@
 386/bin/aux/antiword - 775 sys sys 1070288096 511478
 386/bin/aux/apm - 775 sys sys 1124939597 174208
 386/bin/aux/astarld - 775 sys sys 1125345953 64683
-386/bin/aux/cddb - 775 sys sys 1125345953 71985
+386/bin/aux/cddb - 775 sys sys 1126840256 72218
 386/bin/aux/clog - 775 sys sys 1125345954 66441
 386/bin/aux/consolefs - 775 sys sys 1125345954 153850
 386/bin/aux/conswdir - 775 sys sys 1062080411 38855
@@ -9506,7 +9506,7 @@ sys/src/cmd/aux/antiword/xmalloc.c - 664 sys sys 1069793877 2185
 sys/src/cmd/aux/antiword/xml.c - 664 sys sys 1069793877 30883
 sys/src/cmd/aux/apm.c - 664 sys sys 1084472324 20263
 sys/src/cmd/aux/astarld.c - 664 sys sys 1015008684 4638
-sys/src/cmd/aux/cddb.c - 664 sys sys 1032059267 4303
+sys/src/cmd/aux/cddb.c - 664 sys sys 1126795279 4610
 sys/src/cmd/aux/clog.c - 664 sys sys 1014925109 1000
 sys/src/cmd/aux/consolefs.c - 664 sys sys 1123094543 20187
 sys/src/cmd/aux/conswdir.c - 664 sys sys 1045504955 2077

dist/replica/plan9.log

@@ -21289,3 +21289,5 @@
 1126668680 0 c 386/bin/disk/fdisk - 775 sys sys 1126667443 103810
 1126697486 0 c sys/lib/acid/kernel - 664 sys sys 1126697446 6307
 1126701087 0 c sys/lib/acid/kernel - 664 sys sys 1126699644 6303
+1126796508 0 c sys/src/cmd/aux/cddb.c - 664 sys sys 1126795279 4610
+1126841518 0 c 386/bin/aux/cddb - 775 sys sys 1126840256 72218

sys/src/cmd/aux/cddb.c

@@ -116,6 +116,17 @@ cddbfilltoc(Toc *t)
 	if((p = Brdline(&bin, '\n')) == nil || atoi(p)/100 != 2)
 		goto died;
 
+	/*
+	 *	Protocol level 6 is the same as level 5 except that
+	 *	the character set is now UTF-8 instead of ISO-8859-1. 
+ 	 */
+	fprint(fd, "proto 6\r\n");
+	DPRINT(2, "proto 6\r\n");
+	if((p = Brdline(&bin, '\n')) == nil || atoi(p)/100 != 2)
+		goto died;
+	p[Blinelen(&bin)-1] = 0;
+	DPRINT(2, "cddb: %s\n", p);
+
 	fprint(fd, "cddb query %8.8lux %d", t->diskid, t->ntrack);
 	DPRINT(2, "cddb query %8.8lux %d", t->diskid, t->ntrack);
 	for(i=0; i<t->ntrack; i++) {