Browse Source

Plan 9 from Bell Labs 2008-07-28

David du Colombier 12 years ago
parent
commit
8b6352078b

+ 0 - 1
386/bin/aux/vmware

@@ -14,7 +14,6 @@ if(aux/isvmware -s){
 	}
 
 	dmaon
-	echo -n hwaccel off >/dev/vgactl
 	aux/vmwarefs
 
 	if(! test -f /dev/snarf)

+ 17 - 17
dist/replica/_plan9.db

@@ -153,7 +153,7 @@
 386/bin/aux/usage - 775 sys sys 1168402288 59809
 386/bin/aux/vga - 775 sys sys 1210392593 334946
 386/bin/aux/vmmousepoll - 775 sys sys 1032480572 41434
-386/bin/aux/vmware - 775 sys sys 1215545344 532
+386/bin/aux/vmware - 775 sys sys 1217186676 498
 386/bin/aux/vmwarefs - 775 sys sys 1095563640 99117
 386/bin/aux/write - 775 sys sys 1085077011 4188
 386/bin/aux/zerotrunc - 775 sys sys 1108268388 3891
@@ -5521,7 +5521,7 @@ rc/bin/cpurc.local - 775 sys sys 1210371417 367
 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 1186289104 181
+rc/bin/dircp - 775 sys sys 1217181481 197
 rc/bin/diskparts - 775 sys sys 1213893784 1066
 rc/bin/dmaon - 775 sys sys 1205288448 220
 rc/bin/doc2ps - 775 sys sys 1205813503 338
@@ -5540,7 +5540,7 @@ rc/bin/ipconf/inside - 775 sys sys 1058790955 427
 rc/bin/ipconf/lra - 775 sys sys 1058791152 1558
 rc/bin/ipconf/outside - 775 sys sys 1058790951 550
 rc/bin/ipconf/theworld - 775 sys sys 1058790940 1212
-rc/bin/ipso - 775 sys sys 1201722823 3048
+rc/bin/ipso - 775 sys sys 1217181592 3056
 rc/bin/ipv6on - 775 sys sys 1186362803 2047
 rc/bin/iwhois - 775 sys sys 1203659863 1883
 rc/bin/juke - 775 sys sys 1105565140 1131
@@ -5560,17 +5560,17 @@ rc/bin/mousereset - 775 sys sys 1015089542 37
 rc/bin/nroff - 775 sys sys 945617208 27
 rc/bin/patch - 20000000775 sys sys 1155363651 0
 rc/bin/patch/applied - 775 sys sys 1115941614 111
-rc/bin/patch/apply - 775 sys sys 1109511606 1285
-rc/bin/patch/create - 775 sys sys 1191217103 1516
-rc/bin/patch/diff - 775 sys sys 1192305220 561
-rc/bin/patch/list - 775 sys sys 1196100902 816
+rc/bin/patch/apply - 775 sys sys 1217181785 1293
+rc/bin/patch/create - 775 sys sys 1217181811 1524
+rc/bin/patch/diff - 775 sys sys 1217181872 681
+rc/bin/patch/list - 775 sys sys 1217181980 841
 rc/bin/patch/move - 775 sys sys 1112166652 643
-rc/bin/patch/note - 664 sys sys 1109511607 663
+rc/bin/patch/note - 664 sys sys 1217182043 671
 rc/bin/patch/okay - 775 sys sys 1109511608 250
 rc/bin/patch/remove - 775 sys sys 1109511608 285
 rc/bin/patch/save - 775 sys sys 1110722753 106
 rc/bin/patch/sorry - 775 sys sys 1081200166 107
-rc/bin/patch/undo - 775 sys sys 1109511608 557
+rc/bin/patch/undo - 775 sys sys 1217182024 565
 rc/bin/pc - 20000000775 sys sys 1039727910 0
 rc/bin/pc/bootfloppy - 775 sys sys 964455816 439
 rc/bin/pc/bootplan9 - 775 sys sys 960857446 1639
