Browse Source

Plan 9 from Bell Labs 2007-05-06

David du Colombier 14 years ago
parent
commit
b6eff04e4f
6 changed files with 21 additions and 35 deletions
  1. 6 7
      dist/replica/_plan9.db
  2. 4 4
      dist/replica/plan9.db
  3. 4 0
      dist/replica/plan9.log
  4. 1 1
      rc/bin/diskparts
  5. 1 0
      sys/games/lib/fortunes
  6. 5 23
      sys/src/cmd/scuzz/scuzz.c

+ 6 - 7
dist/replica/_plan9.db

@@ -49,7 +49,7 @@
 386/bin/auth/changeuser - 775 sys sys 1168402267 97488
 386/bin/auth/convkeys - 775 sys sys 1174964423 88664
 386/bin/auth/convkeys2 - 775 sys sys 1174964423 88723
-386/bin/auth/cron - 775 sys sys 1178316322 145108
+386/bin/auth/cron - 775 sys sys 1178335349 145052
 386/bin/auth/debug - 775 sys sys 1168402268 101566
 386/bin/auth/disable - 775 sys sys 1020319057 146
 386/bin/auth/enable - 775 sys sys 1020319057 134
@@ -189,7 +189,7 @@
 386/bin/compress - 775 sys sys 1173754554 166944
 386/bin/con - 775 sys sys 1168402297 78486
 386/bin/cp - 775 sys sys 1168402297 63454
-386/bin/cpp - 775 sys sys 1168402297 150459
+386/bin/cpp - 775 sys sys 1178335350 150392
 386/bin/cpu - 775 sys sys 1168402297 139484
 386/bin/crop - 775 sys sys 1168402298 116374
 386/bin/cwfs - 775 sys sys 1176520479 366611
@@ -5480,7 +5480,7 @@ rc/bin/delkey - 775 sys sys 1109429137 643
 rc/bin/dial - 20000000775 sys sys 1059180057 0
 rc/bin/diffy - 775 sys sys 1140694870 277
 rc/bin/dircp - 775 sys sys 1169490692 234
-rc/bin/diskparts - 775 sys sys 1177742148 605
+rc/bin/diskparts - 775 sys sys 1178399618 624
 rc/bin/dmaon - 775 sys sys 1178214935 213
 rc/bin/doc2ps - 775 sys sys 1069793831 244
 rc/bin/doc2txt - 775 sys sys 1025197880 563
@@ -5809,7 +5809,7 @@ sys/games - 20000000775 sys sys 1117225532 0
 sys/games/lib - 20000000775 sys sys 1165337608 0
 sys/games/lib/4scores - 10000000666 sys sys 1118680448 0
 sys/games/lib/5scores - 10000000666 sys sys 1118680453 0
-sys/games/lib/fortunes - 664 sys sys 1178249993 264810
+sys/games/lib/fortunes - 664 sys sys 1178418339 265010
 sys/games/lib/mahjongg - 20000000775 sys sys 1095792278 0
 sys/games/lib/mahjongg/backgrounds - 20000000775 sys sys 1095792293 0
 sys/games/lib/mahjongg/backgrounds/default.bit - 664 sys sys 1095792293 346803
@@ -13360,7 +13360,7 @@ sys/src/cmd/scuzz/mkfile - 664 sys sys 1032060571 231
 sys/src/cmd/scuzz/mo.words - 664 sys sys 1177702138 1262
 sys/src/cmd/scuzz/scsireq.c - 664 sys sys 1177702327 13464
 sys/src/cmd/scuzz/scsireq.h - 664 sys sys 1177702200 6958
-sys/src/cmd/scuzz/scuzz.c - 664 sys sys 1177702170 38155
+sys/src/cmd/scuzz/scuzz.c - 664 sys sys 1178401100 37903
 sys/src/cmd/scuzz/sense.c - 664 sys sys 1177702138 5680
 sys/src/cmd/sed.c - 664 sys sys 1100962924 27001
 sys/src/cmd/seq.c - 664 sys sys 1161442158 1691
@@ -15813,5 +15813,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/cpp - 775 sys sys 1178335350 150392
-386/bin/auth/cron - 775 sys sys 1178335349 145052
+386/bin/scuzz - 775 sys sys 1178422014 115094

+ 4 - 4
dist/replica/plan9.db

@@ -397,7 +397,7 @@
 386/bin/sam - 775 sys sys 1168633586 159364
 386/bin/scat - 775 sys sys 1176520494 284766
 386/bin/scp - 775 sys sys 1176520495 152584
-386/bin/scuzz - 775 sys sys 1177730506 115274
+386/bin/scuzz - 775 sys sys 1178422014 115094
 386/bin/sed - 775 sys sys 1168402348 89763
 386/bin/seq - 775 sys sys 1162241047 38441
 386/bin/sha1sum - 775 sys sys 1168402348 61366
@@ -5480,7 +5480,7 @@ rc/bin/delkey - 775 sys sys 1109429137 643
 rc/bin/dial - 20000000775 sys sys 1059180057 0
 rc/bin/diffy - 775 sys sys 1140694870 277
 rc/bin/dircp - 775 sys sys 1169490692 234
-rc/bin/diskparts - 775 sys sys 1177742148 605
+rc/bin/diskparts - 775 sys sys 1178399618 624
 rc/bin/dmaon - 775 sys sys 1178214935 213
 rc/bin/doc2ps - 775 sys sys 1069793831 244
 rc/bin/doc2txt - 775 sys sys 1025197880 563
