Browse Source

Plan 9 from Bell Labs 2005-09-11

David du Colombier 18 years ago
parent
commit
62c5ab2503
5 changed files with 42 additions and 33 deletions
  1. 10 16
      dist/replica/_plan9.db
  2. 3 3
      dist/replica/plan9.db
  3. 3 0
      dist/replica/plan9.log
  4. 20 7
      sys/lib/dist/pc/sub/termrc
  5. 6 7
      sys/src/cmd/dd.c

+ 10 - 16
dist/replica/_plan9.db

@@ -172,7 +172,7 @@
 386/bin/calendar - 775 sys sys 1125345963 80212
 386/bin/cat - 775 sys sys 1115950056 37447
 386/bin/cb - 775 sys sys 1125345963 77510
-386/bin/cdfs - 775 sys sys 1124939600 161202
+386/bin/cdfs - 775 sys sys 1126321689 161177
 386/bin/cfs - 775 sys sys 1115950056 128067
 386/bin/chgrp - 775 sys sys 1115950056 59285
 386/bin/chmod - 775 sys sys 1115950057 62281
@@ -201,17 +201,17 @@
 386/bin/disk - 20000000775 sys sys 984788664 0
 386/bin/disk/dump9660 - 775 sys sys 1125345967 152253
 386/bin/disk/exsort - 775 sys sys 1119496645 60226
-386/bin/disk/fdisk - 775 sys sys 1125345967 103785
-386/bin/disk/format - 775 sys sys 1125345967 89525
+386/bin/disk/fdisk - 775 sys sys 1126321690 103794
+386/bin/disk/format - 775 sys sys 1126321690 89534
 386/bin/disk/kfs - 775 sys sys 1119496646 248974
 386/bin/disk/kfscmd - 775 sys sys 1115950064 38222
 386/bin/disk/ksync - 775 sys sys 1020319074 302
-386/bin/disk/mbr - 775 sys sys 1125345968 73680
+386/bin/disk/mbr - 775 sys sys 1126321690 73689
 386/bin/disk/mk9660 - 775 sys sys 1020319074 144
 386/bin/disk/mkext - 775 sys sys 1125345968 82645
 386/bin/disk/mkfs - 775 sys sys 1125345968 87688
 386/bin/disk/mksacfs - 775 sys sys 1020319074 71451
-386/bin/disk/prep - 775 sys sys 1125345969 97870
+386/bin/disk/prep - 775 sys sys 1126321691 95831
 386/bin/disk/sacfs - 775 sys sys 1020319075 79882
 386/bin/dossrv - 775 sys sys 1125345969 137747
 386/bin/du - 775 sys sys 1115950066 73573
@@ -327,7 +327,7 @@
 386/bin/mount - 775 sys sys 1115950094 73011
 386/bin/ms2html - 775 sys sys 1125345996 103576
 386/bin/mtime - 775 sys sys 1115950094 59139
-386/bin/mv - 775 sys sys 1115950095 65521
+386/bin/mv - 775 sys sys 1126321691 65489
 386/bin/ndb - 20000000775 sys sys 985743147 0
 386/bin/ndb/cs - 775 sys sys 1125345996 149228
 386/bin/ndb/csquery - 775 sys sys 1125345996 61467
@@ -542,7 +542,7 @@
 386/lib/libc.a - 664 sys sys 1124766768 502522
 386/lib/libcomplete.a - 664 sys sys 1115950151 6370
 386/lib/libcontrol.a - 664 sys sys 1115950152 274922
-386/lib/libdisk.a - 664 sys sys 1115950152 42234
+386/lib/libdisk.a - 664 sys sys 1126321691 42236
 386/lib/libdraw.a - 664 sys sys 1115950153 373428
 386/lib/libflate.a - 664 sys sys 1115950153 76872
 386/lib/libframe.a - 664 sys sys 1115950153 66060