@@ -5582,7 +5582,7 @@ rc/bin/pc/personalize - 775 sys sys 959698938 99
 rc/bin/pc/setup.9fat - 775 sys sys 960857447 546
 rc/bin/pc/setup.disk - 775 sys sys 960857447 579
 rc/bin/pc/update - 775 sys sys 960235807 468
-rc/bin/pci - 775 sys sys 1203980337 924
+rc/bin/pci - 775 sys sys 1217181596 931
 rc/bin/pdf2ps - 775 sys sys 1210371045 895
 rc/bin/postscript - 20000000775 sys sys 1020896376 0
 rc/bin/printfont - 775 sys sys 945617208 2851
@@ -6320,7 +6320,7 @@ sys/lib/dist/pc/sub/sleep - 664 sys sys 1018469726 118
 sys/lib/dist/pc/sub/termrc - 664 sys sys 1133187769 2466
 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
+sys/lib/dist/pc/sub/vmware - 775 sys sys 1217180986 334
 sys/lib/dist/setup - 775 sys sys 1200515222 190
 sys/lib/eqnchar - 664 sys sys 944956052 2727
 sys/lib/fax - 20000000775 sys sys 1039727360 0
@@ -7879,7 +7879,7 @@ sys/man/8/mouse - 664 sys sys 1196638947 2476
 sys/man/8/na - 664 sys sys 1196638947 859
 sys/man/8/ndb - 664 sys sys 1207767560 15239
 sys/man/8/newuser - 664 sys sys 1196638947 2418
-sys/man/8/nfsserver - 664 sys sys 1196638947 3576
+sys/man/8/nfsserver - 664 sys sys 1217138303 3807
 sys/man/8/partfs - 664 sys sys 1196638947 869
 sys/man/8/pci - 664 sys sys 1203983723 591
 sys/man/8/pcmcia - 664 sys sys 1196638947 408
@@ -9180,7 +9180,7 @@ sys/src/boot/pc/ahci.h - 664 sys sys 1199911245 6283
 sys/src/boot/pc/alarm.c - 664 sys sys 1015007947 1668
 sys/src/boot/pc/aoe.h - 664 sys sys 1193336543 826
 sys/src/boot/pc/apm.c - 664 sys sys 1015007947 289
-sys/src/boot/pc/bcom.c - 664 sys sys 1212010473 6460
+sys/src/boot/pc/bcom.c - 664 sys sys 1217188102 6470
 sys/src/boot/pc/boot.c - 664 sys sys 1130887226 8421
 sys/src/boot/pc/bootld.c - 664 sys sys 1015007948 1801
 sys/src/boot/pc/bootp.c - 664 sys sys 1216859040 12923
@@ -12807,12 +12807,12 @@ sys/src/cmd/md5sum.c - 664 sys sys 1194215423 1090
 sys/src/cmd/mk - 20000000775 sys sys 1056337347 0
 sys/src/cmd/mk/acid - 664 sys sys 1055698806 10395
 sys/src/cmd/mk/arc.c - 664 sys sys 1131129236 826
-sys/src/cmd/mk/archive.c - 664 sys sys 1131129659 3071
+sys/src/cmd/mk/archive.c - 664 sys sys 1217185909 3083
 sys/src/cmd/mk/bufblock.c - 664 sys sys 944961024 1338
 sys/src/cmd/mk/env.c - 664 sys sys 1182892801 2307
 sys/src/cmd/mk/file.c - 664 sys sys 1131129253 1299
 sys/src/cmd/mk/fns.h - 664 sys sys 1055698809 2199
-sys/src/cmd/mk/graph.c - 664 sys sys 1131128904 5822
+sys/src/cmd/mk/graph.c - 664 sys sys 1217185903 5835
 sys/src/cmd/mk/job.c - 664 sys sys 944961025 692
 sys/src/cmd/mk/lex.c - 664 sys sys 1143749754 2304
 sys/src/cmd/mk/main.c - 664 sys sys 1122474474 4790