@@ -5809,7 +5809,7 @@ sys/games - 20000000775 sys sys 1117225532 0
 sys/games/lib - 20000000775 sys sys 1165337608 0
 sys/games/lib/4scores - 10000000666 sys sys 1118680448 0
 sys/games/lib/5scores - 10000000666 sys sys 1118680453 0
-sys/games/lib/fortunes - 664 sys sys 1178249993 264810
+sys/games/lib/fortunes - 664 sys sys 1178418339 265010
 sys/games/lib/mahjongg - 20000000775 sys sys 1095792278 0
 sys/games/lib/mahjongg/backgrounds - 20000000775 sys sys 1095792293 0
 sys/games/lib/mahjongg/backgrounds/default.bit - 664 sys sys 1095792293 346803
@@ -13360,7 +13360,7 @@ sys/src/cmd/scuzz/mkfile - 664 sys sys 1032060571 231
 sys/src/cmd/scuzz/mo.words - 664 sys sys 1177702138 1262
 sys/src/cmd/scuzz/scsireq.c - 664 sys sys 1177702327 13464
 sys/src/cmd/scuzz/scsireq.h - 664 sys sys 1177702200 6958
-sys/src/cmd/scuzz/scuzz.c - 664 sys sys 1177702170 38155
+sys/src/cmd/scuzz/scuzz.c - 664 sys sys 1178401100 37903
 sys/src/cmd/scuzz/sense.c - 664 sys sys 1177702138 5680
 sys/src/cmd/sed.c - 664 sys sys 1100962924 27001
 sys/src/cmd/seq.c - 664 sys sys 1161442158 1691

+ 4 - 0
dist/replica/plan9.log

@@ -48552,3 +48552,7 @@
 1178321411 0 c sys/src/9/port/devcap.c - 664 sys sys 1178320320 4160
 1178335815 0 c 386/bin/cpp - 775 sys sys 1178335350 150392
 1178335815 1 c 386/bin/auth/cron - 775 sys sys 1178335349 145052
+1178400610 0 c rc/bin/diskparts - 775 sys sys 1178399618 624
+1178402416 0 c sys/src/cmd/scuzz/scuzz.c - 664 sys sys 1178401100 37903
+1178418611 0 c sys/games/lib/fortunes - 664 sys sys 1178418339 265010
+1178422217 0 c 386/bin/scuzz - 775 sys sys 1178422014 115094

+ 1 - 1
rc/bin/diskparts

@@ -16,7 +16,7 @@ for(disk in /dev/sd[0-9A-Zabd-z]*) {
 sysname=`{cat /dev/sysname}
 
 # set up any fs(3) partitions
-if (! test -e /dev/fs/ctl)
+if (! test -e /dev/fs/ctl && test -e '#k/fs')
 	bind -a '#k' /dev
 if (~ $#sysname 1 && ! ~ $sysname '' &&
     test -r /cfg/$sysname/fsconfig && test -w /dev/fs/ctl)

+ 1 - 0
sys/games/lib/fortunes

@@ -4179,3 +4179,4 @@ N = C + {fb (cm) . fb (tc)} + fb (Ts) + fc . ta, where N=force in Newtons requir
 It seems that subjective C is more popular than objective C - brucee
 Eta aquarid  meeteeor shouwer - astro -k
 The program 'apt-get' is currently not installed.  You can install it by typing: apt-get install apt  - ubuntu linux
+Subject: Re: [9fans] speaking of kenc... can you imagine a c compiler that does not translate to asm first? or can you imagine porting a c compiler when you dont have an assembler? -- Rogelio Serrano

+ 5 - 23
sys/src/cmd/scuzz/scuzz.c

@@ -1516,18 +1516,6 @@ cmdhelp(ScsiReq *rp, int argc, char *argv[])
 	return 0;
 }
 
-static int atatable[4] = {
-	'C', 'D', 'E', 'F',
-};
-static int scsitable[16] = {
-	'0', '1', '2', '3', '4', '5', '6', '7',
-	'8', '9', 'a', 'b', 'c', 'd', 'e', 'f',
-};
-static int unittable[16] = {
-	'0', '1', '2', '3', '4', '5', '6', '7',
-	'8', '9', 'a', 'b', 'c', 'd', 'e', 'f',
-};
-
 static long
 cmdprobe(ScsiReq *rp, int argc, char *argv[])
 {
@@ -1539,31 +1527,25 @@ cmdprobe(ScsiReq *rp, int argc, char *argv[])
 	rp->status = STok;
 	scsireq.flags = 0;
 
-	for(ctlr="CDEF0123456789abcdef"; *ctlr; ctlr++) {
+	for(ctlr="CDEFGHIJ0123456789abcdef"; *ctlr; ctlr++) {
 		/*
 		 * I can guess how many units you have.
+		 * SATA controllers can have more than two drives each.
 		 */
-		if(*ctlr >= 'C' && *ctlr <= 'F')
+		if(*ctlr >= 'C' && *ctlr <= 'D')
 			unit = "01";
 		else if((*ctlr >= '0' && *ctlr <= '9')
 		     || (*ctlr >= 'a' && *ctlr <= 'f'))
-			unit = "0123456789abcdef";
+			unit = "0123456789abcdef";	/* allow wide scsi */
 		else
-			unit = "012345678";
+			unit = "01234567";
 
 		for(; *unit; unit++){
 			sprint(buf, "/dev/sd%c%c", *ctlr, *unit);
 			if(SRopenraw(&scsireq, buf) == -1)
-				/*
-				return -1;
-				 */
 				continue;
 			SRreqsense(&scsireq);
 			switch(scsireq.status){
-
-			default:
-				break;
-
 			case STok:
 			case Status_SD:
 				Bprint(&bout, "%s: ", buf);