Plan 9 from Bell Labs 2003-11-09

dist/replica/plan9.db

@@ -5296,7 +5296,7 @@ sys/src/9/pc/screen.h - 664 sys sys 1060267144 3797
 sys/src/9/pc/sd53c8xx.c - 664 sys sys 1055689891 52089
 sys/src/9/pc/sd53c8xx.i - 664 sys sys 1045063730 27355
 sys/src/9/pc/sd53c8xx.n - 664 sys sys 1032059019 12455
-sys/src/9/pc/sdata.c - 664 sys sys 1067722685 50288
+sys/src/9/pc/sdata.c - 664 sys sys 1068336178 50325
 sys/src/9/pc/sdmylex.c - 664 sys sys 1015014523 27750
 sys/src/9/pc/sdscsi.c - 664 sys sys 1055689892 7406
 sys/src/9/pc/trap.c - 664 sys sys 1068237910 20045
@@ -10562,9 +10562,9 @@ sys/src/cmd/upas/filterkit/readaddrs.c - 664 sys sys 1018549521 1381
 sys/src/cmd/upas/filterkit/token.c - 664 sys sys 1018549521 1312
 sys/src/cmd/upas/fs - 20000000775 sys sys 988250018 0
 sys/src/cmd/upas/fs/dat.h - 664 sys sys 1047490337 4267
-sys/src/cmd/upas/fs/fs.c - 664 sys sys 1063896947 27346
+sys/src/cmd/upas/fs/fs.c - 664 sys sys 1068350246 27381
 sys/src/cmd/upas/fs/imap4.c - 664 sys sys 1061779754 18103
-sys/src/cmd/upas/fs/mbox.c - 664 sys sys 1063858849 28505
+sys/src/cmd/upas/fs/mbox.c - 664 sys sys 1068350247 28726
 sys/src/cmd/upas/fs/mkfile - 664 sys sys 1047490336 321
 sys/src/cmd/upas/fs/plan9.c - 664 sys sys 1047490343 7464
 sys/src/cmd/upas/fs/pop3.c - 664 sys sys 1063854740 12408

dist/replica/plan9.log

@@ -14199,3 +14199,6 @@
 1068238928 0 c sys/src/9/pc/trap.c - 664 sys sys 1068237910 20045
 1068238928 1 c sys/src/9/port/devproc.c - 664 sys sys 1068237926 28403
 1068246130 0 a sys/src/9/pc/etherrhine.c - 664 sys sys 1068244865 13437
+1068336140 0 c sys/src/9/pc/sdata.c - 664 sys sys 1068336178 50325
+1068350543 0 c sys/src/cmd/upas/fs/fs.c - 664 sys sys 1068350246 27381
+1068350543 1 c sys/src/cmd/upas/fs/mbox.c - 664 sys sys 1068350247 28726

sys/src/9/pc/sdata.c

@@ -694,8 +694,7 @@ retry:
 
 	if(DEBUG & DbgCONFIG){
 		print("dev %2.2uX port %uX config %4.4uX capabilities %4.4uX",
-			dev, cmdport,
-			drive->info[Iconfig], drive->info[Icapabilities]);
+			dev, cmdport, iconfig, drive->info[Icapabilities]);
 		print(" mwdma %4.4uX", drive->info[Imwdma]);
 		if(drive->info[Ivalid] & 0x04)
 			print(" udma %4.4uX", drive->info[Iudma]);
@@ -1852,6 +1851,7 @@ atapnp(void)
 		case (0x4D38<<16)|0x105A:	/* Promise PDC20262 */
 		case (0x4D30<<16)|0x105A:	/* Promise PDC202xx */
 		case (0x4D68<<16)|0x105A:	/* Promise PDC20268 */
+		case (0x3373<<16)|0x105A:	/* Promise 20378 RAID */
 			pi = 0x85;
 			break;
 		case (0x0004<<16)|0x1103:	/* HighPoint HPT-370 */

sys/src/cmd/upas/fs/fs.c

@@ -1362,6 +1362,7 @@ struct Charset {
 	{ "iso-8859-1",		10,	1, nil, },
 	{ "iso-8859-2",		10,	2, "8859-2", },
 	{ "big5",		4,	2, "big5", },
+	{ "iso-2022-jp",	11, 2, "jis", },
 };
 
 int

sys/src/cmd/upas/fs/mbox.c

@@ -1115,6 +1115,15 @@ convert(Message *m)
 			m->bend = x + len;
 			m->ballocd = 1;
 		}
+	} else if(cistrcmp(s_to_c(m->charset), "iso-2022-jp") == 0){
+		len = xtoutf("jis", &x, m->body, m->bend);
+		if(len != 0){
+			if(m->ballocd)
+				free(m->body);
+			m->body = x;
+			m->bend = x + len;
+			m->ballocd = 1;
+		}
 	} else if(cistrcmp(s_to_c(m->charset), "windows-1257") == 0
 			|| cistrcmp(s_to_c(m->charset), "windows-1252") == 0){
 		len = is8bit(m);