@@ -12822,9 +12822,9 @@ sys/src/cmd/mk/mk.h - 664 sys sys 1131128809 3765
 sys/src/cmd/mk/mkconv - 775 sys sys 944961025 555
 sys/src/cmd/mk/mkfile - 664 sys sys 1055698812 376
 sys/src/cmd/mk/parse.c - 664 sys sys 944961025 5310
-sys/src/cmd/mk/plan9.c - 664 sys sys 1182916397 6967
+sys/src/cmd/mk/plan9.c - 664 sys sys 1217185887 7085
 sys/src/cmd/mk/rc.c - 664 sys sys 944961025 3206
-sys/src/cmd/mk/recipe.c - 664 sys sys 1182916343 2528
+sys/src/cmd/mk/recipe.c - 664 sys sys 1217185891 2551
 sys/src/cmd/mk/rule.c - 664 sys sys 1203808956 1945
 sys/src/cmd/mk/run.c - 664 sys sys 1182916224 5066
 sys/src/cmd/mk/shprint.c - 664 sys sys 1182916066 1523

+ 17 - 17
dist/replica/plan9.db

@@ -153,7 +153,7 @@
 386/bin/aux/usage - 775 sys sys 1168402288 59809
 386/bin/aux/vga - 775 sys sys 1210392593 334946
 386/bin/aux/vmmousepoll - 775 sys sys 1032480572 41434
-386/bin/aux/vmware - 775 sys sys 1215545344 532
+386/bin/aux/vmware - 775 sys sys 1217186676 498
 386/bin/aux/vmwarefs - 775 sys sys 1095563640 99117
 386/bin/aux/write - 775 sys sys 1085077011 4188
 386/bin/aux/zerotrunc - 775 sys sys 1108268388 3891
@@ -5521,7 +5521,7 @@ rc/bin/cpurc.local - 775 sys sys 1210371417 367
 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 1186289104 181
+rc/bin/dircp - 775 sys sys 1217181481 197
 rc/bin/diskparts - 775 sys sys 1213893784 1066
 rc/bin/dmaon - 775 sys sys 1205288448 220
 rc/bin/doc2ps - 775 sys sys 1205813503 338
@@ -5540,7 +5540,7 @@ rc/bin/ipconf/inside - 775 sys sys 1058790955 427
 rc/bin/ipconf/lra - 775 sys sys 1058791152 1558
 rc/bin/ipconf/outside - 775 sys sys 1058790951 550
 rc/bin/ipconf/theworld - 775 sys sys 1058790940 1212
-rc/bin/ipso - 775 sys sys 1201722823 3048
+rc/bin/ipso - 775 sys sys 1217181592 3056
 rc/bin/ipv6on - 775 sys sys 1186362803 2047
 rc/bin/iwhois - 775 sys sys 1203659863 1883
 rc/bin/juke - 775 sys sys 1105565140 1131
@@ -5560,17 +5560,17 @@ rc/bin/mousereset - 775 sys sys 1015089542 37
 rc/bin/nroff - 775 sys sys 945617208 27
 rc/bin/patch - 20000000775 sys sys 1155363651 0
 rc/bin/patch/applied - 775 sys sys 1115941614 111
-rc/bin/patch/apply - 775 sys sys 1109511606 1285
-rc/bin/patch/create - 775 sys sys 1191217103 1516
-rc/bin/patch/diff - 775 sys sys 1192305220 561
-rc/bin/patch/list - 775 sys sys 1196100902 816
+rc/bin/patch/apply - 775 sys sys 1217181785 1293
+rc/bin/patch/create - 775 sys sys 1217181811 1524
+rc/bin/patch/diff - 775 sys sys 1217181872 681
+rc/bin/patch/list - 775 sys sys 1217181980 841
 rc/bin/patch/move - 775 sys sys 1112166652 643