@@ -6218,7 +6218,7 @@ sys/lib/dist/pc/sub/pci - 775 sys sys 1018469726 52
 sys/lib/dist/pc/sub/pwd - 664 sys sys 1018469726 59
 sys/lib/dist/pc/sub/ramfs - 775 sys sys 1063856126 48
 sys/lib/dist/pc/sub/sleep - 664 sys sys 1018469726 118
-sys/lib/dist/pc/sub/termrc - 664 sys sys 1063856126 1965
+sys/lib/dist/pc/sub/termrc - 664 sys sys 1126355274 2209
 sys/lib/dist/pc/sub/unmount - 664 sys sys 1018469726 46
 sys/lib/dist/pc/sub/users - 664 sys sys 1018469726 103
 sys/lib/dist/pc/sub/vmware - 775 sys sys 1033073493 132
@@ -9803,7 +9803,7 @@ sys/src/cmd/db/runpcs.c - 664 sys sys 1014925293 2929
 sys/src/cmd/db/setup.c - 664 sys sys 1014925293 3581
 sys/src/cmd/db/trcrun.c - 664 sys sys 1016731556 4432
 sys/src/cmd/dc.c - 664 sys sys 1121977159 36572
-sys/src/cmd/dd.c - 664 sys sys 1055693435 11721
+sys/src/cmd/dd.c - 664 sys sys 1126360951 11753
 sys/src/cmd/deroff.c - 664 sys sys 1017679319 14611
 sys/src/cmd/dial - 20000000775 sys sys 1058789955 0
 sys/src/cmd/dial/at.c - 664 sys sys 1058789951 2011
@@ -14962,10 +14962,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/cdfs - 775 sys sys 1126321689 161177
-386/bin/mv - 775 sys sys 1126321691 65489
-386/bin/disk/fdisk - 775 sys sys 1126321690 103794
-386/bin/disk/format - 775 sys sys 1126321690 89534
-386/bin/disk/mbr - 775 sys sys 1126321690 73689
-386/bin/disk/prep - 775 sys sys 1126321691 95831
-386/lib/libdisk.a - 664 sys sys 1126321691 42236
+386/bin/dd - 775 sys sys 1126408183 45398

+ 3 - 3
dist/replica/plan9.db

@@ -189,7 +189,7 @@
 386/bin/date - 775 sys sys 1115950059 43261
 386/bin/db - 775 sys sys 1125345965 336317
 386/bin/dc - 775 sys sys 1125345966 99019
-386/bin/dd - 775 sys sys 1115950060 45347
+386/bin/dd - 775 sys sys 1126408183 45398
 386/bin/deroff - 775 sys sys 1125345966 74235
 386/bin/dial - 20000000775 sys sys 1058790015 0
 386/bin/dial/at - 775 sys sys 1115950061 60779
@@ -6218,7 +6218,7 @@ sys/lib/dist/pc/sub/pci - 775 sys sys 1018469726 52
 sys/lib/dist/pc/sub/pwd - 664 sys sys 1018469726 59
 sys/lib/dist/pc/sub/ramfs - 775 sys sys 1063856126 48
 sys/lib/dist/pc/sub/sleep - 664 sys sys 1018469726 118
-sys/lib/dist/pc/sub/termrc - 664 sys sys 1063856126 1965
+sys/lib/dist/pc/sub/termrc - 664 sys sys 1126355274 2209
 sys/lib/dist/pc/sub/unmount - 664 sys sys 1018469726 46
 sys/lib/dist/pc/sub/users - 664 sys sys 1018469726 103
 sys/lib/dist/pc/sub/vmware - 775 sys sys 1033073493 132
@@ -9803,7 +9803,7 @@ sys/src/cmd/db/runpcs.c - 664 sys sys 1014925293 2929
 sys/src/cmd/db/setup.c - 664 sys sys 1014925293 3581
 sys/src/cmd/db/trcrun.c - 664 sys sys 1016731556 4432
 sys/src/cmd/dc.c - 664 sys sys 1121977159 36572
