Browse Source

Plan 9 from Bell Labs 2005-04-25

David du Colombier 16 years ago
parent
commit
58abf52ebf

+ 4 - 3
dist/replica/_plan9.db

@@ -4037,7 +4037,7 @@ sys/lib/dist/bin/386 - 20000000775 sys sys 1018720418 0
 sys/lib/dist/cdstub - 20000000555 sys sys 1018640690 0
 sys/lib/dist/cdstub/bootdisk.img - 664 sys sys 1019324215 0
 sys/lib/dist/cmd - 20000000775 sys sys 1018641008 0
-sys/lib/dist/cmd/bargraph.c - 664 sys sys 1063858117 5849
+sys/lib/dist/cmd/bargraph.c - 664 sys sys 1114364700 5871
 sys/lib/dist/cmd/bflz.c - 664 sys sys 1033073375 6115
 sys/lib/dist/cmd/bzfs - 20000000775 sys sys 1018641007 0
 sys/lib/dist/cmd/bzfs/bzfs.h - 664 sys sys 1018469727 223
@@ -4056,6 +4056,7 @@ sys/lib/dist/logcompress.awk - 664 sys sys 1068558028 298
 sys/lib/dist/logtime.awk - 664 sys sys 1019526213 38
 sys/lib/dist/mkfile - 664 sys sys 1109511736 3842
 sys/lib/dist/pc - 20000000775 sys sys 1018721419 0
+sys/lib/dist/pc/cd0.proto - 664 sys sys 1114358485 7
 sys/lib/dist/pc/empty - 20000000775 sys sys 1018469720 0
 sys/lib/dist/pc/emptyfile - 664 sys sys 1018469722 0
 sys/lib/dist/pc/glenda - 20000000775 sys sys 1018469723 0
@@ -4065,7 +4066,7 @@ sys/lib/dist/pc/glenda/bin/rc - 20000000775 sys sys 1018469722 0
 sys/lib/dist/pc/glenda/bin/rc/riostart - 775 sys sys 1018469723 96
 sys/lib/dist/pc/glenda/lib - 20000000775 sys sys 1018469723 0
 sys/lib/dist/pc/glenda/lib/first.window - 775 sys sys 1018469723 143
-sys/lib/dist/pc/glenda/lib/profile - 664 sys sys 1032883600 327
+sys/lib/dist/pc/glenda/lib/profile - 664 sys sys 1114364353 359
 sys/lib/dist/pc/glenda/tmp - 20000000775 sys sys 1018469723 0
 sys/lib/dist/pc/inst - 20000000775 sys sys 1018721419 0
 sys/lib/dist/pc/inst/bootfloppy - 775 sys sys 1112361036 903
@@ -4116,7 +4117,7 @@ sys/lib/dist/pc/inst/stopppp - 775 sys sys 1018469719 250
 sys/lib/dist/pc/inst/textonly - 775 sys sys 1112361039 182
 sys/lib/dist/pc/inst/watchfd - 775 sys sys 1112361039 361
 sys/lib/dist/pc/inst/xxx - 775 sys sys 1018469719 160
-sys/lib/dist/pc/mkfile - 664 sys sys 1063856155 2026
+sys/lib/dist/pc/mkfile - 664 sys sys 1114364348 2045
 sys/lib/dist/pc/plan9.ini - 664 sys sys 1020361168 512
 sys/lib/dist/pc/plan9.ini.blank - 664 sys sys 1018469720 512
 sys/lib/dist/pc/plan9.ini.cd - 664 sys sys 1092148201 357

+ 4 - 3
dist/replica/plan9.db

@@ -4037,7 +4037,7 @@ sys/lib/dist/bin/386 - 20000000775 sys sys 1018720418 0
 sys/lib/dist/cdstub - 20000000555 sys sys 1018640690 0
 sys/lib/dist/cdstub/bootdisk.img - 664 sys sys 1019324215 0
 sys/lib/dist/cmd - 20000000775 sys sys 1018641008 0
-sys/lib/dist/cmd/bargraph.c - 664 sys sys 1063858117 5849
+sys/lib/dist/cmd/bargraph.c - 664 sys sys 1114364700 5871
 sys/lib/dist/cmd/bflz.c - 664 sys sys 1033073375 6115
 sys/lib/dist/cmd/bzfs - 20000000775 sys sys 1018641007 0
 sys/lib/dist/cmd/bzfs/bzfs.h - 664 sys sys 1018469727 223
@@ -4056,6 +4056,7 @@ sys/lib/dist/logcompress.awk - 664 sys sys 1068558028 298
 sys/lib/dist/logtime.awk - 664 sys sys 1019526213 38
 sys/lib/dist/mkfile - 664 sys sys 1109511736 3842
 sys/lib/dist/pc - 20000000775 sys sys 1018721419 0
+sys/lib/dist/pc/cd0.proto - 664 sys sys 1114358485 7
 sys/lib/dist/pc/empty - 20000000775 sys sys 1018469720 0
 sys/lib/dist/pc/emptyfile - 664 sys sys 1018469722 0
 sys/lib/dist/pc/glenda - 20000000775 sys sys 1018469723 0