-rc/bin/patch/note - 664 sys sys 1109511607 663
+rc/bin/patch/note - 664 sys sys 1217182043 671
 rc/bin/patch/okay - 775 sys sys 1109511608 250
 rc/bin/patch/remove - 775 sys sys 1109511608 285
 rc/bin/patch/save - 775 sys sys 1110722753 106
 rc/bin/patch/sorry - 775 sys sys 1081200166 107
-rc/bin/patch/undo - 775 sys sys 1109511608 557
+rc/bin/patch/undo - 775 sys sys 1217182024 565
 rc/bin/pc - 20000000775 sys sys 1039727910 0
 rc/bin/pc/bootfloppy - 775 sys sys 964455816 439
 rc/bin/pc/bootplan9 - 775 sys sys 960857446 1639
@@ -5582,7 +5582,7 @@ rc/bin/pc/personalize - 775 sys sys 959698938 99
 rc/bin/pc/setup.9fat - 775 sys sys 960857447 546
 rc/bin/pc/setup.disk - 775 sys sys 960857447 579
 rc/bin/pc/update - 775 sys sys 960235807 468
-rc/bin/pci - 775 sys sys 1203980337 924
+rc/bin/pci - 775 sys sys 1217181596 931
 rc/bin/pdf2ps - 775 sys sys 1210371045 895
 rc/bin/postscript - 20000000775 sys sys 1020896376 0
 rc/bin/printfont - 775 sys sys 945617208 2851
@@ -6320,7 +6320,7 @@ sys/lib/dist/pc/sub/sleep - 664 sys sys 1018469726 118
 sys/lib/dist/pc/sub/termrc - 664 sys sys 1133187769 2466
 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
+sys/lib/dist/pc/sub/vmware - 775 sys sys 1217180986 334
 sys/lib/dist/setup - 775 sys sys 1200515222 190
 sys/lib/eqnchar - 664 sys sys 944956052 2727
 sys/lib/fax - 20000000775 sys sys 1039727360 0
@@ -7879,7 +7879,7 @@ sys/man/8/mouse - 664 sys sys 1196638947 2476
 sys/man/8/na - 664 sys sys 1196638947 859
 sys/man/8/ndb - 664 sys sys 1207767560 15239
 sys/man/8/newuser - 664 sys sys 1196638947 2418
-sys/man/8/nfsserver - 664 sys sys 1196638947 3576
+sys/man/8/nfsserver - 664 sys sys 1217138303 3807
 sys/man/8/partfs - 664 sys sys 1196638947 869
 sys/man/8/pci - 664 sys sys 1203983723 591
 sys/man/8/pcmcia - 664 sys sys 1196638947 408
@@ -9180,7 +9180,7 @@ sys/src/boot/pc/ahci.h - 664 sys sys 1199911245 6283
 sys/src/boot/pc/alarm.c - 664 sys sys 1015007947 1668
 sys/src/boot/pc/aoe.h - 664 sys sys 1193336543 826
 sys/src/boot/pc/apm.c - 664 sys sys 1015007947 289
-sys/src/boot/pc/bcom.c - 664 sys sys 1212010473 6460
+sys/src/boot/pc/bcom.c - 664 sys sys 1217188102 6470
 sys/src/boot/pc/boot.c - 664 sys sys 1130887226 8421
 sys/src/boot/pc/bootld.c - 664 sys sys 1015007948 1801
 sys/src/boot/pc/bootp.c - 664 sys sys 1216859040 12923
@@ -12807,12 +12807,12 @@ sys/src/cmd/md5sum.c - 664 sys sys 1194215423 1090
 sys/src/cmd/mk - 20000000775 sys sys 1056337347 0
 sys/src/cmd/mk/acid - 664 sys sys 1055698806 10395
 sys/src/cmd/mk/arc.c - 664 sys sys 1131129236 826
