Plan 9 from Bell Labs 2005-05-02

dist/replica/_plan9.db

@@ -185,7 +185,7 @@
 386/bin/cp - 775 sys sys 1104121996 63215
 386/bin/cpp - 775 sys sys 1113794392 149779
 386/bin/cpu - 775 sys sys 1108354550 137694
-386/bin/crop - 775 sys sys 1104121998 115763
+386/bin/crop - 775 sys sys 1114917029 116008
 386/bin/date - 775 sys sys 1104121998 43261
 386/bin/db - 775 sys sys 1114484869 336153
 386/bin/dc - 775 sys sys 1104121999 99028
@@ -269,7 +269,7 @@
 386/bin/html2ms - 775 sys sys 1104122018 66095
 386/bin/htmlfmt - 775 sys sys 1104122019 160683
 386/bin/ico - 775 sys sys 1106799175 160621
-386/bin/iconv - 775 sys sys 1104122020 113020
+386/bin/iconv - 775 sys sys 1114917030 113265
 386/bin/idiff - 775 sys sys 1104122020 76112
 386/bin/import - 775 sys sys 1104122020 100041
 386/bin/iostats - 775 sys sys 1108354556 97978
@@ -378,7 +378,7 @@
 386/bin/replica/scan - 775 sys sys 1020319083 39
 386/bin/replica/setupdirs - 775 sys sys 1020319083 44
 386/bin/replica/updatedb - 775 sys sys 1104122050 95895
-386/bin/resample - 775 sys sys 1104122050 120495
+386/bin/resample - 775 sys sys 1114917030 120740
 386/bin/rio - 775 sys sys 1111205298 309212
 386/bin/rm - 775 sys sys 1104122051 61333
 386/bin/rx - 775 sys sys 1104122051 82055
@@ -420,10 +420,10 @@
 386/bin/time - 775 sys sys 1104122063 61386
 386/bin/tlsclient - 775 sys sys 1109132004 197187
 386/bin/tlssrv - 775 sys sys 1109132004 197434
-386/bin/togif - 775 sys sys 1108960015 189521
+386/bin/togif - 775 sys sys 1114917030 189766
 386/bin/toico - 775 sys sys 1104122065 123524
-386/bin/topng - 775 sys sys 1108872012 138083
-386/bin/toppm - 775 sys sys 1104122065 164905
+386/bin/topng - 775 sys sys 1114917031 138328
+386/bin/toppm - 775 sys sys 1114917031 165150
 386/bin/touch - 775 sys sys 1104122066 63763
 386/bin/tprof - 775 sys sys 1114484873 289115
 386/bin/tr - 775 sys sys 1104122066 61851
@@ -493,7 +493,7 @@
 386/bin/venti/verifyarena - 775 sys sys 1104122086 104270
 386/bin/venti/wrarena - 775 sys sys 1104122086 176179
 386/bin/venti/write - 775 sys sys 1104122087 102499
-386/bin/vncs - 775 sys sys 1110946101 470895
+386/bin/vncs - 775 sys sys 1114917032 471140
 386/bin/vncv - 775 sys sys 1109132010 518017
 386/bin/vt - 775 sys sys 1106799182 172859
 386/bin/vtdump - 775 sys sys 1104122090 159451
@@ -550,7 +550,7 @@
 386/lib/libip.a - 664 sys sys 1108268398 35602
 386/lib/libl.a - 664 sys sys 1108268398 5384
 386/lib/libmach.a - 664 sys sys 1114484874 755168
-386/lib/libmemdraw.a - 664 sys sys 1110946101 283198
+386/lib/libmemdraw.a - 664 sys sys 1114917033 283978
 386/lib/libmemlayer.a - 664 sys sys 1108699740 47360
 386/lib/libmp.a - 664 sys sys 1108268401 79532
 386/lib/libndb.a - 664 sys sys 1108268401 60666
@@ -5920,7 +5920,7 @@ sys/src/9/pc/screen.h - 664 sys sys 1060267144 3797
 sys/src/9/pc/sd53c8xx.c - 664 sys sys 1112461125 52220
 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 1114197935 51104
+sys/src/9/pc/sdata.c - 664 sys sys 1114981770 51181
 sys/src/9/pc/sdmylex.c - 664 sys sys 1071245460 27812
 sys/src/9/pc/sdscsi.c - 664 sys sys 1077033661 7487
 sys/src/9/pc/trap.c - 664 sys sys 1105109602 20537
@@ -10944,7 +10944,7 @@ sys/src/cmd/tbl - 20000000775 sys sys 954038038 0
 sys/src/cmd/tbl/mkfile - 664 sys sys 944961243 268
 sys/src/cmd/tbl/t.h - 664 sys sys 944961244 3987
 sys/src/cmd/tbl/t0.c - 664 sys sys 944961244 1009