@@ -4065,7 +4066,7 @@ sys/lib/dist/pc/glenda/bin/rc - 20000000775 sys sys 1018469722 0
 sys/lib/dist/pc/glenda/bin/rc/riostart - 775 sys sys 1018469723 96
 sys/lib/dist/pc/glenda/lib - 20000000775 sys sys 1018469723 0
 sys/lib/dist/pc/glenda/lib/first.window - 775 sys sys 1018469723 143
-sys/lib/dist/pc/glenda/lib/profile - 664 sys sys 1032883600 327
+sys/lib/dist/pc/glenda/lib/profile - 664 sys sys 1114364353 359
 sys/lib/dist/pc/glenda/tmp - 20000000775 sys sys 1018469723 0
 sys/lib/dist/pc/inst - 20000000775 sys sys 1018721419 0
 sys/lib/dist/pc/inst/bootfloppy - 775 sys sys 1112361036 903
@@ -4116,7 +4117,7 @@ sys/lib/dist/pc/inst/stopppp - 775 sys sys 1018469719 250
 sys/lib/dist/pc/inst/textonly - 775 sys sys 1112361039 182
 sys/lib/dist/pc/inst/watchfd - 775 sys sys 1112361039 361
 sys/lib/dist/pc/inst/xxx - 775 sys sys 1018469719 160
-sys/lib/dist/pc/mkfile - 664 sys sys 1063856155 2026
+sys/lib/dist/pc/mkfile - 664 sys sys 1114364348 2045
 sys/lib/dist/pc/plan9.ini - 664 sys sys 1020361168 512
 sys/lib/dist/pc/plan9.ini.blank - 664 sys sys 1018469720 512
 sys/lib/dist/pc/plan9.ini.cd - 664 sys sys 1092148201 357

+ 4 - 0
dist/replica/plan9.log

@@ -14736,3 +14736,7 @@
 1114227170 4 c 386/bin/rc - 775 sys sys 1114225966 143210
 1114227170 5 c 386/bin/tprof - 775 sys sys 1114225968 256583
 1114227170 6 c 386/lib/libmach.a - 664 sys sys 1114225969 658810
+1114358495 0 a sys/lib/dist/pc/cd0.proto - 664 sys sys 1114358485 7
+1114365697 0 c sys/lib/dist/cmd/bargraph.c - 664 sys sys 1114364700 5871
+1114365697 1 c sys/lib/dist/pc/glenda/lib/profile - 664 sys sys 1114364353 359
+1114365697 2 c sys/lib/dist/pc/mkfile - 664 sys sys 1114364348 2045

+ 5 - 2
sys/lib/dist/cmd/bargraph.c

@@ -126,7 +126,10 @@ bar(Biobuf *b)
 	parent = getpid();
 
 	die = 0;
-	if(!textmode) switch(child = rfork(RFMEM|RFPROC)) {
+	if(textmode)
+		child = -1;
+	else
+	switch(child = rfork(RFMEM|RFPROC)) {
 	case 0:
 		sleep(1000);
 		while(!die && (k = eread(Ekeyboard|Emouse, &e))) {
@@ -148,7 +151,6 @@ bar(Biobuf *b)
 		drawbar();
 	}
 	postnote(PNCTL, child, "kill");
-	die = 1;
 }
 
 
@@ -258,6 +260,7 @@ newwin(char *win)
 		pid  = 0;			/* can't send notes to remote processes! */
 	}else
 		pid = getpid();
+	USED(pid);
 	srvfd = open(srv, ORDWR);
 	free(srv);
 	if(srvfd == -1){

+ 1 - 0
sys/lib/dist/pc/cd0.proto

@@ -0,0 +1 @@
+cddisk

+ 4 - 2
sys/lib/dist/pc/glenda/lib/profile

@@ -1,5 +1,7 @@
-echo -n accelerated > '#m/mousectl'
-echo -n 'res 3' > '#m/mousectl'
+if(test -f '#m/mousectl') {
+	echo -n accelerated > '#m/mousectl'
+	echo -n 'res 3' > '#m/mousectl'
+}
 user=`{cat /dev/user}
 home=/usr/$user
 bind -a $home/bin/rc /bin

+ 1 - 1
sys/lib/dist/pc/mkfile

@@ -67,7 +67,7 @@ cddisk:D: 9load /sys/src/9/pc/9pcflop.gz plan9.ini.cd /lib/vgadb /sys/src/9/pc/9
 	ls -l cddisk
 
 clean:V:
-	rm -rf boot boot.bz2 root.bz2 9pcflop ndisk 9load cddisk proto.cp 9loaddebug
+	rm -rf boot boot.bz2 boot.bflz boot.raw root.bz2 9pcflop ndisk 9load cddisk proto.cp 9loaddebug
 
 install:V: ndisk 9loaddebug
 	cp 9loaddebug ../web.protect2