-sys/src/cmd/mk/archive.c - 664 sys sys 1131129659 3071
+sys/src/cmd/mk/archive.c - 664 sys sys 1217185909 3083
 sys/src/cmd/mk/bufblock.c - 664 sys sys 944961024 1338
 sys/src/cmd/mk/env.c - 664 sys sys 1182892801 2307
 sys/src/cmd/mk/file.c - 664 sys sys 1131129253 1299
 sys/src/cmd/mk/fns.h - 664 sys sys 1055698809 2199
-sys/src/cmd/mk/graph.c - 664 sys sys 1131128904 5822
+sys/src/cmd/mk/graph.c - 664 sys sys 1217185903 5835
 sys/src/cmd/mk/job.c - 664 sys sys 944961025 692
 sys/src/cmd/mk/lex.c - 664 sys sys 1143749754 2304
 sys/src/cmd/mk/main.c - 664 sys sys 1122474474 4790
@@ -12822,9 +12822,9 @@ sys/src/cmd/mk/mk.h - 664 sys sys 1131128809 3765
 sys/src/cmd/mk/mkconv - 775 sys sys 944961025 555
 sys/src/cmd/mk/mkfile - 664 sys sys 1055698812 376
 sys/src/cmd/mk/parse.c - 664 sys sys 944961025 5310
-sys/src/cmd/mk/plan9.c - 664 sys sys 1182916397 6967
+sys/src/cmd/mk/plan9.c - 664 sys sys 1217185887 7085
 sys/src/cmd/mk/rc.c - 664 sys sys 944961025 3206
-sys/src/cmd/mk/recipe.c - 664 sys sys 1182916343 2528
+sys/src/cmd/mk/recipe.c - 664 sys sys 1217185891 2551
 sys/src/cmd/mk/rule.c - 664 sys sys 1203808956 1945
 sys/src/cmd/mk/run.c - 664 sys sys 1182916224 5066
 sys/src/cmd/mk/shprint.c - 664 sys sys 1182916066 1523

+ 19 - 0
dist/replica/plan9.log

@@ -20088,3 +20088,22 @@
 1216935004 0 a rc/bin/service/startcifs - 775 sys sys 1216933648 239
 1216999806 0 c sys/games/lib/fortunes - 664 sys sys 1216999929 270162
 1217017804 0 c sys/src/cmd/file.c - 664 sys sys 1217017505 28940
+1217136604 0 c sys/man/8/nfsserver - 664 sys sys 1217136637 3576
+1217138405 0 c sys/man/8/nfsserver - 664 sys sys 1217138303 3807
+1217181603 0 c 386/bin/aux/vmware - 775 sys sys 1217181003 498
+1217181603 1 c rc/bin/dircp - 775 sys sys 1217181481 197
+1217181603 2 c rc/bin/ipso - 775 sys sys 1217181592 3056
+1217181603 3 c rc/bin/pci - 775 sys sys 1217181596 931
+1217181603 4 c sys/lib/dist/pc/sub/vmware - 775 sys sys 1217180986 334
+1217183404 0 c rc/bin/patch/apply - 775 sys sys 1217181785 1293
+1217183404 1 c rc/bin/patch/create - 775 sys sys 1217181811 1524
+1217183404 2 c rc/bin/patch/diff - 775 sys sys 1217181872 681
+1217183404 3 c rc/bin/patch/list - 775 sys sys 1217181980 841
+1217183404 4 c rc/bin/patch/note - 664 sys sys 1217182043 671
+1217183404 5 c rc/bin/patch/undo - 775 sys sys 1217182024 565
+1217187004 0 c 386/bin/aux/vmware - 775 sys sys 1217186676 498
+1217187004 1 c sys/src/cmd/mk/archive.c - 664 sys sys 1217185909 3083
+1217187004 2 c sys/src/cmd/mk/graph.c - 664 sys sys 1217185903 5835
+1217187004 3 c sys/src/cmd/mk/plan9.c - 664 sys sys 1217185887 7085
+1217187004 4 c sys/src/cmd/mk/recipe.c - 664 sys sys 1217185891 2551
+1217188804 0 c sys/src/boot/pc/bcom.c - 664 sys sys 1217188102 6470