-sys/src/cmd/tbl/t1.c - 664 sys sys 944961244 1544
+sys/src/cmd/tbl/t1.c - 664 sys sys 1114967760 1604
 sys/src/cmd/tbl/t2.c - 664 sys sys 944961244 298
 sys/src/cmd/tbl/t3.c - 664 sys sys 944961244 1836
 sys/src/cmd/tbl/t4.c - 664 sys sys 944961244 8360
@@ -12963,11 +12963,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/crop - 775 sys sys 1114917029 116008
-386/bin/iconv - 775 sys sys 1114917030 113265
-386/bin/resample - 775 sys sys 1114917030 120740
-386/bin/topng - 775 sys sys 1114917031 138328
-386/bin/vncs - 775 sys sys 1114917032 471140
-386/bin/togif - 775 sys sys 1114917030 189766
-386/bin/toppm - 775 sys sys 1114917031 165150
-386/lib/libmemdraw.a - 664 sys sys 1114917033 283978
+386/bin/tbl - 775 sys sys 1115003380 113176

dist/replica/plan9.db

@@ -411,7 +411,7 @@
 386/bin/syscall - 775 sys sys 1104122060 73536
 386/bin/tail - 775 sys sys 1104122060 65938
 386/bin/tar - 775 sys sys 1113794395 96205
-386/bin/tbl - 775 sys sys 1104122061 113124
+386/bin/tbl - 775 sys sys 1115003380 113176
 386/bin/tcs - 775 sys sys 1104122062 256588
 386/bin/tee - 775 sys sys 1104122062 38428
 386/bin/telco - 775 sys sys 1108354564 103315
@@ -5920,7 +5920,7 @@ sys/src/9/pc/screen.h - 664 sys sys 1060267144 3797
 sys/src/9/pc/sd53c8xx.c - 664 sys sys 1112461125 52220
 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 1114197935 51104
+sys/src/9/pc/sdata.c - 664 sys sys 1114981770 51181
 sys/src/9/pc/sdmylex.c - 664 sys sys 1071245460 27812
 sys/src/9/pc/sdscsi.c - 664 sys sys 1077033661 7487
 sys/src/9/pc/trap.c - 664 sys sys 1105109602 20537
@@ -10944,7 +10944,7 @@ sys/src/cmd/tbl - 20000000775 sys sys 954038038 0
 sys/src/cmd/tbl/mkfile - 664 sys sys 944961243 268
 sys/src/cmd/tbl/t.h - 664 sys sys 944961244 3987
 sys/src/cmd/tbl/t0.c - 664 sys sys 944961244 1009
-sys/src/cmd/tbl/t1.c - 664 sys sys 944961244 1544
+sys/src/cmd/tbl/t1.c - 664 sys sys 1114967760 1604
 sys/src/cmd/tbl/t2.c - 664 sys sys 944961244 298
 sys/src/cmd/tbl/t3.c - 664 sys sys 944961244 1836
 sys/src/cmd/tbl/t4.c - 664 sys sys 944961244 8360

dist/replica/plan9.log

@@ -14858,3 +14858,6 @@
 1114918292 5 c 386/bin/togif - 775 sys sys 1114917030 189766
 1114918292 6 c 386/bin/toppm - 775 sys sys 1114917031 165150
 1114918292 7 c 386/lib/libmemdraw.a - 664 sys sys 1114917033 283978
+1114968697 0 c sys/src/cmd/tbl/t1.c - 664 sys sys 1114967760 1604
+1114983105 0 c sys/src/9/pc/sdata.c - 664 sys sys 1114981770 51181
+1115004709 0 c 386/bin/tbl - 775 sys sys 1115003380 113176

sys/src/9/pc/sdata.c

@@ -1222,7 +1222,8 @@ atapktio(Drive* drive, uchar* cmd, int clen)
 	qlock(ctlr);
 
 	as = ataready(cmdport, ctlport, drive->dev, Bsy|Drq, 0, 107*1000);
-	if(as < 0 || (as&Chk)){
+	/* used to test as&Chk as failure too, but some CD readers use that for media change */
+	if(as < 0){
 		qunlock(ctlr);
 		return -1;
 	}

sys/src/cmd/tbl/t1.c

@@ -2,8 +2,8 @@
 #
 # include "t.h"
 
-# define MACROS "/usr/lib/tmac.s"
-# define PYMACS "/usr/lib/tmac.m"
+# define MACROS "/sys/lib/tmac/tmac.s"
+# define PYMACS "/sys/lib/tmac/tmac.m"
 
 
 # define ever (;;)
@@ -43,9 +43,10 @@ setinp(int argc, char **argv)
 	sargv = argv;
 	sargc--; 
 	sargv++;
-	if (sargc > 0)
-		swapin();
-	else {
+	if (sargc > 0) {
+		if(swapin() == 0)
+			error("flags but no input files");
+	} else {
 		tabin = (Biobuf*)getcore(sizeof(Biobuf), 1);
 		Binit(tabin, 0, OREAD);
 	}