-sys/src/cmd/dd.c - 664 sys sys 1055693435 11721
+sys/src/cmd/dd.c - 664 sys sys 1126360951 11753
 sys/src/cmd/deroff.c - 664 sys sys 1017679319 14611
 sys/src/cmd/dial - 20000000775 sys sys 1058789955 0
 sys/src/cmd/dial/at.c - 664 sys sys 1058789951 2011

+ 3 - 0
dist/replica/plan9.log

@@ -21264,3 +21264,6 @@
 1126323053 4 c 386/bin/disk/mbr - 775 sys sys 1126321690 73689
 1126323053 5 c 386/bin/disk/prep - 775 sys sys 1126321691 95831
 1126323053 6 c 386/lib/libdisk.a - 664 sys sys 1126321691 42236
+1126355461 0 c sys/lib/dist/pc/sub/termrc - 664 sys sys 1126355274 2209
+1126362662 0 c sys/src/cmd/dd.c - 664 sys sys 1126360951 11753
+1126409473 0 c 386/bin/dd - 775 sys sys 1126408183 45398

+ 20 - 7
sys/lib/dist/pc/sub/termrc

@@ -53,6 +53,26 @@ if(test -f /n/a:/vgadb)
 
 aux/vmware
 
+# configure loopback device without touching /net/ndb
+{
+	echo bind loopback /dev/null
+	echo add 127.0.0.1 255.255.255.0 
+} >/net/ipifc/clone
+
+if(~ $installmode ask){
+	echo -n 'install mode is (text, graphics)[graphics]: '
+	installmode=`{read}
+	if(~ $#installmode 0)
+		installmode=graphics
+}
+if(~ $installmode text){
+	mouseport=()
+	vgasize=()
+	monitor=()
+}
+if not
+	installmode=graphics
+	
 if(~ $mouseport ask){
 	echo -n 'mouseport is (ps2, ps2intellimouse, 0, 1, 2)[ps2]: '
 	mouseport=`{read}
@@ -71,7 +91,6 @@ if(~ $monitor ask){
 	if(~ $#monitor 0)
 		monitor=xga
 }
-
 if(~ $#mouseport 1) {
 	aux/mouse $mouseport
 	if(~ $#vgasize 1 && ! ~ $vgasize '') {
@@ -87,9 +106,3 @@ if(~ $#mouseport 1) {
 	}
 }
 
-# configure loopback device without touching /net/ndb
-{
-	echo bind loopback /dev/null
-	echo add 127.0.0.1 255.255.255.0 
-} >/net/ipifc/clone
-

+ 6 - 7
sys/src/cmd/dd.c

@@ -51,7 +51,7 @@ void	unblock(int cc);
 void	ebcdic(int cc);
 void	ibm(int cc);
 void	block(int cc);
-void	term(void);
+void	term(char*);
 void	stats(void);
 
 #define	iskey(s)	((key[0] == '-') && (strcmp(key+1, s) == 0))
@@ -248,7 +248,7 @@ loop:
 			perror("read");
 			if((cflag&NERR) == 0) {
 				flsh();
-				term();
+				term("errors");
 			}
 			ibc = 0;
 			for(c=0; c<ibs; c++)
@@ -258,7 +258,7 @@ loop:
 			stats();
 		}else if(ibc == 0 && --files<=0) {
 			flsh();
-			term();
+			term(nil);
 		}
 		if(ibc != ibs) {
 			nipr++;
@@ -300,7 +300,7 @@ flsh(void)
 			if(c > 0)
 				++nopr;
 			perror("write");
-			term();
+			term("errors");
 		}
 		if(obc == obs)
 			nofr++;
@@ -541,11 +541,10 @@ block(int cc)
 }
 
 void
-term(void)
+term(char *status)
 {
-
 	stats();
-	exits(0);
+	exits(status);
 }
 
 void