+ 1 - 1
rc/bin/dircp

@@ -2,7 +2,7 @@
 # dircp src dest - copy a tree with tar
 switch($#*){
 case 2
-	@{cd $1 && tar cf /fd/1 .} | @{cd $2 && tar xTf /fd/0}
+	@{builtin cd $1 && tar cf /fd/1 .} | @{builtin cd $2 && tar xTf /fd/0}
 case *
 	echo usage: dircp from to >[1=2]
 	exit usage

+ 1 - 1
rc/bin/ipso

@@ -93,7 +93,7 @@ rfork ne
 ramfs -p >[2] /dev/null # silence 'i/o on hungup channel' message at exit
 unmount /mnt/plumb
 bind -c /tmp /srv
-cd /tmp
+builtin cd /tmp
 
 if ( ~ $edit yes ) echo '
 	Warning: The editor will display the secret contents of

+ 1 - 1
rc/bin/patch/apply

@@ -17,7 +17,7 @@ if(! test -d /n/sources/patch/$1){
 	exit nopatch
 }
 
-cd /n/sources/patch/$1 || exit nopatch
+builtin cd /n/sources/patch/$1 || exit nopatch
 if(! patch/okay .){
 	echo 'bad patch: '$status >[1=2]
 	exit badpatch

+ 1 - 1
rc/bin/patch/create

@@ -65,7 +65,7 @@ for(i in $*){
 		echo warning: new file $i not on sources >[1=2]
 	echo $i $uniq >>$d/files
 }
-@{cd $d && xchmod ug+rw * && xchmod a+r *}
+@{builtin cd $d && xchmod ug+rw * && xchmod a+r *}
 
 if(~ `{cat /proc/$pid/fd | awk 'NR==2{print $NF}'} */dev/cons && test -w /dev/consctl){
 	>/dev/consctl {

+ 17 - 7
rc/bin/patch/diff

@@ -1,15 +1,25 @@
 #!/bin/rc
 # patch/diff [-w] patch-name
 rfork e
+fn usage {
+	echo 'usage: patch/diff [-bmnwz] patch-name' >[1=2]
+	exit usage
+}
+
 dopts=(-c)
-if (~ $1 -w) {
-	dopts=($dopts $1)
+while (! ~ $#* 0 && ~ $1 -*) {
+	switch ($1) {
+	case -[bmnw]
+		dopts=($dopts $1)
+	case -z
+		dopts=()
+	case *
+		usage
+	}
 	shift
 }
-if(! ~ $#* 1){
-	echo 'usage: patch/diff patch-name' >[1=2]
-	exit usage
-}
+if(! ~ $#* 1)
+	usage
 
 if(! test -d /n/sources/patch){
 	rfork n
@@ -21,7 +31,7 @@ if(! test -d /n/sources/patch/$1){
 	exit nopatch
 }
 
-cd /n/sources/patch/$1 || exit nopatch
+builtin cd /n/sources/patch/$1 || exit nopatch
 if(! patch/okay .){
 	echo 'bad patch: '$status >[1=2]
 	exit badpatch

+ 6 - 2
rc/bin/patch/list

@@ -7,7 +7,7 @@ if(! test -d /n/sources/patch){
 }
 
 pref=''
-cd /n/sources/patch || {
+builtin cd /n/sources/patch || {
 	echo 'can''t cd /n/sources/patch' >[2=1]
 	exit no-sources
 }
@@ -17,7 +17,11 @@ if(~ $1 saved sorry applied undecided){
 	shift
 }
 if(~ $#* 0)
-	*=(`{if(~ $pref *?*) cd $pref; ls -t | grep -v '^(saved|sorry|applied|undecided)$'})
+	*=(`{
+		if(~ $pref *?*)
+			builtin cd $pref
+		ls -t | grep -v '^(saved|sorry|applied|undecided)$'
+	})
 
 trunc=(sed 5q)
 if(~ $#* 1)

+ 1 - 1
rc/bin/patch/note

@@ -16,7 +16,7 @@ if(! test -d /n/sources/patch/$1){
 	exit nopatch
 }
 
-cd /n/sources/patch/$1 || exit nopatch
+builtin cd /n/sources/patch/$1 || exit nopatch
 if(! patch/okay .){
 	echo 'bad patch: '$status >[1=2]
 	exit badpatch

+ 1 - 1
rc/bin/patch/undo

@@ -17,7 +17,7 @@ if(! test -d /n/sources/patch/$1){
 }
 
 d=$1
-cd /n/sources/patch/$1 || exit nopatch
+builtin cd /n/sources/patch/$1 || exit nopatch
 if(! patch/okay .){
 	echo 'bad patch: '$status >[1=2]
 	exit badpatch

+ 1 - 2
rc/bin/pci

@@ -50,7 +50,7 @@ filter=cat
 if(~ $1 -v){
 	filter=verbose
 }
-cd '#$/pci' && grep . *ctl | sed '
+builtin cd '#$/pci' && grep . *ctl | sed '
 	s/ctl:/:	/
 	s/:	01/:	disk 01/
 	s/:	02/:	net  02/
@@ -60,4 +60,3 @@ cd '#$/pci' && grep . *ctl | sed '
 	s/:	0c\.05/:	smb 0c.05/
 	s/:	([0-9])/:	---  \1/
 ' | $filter
-

+ 6 - 4
sys/lib/dist/pc/sub/vmware

@@ -1,8 +1,10 @@
 #!/bin/rc
-
+# vmware - if we're running in a vmware virtual machine, tweak set up
 if(aux/isvmware -s){
+	echo hwaccel off >'#v/vgactl'
 	echo -n off >'#P/i8253timerset'
-	for(i in '#S'/sd??)
-		if(test -f $i/ctl)
-			echo dma on >$i/ctl
+	for (ctl in '#S'/sd[C-H]?/ctl)
+		if (test -e $ctl && grep -s '^config .* dma ' $ctl &&
+		    ! grep -s '^config (848A|.* dma 00000000 )' $ctl)
+			echo 'dma on' >$ctl
 }

+ 15 - 4
sys/man/8/nfsserver

@@ -29,6 +29,7 @@ run on a Plan 9 CPU server, and should be started in that order.
 All users on client machines have the
 access privileges of the Plan 9 user
 .LR none .
+Currently only NFS version 2 is served.
 .PP
 The
 .I rpc-options
@@ -144,8 +145,8 @@ Assuming the CPU server's name is
 the mount commands on the client would be:
 .PP
 .EX
-/etc/mount -o soft,intr eduardo:bootes /n/bootes
-/etc/mount -o soft,intr eduardo:fornax /n/fornax
+/etc/mount -o soft,intr eduardo:edith /n/edith
+/etc/mount -o soft,intr eduardo:yoshimi /n/yoshimi
 .EE
 .PP
 Note that a single instance of
@@ -165,8 +166,18 @@ Log file.
 It would be nice to provide authentication for users, but Unix systems
 provide too low a level of security to be trusted in a Plan 9 world.
 .SH SEE ALSO
+.IR nfs (4)
+.br
 RFC1057,
-.I "RPC: Remote Procedure Call Protocol Specification, Version 2."
+.I "RPC: Remote Procedure Call Protocol Specification, Version 2,"
+describes Sun's RPC protocol.
 .br
 RFC1094,
-.I "NFS: Network File System Protocol Specification."
+.I "NFS: Network File System Protocol Specification,"
+describes NFS version 2.
+.br
+RFC1813,
+.I "NFS Version 3 Protocol Specification."
+.br
+RFC3530,
+.I "Network File System (NFS) version 4 Protocol."

+ 2 - 0
sys/src/boot/pc/bcom.c

@@ -83,6 +83,8 @@ static Mode modes[NMode+1] = {
 
 char *defaultpartition = "new";
 
+int vga;
+
 static Medium*
 parse(char *line, char **file)
 {

+ 2 - 2
sys/src/cmd/mk/archive.c

@@ -108,11 +108,11 @@ atimes(char *ar)
 		if(t <= 0)	/* as it sometimes happens; thanks ken */
 			t = 1;
 		for(i = sizeof(h.name)-1; i > 0 && h.name[i] == ' '; i--)
-				;
+			;
 		if(h.name[i] == '/')		/* system V bug */
 			i--;
 		h.name[i+1]=0;		/* can stomp on date field */
-		sprint(buf, "%s(%s)", ar, h.name);
+		snprint(buf, sizeof buf, "%s(%s)", ar, h.name);
 		symlook(strdup(buf), S_TIME, (void*)t)->u.value = t;
 		t = atol(h.size);
 		if(t&01) t++;

+ 1 - 1
sys/src/cmd/mk/graph.c

@@ -182,7 +182,7 @@ dumpn(char *s, Node *n)
 	Bprint(&bout, "%s%s@%p: time=%ld flags=0x%x next=%p\n",
 		s, n->name, n, n->time, n->flags, n->next);
 	for(a = n->prereqs; a; a = a->next){
-		sprint(buf, "%s   ", (*s == ' ')? s:"");
+		snprint(buf, sizeof buf, "%s   ", (*s == ' ')? s:"");
 		dumpa(buf, a);
 	}
 }

+ 13 - 9
sys/src/cmd/mk/plan9.c

@@ -346,6 +346,7 @@ void
 dirtime(char *dir, char *path)
 {
 	int i, fd, n;
+	long mtime;
 	Dir *d;
 	char buf[4096];
 
@@ -353,12 +354,15 @@ dirtime(char *dir, char *path)
 	if(fd >= 0){
 		while((n = dirread(fd, &d)) > 0){
 			for(i=0; i<n; i++){
-				if(d[i].mtime == 0)	/* yeah, this is likely */
-					continue;
-				sprint(buf, "%s%s", path, d[i].name);
-				if(symlook(buf, S_TIME, 0))
-					continue;
-				symlook(strdup(buf), S_TIME, (void*)d[i].mtime)->u.value = d[i].mtime;
+				mtime = d[i].mtime;
+				/* defensive driving: this does happen */
+				if(mtime == 0)
+					mtime = 1;
+				snprint(buf, sizeof buf, "%s%s", path,
+					d[i].name);
+				if(symlook(buf, S_TIME, 0) == nil)
+					symlook(strdup(buf), S_TIME,
+						(void*)mtime)->u.value = mtime;
 			}
 			free(d);
 		}
@@ -376,9 +380,9 @@ bulkmtime(char *dir)
 		sym = dir;
 		s = dir;
 		if(strcmp(dir, "/") == 0)
-			strcpy(buf, dir);
+			strecpy(buf, buf + sizeof buf - 1, dir);
 		else
-			sprint(buf, "%s/", dir);
+			snprint(buf, sizeof buf, "%s/", dir);
 	}else{
 		s = ".";
 		sym = "";
@@ -400,7 +404,7 @@ mkmtime(char *name, int force)
 	Symtab *sym;
 	char buf[4096];
 
-	strcpy(buf, name);
+	strecpy(buf, buf + sizeof buf - 1, name);
 	cleanname(buf);
 	name = buf;
 

+ 1 - 1
sys/src/cmd/mk/recipe.c

@@ -57,7 +57,7 @@ dorecipe(Node *node)
 			if(r->attr&META)
 				subst(aa->stem, w->s, buf, sizeof(buf));
 			else
-				strcpy(buf, w->s);
+				strecpy(buf, buf + sizeof buf - 1, w->s);
 			aw->next = newword(buf);
 			aw = aw->next;
 			if((s = symlook(buf, S_NODE, 0)) == 0)