Browse Source

Plan 9 from Bell Labs 2007-06-13

David du Colombier 17 years ago
parent
commit
8b6585120e

+ 19 - 18
dist/replica/_plan9.db

@@ -1,6 +1,6 @@
 386 - 20000000775 sys sys 1010957353 0
 386/9load - 775 sys sys 1171784718 220040
-386/9loaddebug - 775 sys sys 1179086411 417004
+386/9loaddebug - 775 sys sys 1181678932 416999
 386/9loadlite - 775 sys sys 1171784720 137116
 386/9loadlitedebug - 775 sys sys 1176581010 202587
 386/9pc - 775 sys sys 1179368409 1935757
@@ -43,21 +43,21 @@
 386/bin/ascii - 775 sys sys 1168402265 64884
 386/bin/astro - 775 sys sys 1178568245 137403
 386/bin/auth - 20000000775 sys sys 1016920815 0
-386/bin/auth/aescbc - 775 sys sys 1178568245 139855
+386/bin/auth/aescbc - 775 sys sys 1181621139 139888
 386/bin/auth/asn12rsa - 775 sys sys 1168402266 120828
 386/bin/auth/authsrv - 775 sys sys 1178568245 165220
 386/bin/auth/changeuser - 775 sys sys 1178568246 96020
-386/bin/auth/convkeys - 775 sys sys 1178568246 87198
-386/bin/auth/convkeys2 - 775 sys sys 1178568246 87257
+386/bin/auth/convkeys - 775 sys sys 1181621139 87231
+386/bin/auth/convkeys2 - 775 sys sys 1181621139 87290
 386/bin/auth/cron - 775 sys sys 1179372068 143801
 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
-386/bin/auth/factotum - 775 sys sys 1179432184 321266
+386/bin/auth/factotum - 775 sys sys 1181621140 321299
 386/bin/auth/fgui - 775 sys sys 1179548016 219091
 386/bin/auth/guard.srv - 775 sys sys 1178568248 143650
 386/bin/auth/iam - 775 sys sys 1085076981 50791
-386/bin/auth/keyfs - 775 sys sys 1178568248 115094
+386/bin/auth/keyfs - 775 sys sys 1181621141 115127
 386/bin/auth/login - 775 sys sys 1179372070 104816
 386/bin/auth/newns - 775 sys sys 1179372070 90035
 386/bin/auth/none - 775 sys sys 1179432184 89808
@@ -71,13 +71,13 @@
 386/bin/auth/rsafill - 775 sys sys 1168402273 143968
 386/bin/auth/rsagen - 775 sys sys 1178568249 151953
 386/bin/auth/secretpem - 775 sys sys 1045537944 118526
-386/bin/auth/secstore - 775 sys sys 1181100215 195887
+386/bin/auth/secstore - 775 sys sys 1181621141 195920
 386/bin/auth/secstored - 775 sys sys 1180468713 197571
 386/bin/auth/secuser - 775 sys sys 1180468714 152765
 386/bin/auth/status - 775 sys sys 1020319060 738
 386/bin/auth/uniq - 775 sys sys 1168402275 63314
 386/bin/auth/warning - 775 sys sys 1179372071 99970
-386/bin/auth/wrkey - 775 sys sys 1174964425 76258
+386/bin/auth/wrkey - 775 sys sys 1181621141 76221
 386/bin/aux - 20000000775 sys sys 1016920817 0
 386/bin/aux/8prefix - 775 sys sys 1168402276 67103
 386/bin/aux/9pcon - 775 sys sys 1168402276 95153
@@ -192,7 +192,7 @@
 386/bin/cpp - 775 sys sys 1178568264 148996
 386/bin/cpu - 775 sys sys 1179372083 138223
 386/bin/crop - 775 sys sys 1168402298 116374
-386/bin/cwfs - 775 sys sys 1178568265 365217
+386/bin/cwfs - 775 sys sys 1181621142 365250
 386/bin/date - 775 sys sys 1178568265 41845
 386/bin/db - 775 sys sys 1178908092 345933
 386/bin/dc - 775 sys sys 1168402299 99260
@@ -210,7 +210,7 @@
 386/bin/disk/exsort - 775 sys sys 1168402301 60455
 386/bin/disk/fdisk - 775 sys sys 1168402301 104096
 386/bin/disk/format - 775 sys sys 1178568266 89440
-386/bin/disk/kfs - 775 sys sys 1179372083 248648
+386/bin/disk/kfs - 775 sys sys 1181621143 248681
 386/bin/disk/kfscmd - 775 sys sys 1148500626 38257
 386/bin/disk/ksync - 775 sys sys 1020319074 302
 386/bin/disk/mbr - 775 sys sys 1168402302 73918
@@ -550,7 +550,7 @@
 386/lib/lib9p.a - 664 sys sys 1172780592 91012
 386/lib/libString.a - 664 sys sys 1168402362 22126
 386/lib/libauth.a - 664 sys sys 1179372118 58864
-386/lib/libauthsrv.a - 664 sys sys 1174964431 35790
+386/lib/libauthsrv.a - 664 sys sys 1181621143 35878
 386/lib/libbin.a - 664 sys sys 1168402363 2534
 386/lib/libbio.a - 664 sys sys 1168402363 25980
 386/lib/libc.a - 664 sys sys 1181332906 502352
@@ -7691,7 +7691,7 @@ sys/man/4/mntgen - 664 sys sys 1043680799 473
 sys/man/4/namespace - 664 sys sys 1161060792 6920
 sys/man/4/nfs - 664 sys sys 1140447003 4475
 sys/man/4/nntpfs - 664 sys sys 1032632346 2771
-sys/man/4/paqfs - 664 sys sys 1017723482 1541
+sys/man/4/paqfs - 664 sys sys 1181701436 1736
 sys/man/4/plumber - 664 sys sys 944959699 2748
 sys/man/4/ramfs - 664 sys sys 1168307208 1642
 sys/man/4/ratfs - 664 sys sys 1157898800 3276
@@ -7784,7 +7784,7 @@ sys/man/8/cpurc - 664 sys sys 1174792133 1541
 sys/man/8/cron - 664 sys sys 1063858596 1867
 sys/man/8/dhcpd - 664 sys sys 1172959497 5572
 sys/man/8/disksim - 664 sys sys 1144150487 1476
-sys/man/8/drawterm - 664 sys sys 1135901219 1741
+sys/man/8/drawterm - 664 sys sys 1181675938 1921
 sys/man/8/fossilcons - 664 sys sys 1181331315 18400
 sys/man/8/fs - 664 sys sys 1172956177 15086
 sys/man/8/fsconfig - 664 sys sys 1172956534 8878
@@ -9132,7 +9132,7 @@ sys/src/boot/pc/etherelnk3x.c - 664 sys sys 1015007951 24989
 sys/src/boot/pc/etherga620.c - 664 sys sys 1175289484 27168
 sys/src/boot/pc/etherga620fw.h - 664 sys sys 1174080072 222295
 sys/src/boot/pc/etherif.h - 664 sys sys 1174077279 1338
-sys/src/boot/pc/etherigbe.c - 664 sys sys 1181515261 41262
+sys/src/boot/pc/etherigbe.c - 664 sys sys 1181675291 41434
 sys/src/boot/pc/ethermii.c - 664 sys sys 1103641771 4413
 sys/src/boot/pc/ethermii.h - 664 sys sys 1071175087 3259
 sys/src/boot/pc/etherrhine.c - 664 sys sys 1144961190 12383
@@ -12865,7 +12865,7 @@ sys/src/cmd/page/view.c - 664 sys sys 1136377361 22893
 sys/src/cmd/paqfs - 20000000775 sys sys 1039727564 0
 sys/src/cmd/paqfs/mkfile - 664 sys sys 1032060366 228
 sys/src/cmd/paqfs/mkpaqfs.c - 664 sys sys 1072729575 8836
-sys/src/cmd/paqfs/paqfs.c - 664 sys sys 1084470285 19571
+sys/src/cmd/paqfs/paqfs.c - 664 sys sys 1181701442 19936
 sys/src/cmd/paqfs/paqfs.h - 664 sys sys 1072729575 1016
 sys/src/cmd/pbd.c - 664 sys sys 944961351 247
 sys/src/cmd/pcc.c - 664 sys sys 1146137351 6016
@@ -13662,8 +13662,8 @@ sys/src/cmd/unix/drawterm/Makefile - 664 sys sys 1135900534 1112
 sys/src/cmd/unix/drawterm/README - 664 sys sys 1148233748 1056
 sys/src/cmd/unix/drawterm/args.h - 664 sys sys 1135900534 709
 sys/src/cmd/unix/drawterm/bin - 20000000775 sys sys 1148233769 0
-sys/src/cmd/unix/drawterm/cpu-bl.c - 664 sys sys 1135900534 14118
-sys/src/cmd/unix/drawterm/cpu.c - 664 sys sys 1148233749 13982
+sys/src/cmd/unix/drawterm/cpu-bl.c - 664 sys sys 1181676099 14118
+sys/src/cmd/unix/drawterm/cpu.c - 664 sys sys 1181676099 13982
 sys/src/cmd/unix/drawterm/drawterm.h - 664 sys sys 1135900535 472
 sys/src/cmd/unix/drawterm/drawterm.ico - 664 sys sys 1135900535 1662
 sys/src/cmd/unix/drawterm/drawterm.rc - 664 sys sys 1135900535 1713
@@ -14256,7 +14256,7 @@ sys/src/cmd/upas/unesc/mkfile - 664 sys sys 1173383407 142
 sys/src/cmd/upas/unesc/unesc.c - 664 sys sys 1173383408 969
 sys/src/cmd/upas/vf - 20000000775 sys sys 1064589607 0
 sys/src/cmd/upas/vf/mkfile - 664 sys sys 1064393881 241
-sys/src/cmd/upas/vf/vf.c - 664 sys sys 1181326746 20235
+sys/src/cmd/upas/vf/vf.c - 664 sys sys 1181681383 20307
 sys/src/cmd/usb - 20000000775 sys sys 1091205029 0
 sys/src/cmd/usb/audio - 20000000775 sys sys 1091204980 0
 sys/src/cmd/usb/audio/audiofs.c - 664 sys sys 1172903208 18518
@@ -15844,3 +15844,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/upas/vf - 775 sys sys 1181704900 97444

+ 19 - 19
dist/replica/plan9.db

@@ -1,6 +1,6 @@
 386 - 20000000775 sys sys 1010957353 0
 386/9load - 775 sys sys 1171784718 220040
-386/9loaddebug - 775 sys sys 1179086411 417004
+386/9loaddebug - 775 sys sys 1181678932 416999
 386/9loadlite - 775 sys sys 1171784720 137116
 386/9loadlitedebug - 775 sys sys 1176581010 202587
 386/9pc - 775 sys sys 1179368409 1935757
@@ -43,21 +43,21 @@
 386/bin/ascii - 775 sys sys 1168402265 64884
 386/bin/astro - 775 sys sys 1178568245 137403
 386/bin/auth - 20000000775 sys sys 1016920815 0
-386/bin/auth/aescbc - 775 sys sys 1178568245 139855
+386/bin/auth/aescbc - 775 sys sys 1181621139 139888
 386/bin/auth/asn12rsa - 775 sys sys 1168402266 120828
 386/bin/auth/authsrv - 775 sys sys 1178568245 165220
 386/bin/auth/changeuser - 775 sys sys 1178568246 96020
-386/bin/auth/convkeys - 775 sys sys 1178568246 87198
-386/bin/auth/convkeys2 - 775 sys sys 1178568246 87257
+386/bin/auth/convkeys - 775 sys sys 1181621139 87231
+386/bin/auth/convkeys2 - 775 sys sys 1181621139 87290
 386/bin/auth/cron - 775 sys sys 1179372068 143801
 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
-386/bin/auth/factotum - 775 sys sys 1179432184 321266
+386/bin/auth/factotum - 775 sys sys 1181621140 321299
 386/bin/auth/fgui - 775 sys sys 1179548016 219091
 386/bin/auth/guard.srv - 775 sys sys 1178568248 143650
 386/bin/auth/iam - 775 sys sys 1085076981 50791
-386/bin/auth/keyfs - 775 sys sys 1178568248 115094
+386/bin/auth/keyfs - 775 sys sys 1181621141 115127
 386/bin/auth/login - 775 sys sys 1179372070 104816
 386/bin/auth/newns - 775 sys sys 1179372070 90035
 386/bin/auth/none - 775 sys sys 1179432184 89808
@@ -71,13 +71,13 @@
 386/bin/auth/rsafill - 775 sys sys 1168402273 143968
 386/bin/auth/rsagen - 775 sys sys 1178568249 151953
 386/bin/auth/secretpem - 775 sys sys 1045537944 118526
-386/bin/auth/secstore - 775 sys sys 1181100215 195887
+386/bin/auth/secstore - 775 sys sys 1181621141 195920
 386/bin/auth/secstored - 775 sys sys 1180468713 197571
 386/bin/auth/secuser - 775 sys sys 1180468714 152765
 386/bin/auth/status - 775 sys sys 1020319060 738
 386/bin/auth/uniq - 775 sys sys 1168402275 63314
 386/bin/auth/warning - 775 sys sys 1179372071 99970
-386/bin/auth/wrkey - 775 sys sys 1174964425 76258
+386/bin/auth/wrkey - 775 sys sys 1181621141 76221
 386/bin/aux - 20000000775 sys sys 1016920817 0
 386/bin/aux/8prefix - 775 sys sys 1168402276 67103
 386/bin/aux/9pcon - 775 sys sys 1168402276 95153
@@ -192,7 +192,7 @@
 386/bin/cpp - 775 sys sys 1178568264 148996
 386/bin/cpu - 775 sys sys 1179372083 138223
 386/bin/crop - 775 sys sys 1168402298 116374
-386/bin/cwfs - 775 sys sys 1178568265 365217
+386/bin/cwfs - 775 sys sys 1181621142 365250
 386/bin/date - 775 sys sys 1178568265 41845
 386/bin/db - 775 sys sys 1178908092 345933
 386/bin/dc - 775 sys sys 1168402299 99260
@@ -210,7 +210,7 @@
 386/bin/disk/exsort - 775 sys sys 1168402301 60455
 386/bin/disk/fdisk - 775 sys sys 1168402301 104096
 386/bin/disk/format - 775 sys sys 1178568266 89440
-386/bin/disk/kfs - 775 sys sys 1179372083 248648
+386/bin/disk/kfs - 775 sys sys 1181621143 248681
 386/bin/disk/kfscmd - 775 sys sys 1148500626 38257
 386/bin/disk/ksync - 775 sys sys 1020319074 302
 386/bin/disk/mbr - 775 sys sys 1168402302 73918
@@ -480,7 +480,7 @@
 386/bin/upas/token - 775 sys sys 1178568317 76393
 386/bin/upas/unesc - 775 sys sys 1176520512 60137
 386/bin/upas/unspam - 775 sys sys 1064598367 38
-386/bin/upas/vf - 775 sys sys 1181359437 97389
+386/bin/upas/vf - 775 sys sys 1181704900 97444
 386/bin/usb - 20000000775 sys sys 1019538890 0
 386/bin/usb/usbaudio - 775 sys sys 1179548037 188012
 386/bin/usb/usbd - 775 sys sys 1179548037 130769
@@ -550,7 +550,7 @@
 386/lib/lib9p.a - 664 sys sys 1172780592 91012
 386/lib/libString.a - 664 sys sys 1168402362 22126
 386/lib/libauth.a - 664 sys sys 1179372118 58864
-386/lib/libauthsrv.a - 664 sys sys 1174964431 35790
+386/lib/libauthsrv.a - 664 sys sys 1181621143 35878
 386/lib/libbin.a - 664 sys sys 1168402363 2534
 386/lib/libbio.a - 664 sys sys 1168402363 25980
 386/lib/libc.a - 664 sys sys 1181332906 502352
@@ -7691,7 +7691,7 @@ sys/man/4/mntgen - 664 sys sys 1043680799 473
 sys/man/4/namespace - 664 sys sys 1161060792 6920
 sys/man/4/nfs - 664 sys sys 1140447003 4475
 sys/man/4/nntpfs - 664 sys sys 1032632346 2771
-sys/man/4/paqfs - 664 sys sys 1017723482 1541
+sys/man/4/paqfs - 664 sys sys 1181701436 1736
 sys/man/4/plumber - 664 sys sys 944959699 2748
 sys/man/4/ramfs - 664 sys sys 1168307208 1642
 sys/man/4/ratfs - 664 sys sys 1157898800 3276
@@ -7784,7 +7784,7 @@ sys/man/8/cpurc - 664 sys sys 1174792133 1541
 sys/man/8/cron - 664 sys sys 1063858596 1867
 sys/man/8/dhcpd - 664 sys sys 1172959497 5572
 sys/man/8/disksim - 664 sys sys 1144150487 1476
-sys/man/8/drawterm - 664 sys sys 1135901219 1741
+sys/man/8/drawterm - 664 sys sys 1181675938 1921
 sys/man/8/fossilcons - 664 sys sys 1181331315 18400
 sys/man/8/fs - 664 sys sys 1172956177 15086
 sys/man/8/fsconfig - 664 sys sys 1172956534 8878
@@ -9132,7 +9132,7 @@ sys/src/boot/pc/etherelnk3x.c - 664 sys sys 1015007951 24989
 sys/src/boot/pc/etherga620.c - 664 sys sys 1175289484 27168
 sys/src/boot/pc/etherga620fw.h - 664 sys sys 1174080072 222295
 sys/src/boot/pc/etherif.h - 664 sys sys 1174077279 1338
-sys/src/boot/pc/etherigbe.c - 664 sys sys 1181515261 41262
+sys/src/boot/pc/etherigbe.c - 664 sys sys 1181675291 41434
 sys/src/boot/pc/ethermii.c - 664 sys sys 1103641771 4413
 sys/src/boot/pc/ethermii.h - 664 sys sys 1071175087 3259
 sys/src/boot/pc/etherrhine.c - 664 sys sys 1144961190 12383
@@ -12865,7 +12865,7 @@ sys/src/cmd/page/view.c - 664 sys sys 1136377361 22893
 sys/src/cmd/paqfs - 20000000775 sys sys 1039727564 0
 sys/src/cmd/paqfs/mkfile - 664 sys sys 1032060366 228
 sys/src/cmd/paqfs/mkpaqfs.c - 664 sys sys 1072729575 8836
-sys/src/cmd/paqfs/paqfs.c - 664 sys sys 1084470285 19571
+sys/src/cmd/paqfs/paqfs.c - 664 sys sys 1181701442 19936
 sys/src/cmd/paqfs/paqfs.h - 664 sys sys 1072729575 1016
 sys/src/cmd/pbd.c - 664 sys sys 944961351 247
 sys/src/cmd/pcc.c - 664 sys sys 1146137351 6016
@@ -13662,8 +13662,8 @@ sys/src/cmd/unix/drawterm/Makefile - 664 sys sys 1135900534 1112
 sys/src/cmd/unix/drawterm/README - 664 sys sys 1148233748 1056
 sys/src/cmd/unix/drawterm/args.h - 664 sys sys 1135900534 709
 sys/src/cmd/unix/drawterm/bin - 20000000775 sys sys 1148233769 0
-sys/src/cmd/unix/drawterm/cpu-bl.c - 664 sys sys 1135900534 14118
-sys/src/cmd/unix/drawterm/cpu.c - 664 sys sys 1148233749 13982
+sys/src/cmd/unix/drawterm/cpu-bl.c - 664 sys sys 1181676099 14118
+sys/src/cmd/unix/drawterm/cpu.c - 664 sys sys 1181676099 13982
 sys/src/cmd/unix/drawterm/drawterm.h - 664 sys sys 1135900535 472
 sys/src/cmd/unix/drawterm/drawterm.ico - 664 sys sys 1135900535 1662
 sys/src/cmd/unix/drawterm/drawterm.rc - 664 sys sys 1135900535 1713
@@ -14256,7 +14256,7 @@ sys/src/cmd/upas/unesc/mkfile - 664 sys sys 1173383407 142
 sys/src/cmd/upas/unesc/unesc.c - 664 sys sys 1173383408 969
 sys/src/cmd/upas/vf - 20000000775 sys sys 1064589607 0
 sys/src/cmd/upas/vf/mkfile - 664 sys sys 1064393881 241
-sys/src/cmd/upas/vf/vf.c - 664 sys sys 1181326746 20235
+sys/src/cmd/upas/vf/vf.c - 664 sys sys 1181681383 20307
 sys/src/cmd/usb - 20000000775 sys sys 1091205029 0
 sys/src/cmd/usb/audio - 20000000775 sys sys 1091204980 0
 sys/src/cmd/usb/audio/audiofs.c - 664 sys sys 1172903208 18518

+ 19 - 0
dist/replica/plan9.log

@@ -49226,3 +49226,22 @@
 1181541622 0 c 386/bin/upas/smtpd - 775 sys sys 1181540422 331887
 1181579422 0 c 386/9pxeload - 775 sys sys 1181578963 313860
 1181597423 0 c sys/src/libauthsrv/readnvram.c - 664 sys sys 1181596613 10196
+1181622622 0 c 386/bin/auth/aescbc - 775 sys sys 1181621139 139888
+1181622622 1 c 386/bin/auth/convkeys - 775 sys sys 1181621139 87231
+1181622622 2 c 386/bin/auth/convkeys2 - 775 sys sys 1181621139 87290
+1181622622 3 c 386/bin/auth/factotum - 775 sys sys 1181621140 321299
+1181622622 4 c 386/bin/auth/keyfs - 775 sys sys 1181621141 115127
+1181622622 5 c 386/bin/auth/secstore - 775 sys sys 1181621141 195920
+1181622622 6 c 386/bin/auth/wrkey - 775 sys sys 1181621141 76221
+1181622622 7 c 386/bin/cwfs - 775 sys sys 1181621142 365250
+1181622622 8 c 386/bin/disk/kfs - 775 sys sys 1181621143 248681
+1181622622 9 c 386/lib/libauthsrv.a - 664 sys sys 1181621143 35878
+1181676624 0 c sys/man/8/drawterm - 664 sys sys 1181675938 1921
+1181676624 1 c sys/src/boot/pc/etherigbe.c - 664 sys sys 1181675291 41434
+1181676624 2 c sys/src/cmd/unix/drawterm/cpu-bl.c - 664 sys sys 1181676099 14118
+1181676624 3 c sys/src/cmd/unix/drawterm/cpu.c - 664 sys sys 1181676099 13982
+1181680223 0 c 386/9loaddebug - 775 sys sys 1181678932 416999
+1181682031 0 c sys/src/cmd/upas/vf/vf.c - 664 sys sys 1181681383 20307
+1181701823 0 c sys/man/4/paqfs - 664 sys sys 1181701436 1736
+1181701823 1 c sys/src/cmd/paqfs/paqfs.c - 664 sys sys 1181701442 19936
+1181705423 0 c 386/bin/upas/vf - 775 sys sys 1181704900 97444

+ 18 - 2
sys/man/4/paqfs

@@ -18,6 +18,10 @@ paqfs  \- compressed read-only file system
 .B -M
 .I mesgsize
 ]
+[
+.B -S
+.I srvname
+]
 .I paqfile
 .SH DESCRIPTION
 .I Paqfs
@@ -32,7 +36,7 @@ a small persistent storage device, such as a flash ROM.
 It does not authenticate its clients and assumes each group
 has a single member with the same name.
 .PP
-Option to 
+Options to 
 .I paqfs
 are:
 .TP
@@ -43,6 +47,10 @@ The number of file system blocks to cache in memory. The default is 20 blocks.
 Output various debugging information to
 .IR stderr .
 .TP
+.B -q
+Suppress the output of the archive creation date and fingerprint to
+.IR stderr .
+.TP
 .B -i
 Use file descriptors 0 and 1 as the 9P communication channel rather than create a pipe.
 .TP
@@ -54,9 +62,17 @@ The location to mount the file system. The default is
 The maximum 9P message size. The default is sufficient for 8K byte read message.
 .TP
 .B -s
-Post the 9P channel on #s/paqfs rather than
+Post the 9P channel on
+.BR #s/\fIsrvname\fR ,
+default
+.BR #s/paqfs ,
+rather than
 mounting it on
 .IR mtpt .
+Use
+.BI -S " srvname
+to change the default.
+
 .TP
 .B -v
 Verify the integrity of the

+ 22 - 8
sys/man/8/drawterm

@@ -40,22 +40,22 @@ is
 .I not
 a Plan 9 program.
 It is a program that users of non-Plan 9 systems can use
-to establish graphical 
+to establish graphical
 .IR cpu (1)
 connections with Plan 9 CPU servers.
-Just as a real Plan 9 terminal does, 
+Just as a real Plan 9 terminal does,
 .I drawterm
 serves its local name space
 as well as some devices (the keyboard, mouse, and screen)
 to a remote CPU server, which mounts this name space
-on 
+on
 .B /mnt/term
 and starts a shell.
 Typically, either explicitly or via the profile, one uses the shell
 to start
 .IR rio (1).
 .PP
-By default, 
+By default,
 drawterm
 uses the CPU server
 .B $cpu
@@ -65,13 +65,27 @@ and the authentication server
 .B $auth
 or
 .BR auth .
-The 
-.B -a
+The
+.BR -a ,
+.BR -c ,
 and
-.B -c
-options specify alternate servers.
+.B -s
+options specify alternate authentication, CPU and
+.I secstore
+servers,
+respectively.
 (Edit the source to set appropriate local defaults.)
 .PP
+.I Cmd
+is a command to be executed remotely.
+Options
+.LR e ,
+.LR k ,
+and
+.L u
+have the same meaning as in
+.IR cpu (1).
+.PP
 Drawterm has been ported to
 FreeBSD,
 Irix,

+ 9 - 0
sys/src/boot/pc/etherigbe.c

@@ -43,6 +43,7 @@ enum {
 	i82540eplp = (0x101E<<16)|0x8086,
 	i82547gi   = (0x1075<<16)|0x8086,
 	i82541gi   = (0x1076<<16)|0x8086,
+	i82541gi2  = (0x1077<<16)|0x8086,
 	i82546gb   = (0x1079<<16)|0x8086,
 	i82541pi   = (0x107c<<16)|0x8086,
 	i82573pl   = (0x109a<<16)|0x8086,
@@ -851,6 +852,7 @@ igbeinit(Ether* edev)
 	case i82540em:
 	case i82540eplp:
 	case i82541gi:
+	case i82541gi2:
 	case i82541pi:
 	case i82546gb:
 	case i82546eb:
@@ -894,6 +896,7 @@ igbeinit(Ether* edev)
 	case i82540em:
 	case i82540eplp:
 	case i82541gi:
+	case i82541gi2:
 	case i82541pi:
 	case i82546gb:
 	case i82546eb:
@@ -937,6 +940,7 @@ igbeinit(Ether* edev)
 	case i82546gb:
 	case i82546eb:
 	case i82541gi:
+	case i82541gi2:
 	case i82573pl:
 		r = csr32r(ctlr, Txdctl);
 		r &= ~WthreshMASK;
@@ -1166,6 +1170,7 @@ igbemii(Ctlr* ctlr)
 	case i82540eplp:
 	case i82547gi:
 	case i82541gi:
+	case i82541gi2:
 	case i82541pi:
 	case i82546gb:
 	case i82546eb:
@@ -1203,6 +1208,7 @@ igbemii(Ctlr* ctlr)
 	switch(ctlr->id){
 	case i82547gi:
 	case i82541gi:
+	case i82541gi2:
 	case i82541pi:
 	case i82546gb:
 	case i82546eb:
@@ -1333,6 +1339,7 @@ at93c46r(Ctlr* ctlr)
 	case i82540em:
 	case i82540eplp:
 	case i82541gi:
+	case i82541gi2:
 	case i82541pi:
 	case i82547gi:
 	case i82546gb:
@@ -1415,6 +1422,7 @@ detach(Ctlr *ctlr)
 	case i82540em:
 	case i82540eplp:
 	case i82541gi:
+	case i82541gi2:
 	case i82541pi:
 	case i82547gi:
 	case i82546gb:
@@ -1610,6 +1618,7 @@ igbepci(void)
 		case i82540eplp:
 		case i82547gi:
 		case i82541gi:
+		case i82541gi2:
 		case i82541pi:
 		case i82546gb:
 		case i82546eb:

+ 46 - 21
sys/src/cmd/paqfs/paqfs.c

@@ -67,6 +67,7 @@ Paq 	*root, *rootfile;
 Block 	*cache;
 ulong 	cacheage;
 Biobuf	*bin;
+int	qflag;
 
 Fid *	newfid(int);
 void	paqstat(PaqDir*, char*);
@@ -140,21 +141,42 @@ char	Edirtoobig[] = 	"directory entry too big";
 
 int debug;
 
+#pragma varargck	type	"V"	uchar*
+
+static int
+sha1fmt(Fmt *f)
+{
+	int i;
+	uchar *v;
+
+	v = va_arg(f->args, uchar*);
+	if(v == nil){
+		fmtprint(f, "*");
+	}
+	else{
+		for(i = 0; i < SHA1dlen; i++)
+			fmtprint(f, "%2.2ux", v[i]);
+	}
+
+	return 0;
+}
+
 void
 main(int argc, char *argv[])
 {
-	char *defmnt, *p;
 	int pfd[2];
 	int fd;
 	int stdio = 0;
 	int verify = 0;
+	char buf[64], *defmnt, *p, *service;
+
+	fmtinstall('V', sha1fmt);
 
 	defmnt = "/n/paq";
+	service = "paqfs";
 	ARGBEGIN{
 	case 'c':
-		p = ARGF();
-		if(p == nil)
-			usage();
+		p = EARGF(usage());
 		cachesize = atoi(p);
 		break;
 	case 'a':
@@ -176,20 +198,23 @@ main(int argc, char *argv[])
 		defmnt = nil;
 		break;
 	case 'm':
-		defmnt = ARGF();
-		if(defmnt == nil)
-			usage();
+		defmnt = EARGF(usage());
 		break;
 	case 'M':
-		p = ARGF();
-		if(p == nil)
-			usage();
+		p = EARGF(usage());
 		mesgsize = atoi(p);
 		if(mesgsize < 512)
 			mesgsize = 512;
 		if(mesgsize > 128*1024)
 			mesgsize = 128*1024;
 		break;
+	case 'S':
+		defmnt = 0;
+		service = EARGF(usage());
+		break;
+	case 'q':
+		qflag = 1;
+		break;
 	default:
 		usage();
 	}ARGEND
@@ -203,9 +228,10 @@ main(int argc, char *argv[])
 		if(pipe(pfd) < 0)
 			sysfatal("pipe failed");
 		if(defmnt == 0){
-			fd = create("#s/paqfs", OWRITE, 0666);
+			snprint(buf, sizeof buf, "#s/%s", service);
+			fd = create(buf, OWRITE, 0666);
 			if(fd < 0)
-				sysfatal("create of /srv/paqfs failed");
+				sysfatal("create %s: %r", buf);
 			if(fprint(fd, "%d", pfd[0]) < 0)
 				sysfatal("writing /srv/paqfs");
 		}
@@ -868,11 +894,10 @@ init(char *file, int verify)
 	readTrailer(&tlr, file, ds);
 
 	/* asctime includes a newline - yuk */
-	fprint(2, "%s: %s", hdr.label, asctime(gmtime(hdr.time)));
-	fprint(2, "fingerprint: ");
-	for(i=0; i<20; i++)
-		fprint(2, "%.2x", tlr.sha1[i]);
-	fprint(2, "\n");
+	if(!qflag){
+		fprint(2, "%s: %s", hdr.label, asctime(gmtime(hdr.time)));
+		fprint(2, "fingerprint: %V\n", tlr.sha1);
+	}
 
 	cache = emallocz(cachesize*sizeof(Block));
 	p = emalloc(cachesize*blocksize);
@@ -1012,7 +1037,7 @@ void
 readTrailer(PaqTrailer *tlr, char *name, DigestState *ds)
 {
 	uchar buf[TrailerSize];
-	uchar digest[20];
+	uchar digest[SHA1dlen];
 
 	if(Bread(bin, buf, TrailerSize) < TrailerSize)
 		sysfatal("could not read trailer: %s: %r", name);
@@ -1020,8 +1045,8 @@ readTrailer(PaqTrailer *tlr, char *name, DigestState *ds)
 	if(tlr->magic != TrailerMagic)
 		sysfatal("bad trailer magic: %s", name);
 	if(ds) {
-		sha1(buf, TrailerSize-20, digest, ds);
-		if(memcmp(digest, tlr->sha1, 20) != 0)
+		sha1(buf, TrailerSize-SHA1dlen, digest, ds);
+		if(memcmp(digest, tlr->sha1, SHA1dlen) != 0)
 			sysfatal("bad sha1 digest: %s", name);
 	}
 }
@@ -1125,7 +1150,7 @@ getTrailer(uchar *p, PaqTrailer *t)
 {
 	t->magic = getl(p);
 	t->root = getl(p+4);
-	memmove(t->sha1, p+8, 20);
+	memmove(t->sha1, p+8, SHA1dlen);
 }
 
 void

+ 14 - 14
sys/src/cmd/unix/drawterm/cpu-bl.c

@@ -122,24 +122,12 @@ cpumain(int argc, char **argv)
 	if(system == nil)
 		system = "anna.cs.bell-labs.com";
 	ARGBEGIN{
-	case 'o':
-		authserver = "plan9.bell-labs.com";
-		system = "plan9.bell-labs.com";
-		break;
 	case 'a':
 		authserver = EARGF(usage());
 		break;
 	case 'c':
 		system = EARGF(usage());
 		break;
-	case 'd':
-		dbg++;
-		break;
-	case 'e':
-		ealgs = EARGF(usage());
-		if(*ealgs == 0 || strcmp(ealgs, "clear") == 0)
-			ealgs = nil;
-		break;
 	case 'C':
 		cflag++;
 		cmd[0] = '!';
@@ -149,15 +137,27 @@ cpumain(int argc, char **argv)
 			strcat(cmd, p);
 		}
 		break;
+	case 'd':
+		dbg++;
+		break;
+	case 'e':
+		ealgs = EARGF(usage());
+		if(*ealgs == 0 || strcmp(ealgs, "clear") == 0)
+			ealgs = nil;
+		break;
 	case 'k':
 		keyspec = EARGF(usage());
 		break;
-	case 'u':
-		user = EARGF(usage());
+	case 'o':
+		authserver = "plan9.bell-labs.com";
+		system = "plan9.bell-labs.com";
 		break;
 	case 's':
 		secstoreserver = EARGF(usage());
 		break;
+	case 'u':
+		user = EARGF(usage());
+		break;
 	default:
 		usage();
 	}ARGEND;

+ 11 - 11
sys/src/cmd/unix/drawterm/cpu.c

@@ -128,14 +128,6 @@ cpumain(int argc, char **argv)
 	case 'c':
 		system = EARGF(usage());
 		break;
-	case 'd':
-		dbg++;
-		break;
-	case 'e':
-		ealgs = EARGF(usage());
-		if(*ealgs == 0 || strcmp(ealgs, "clear") == 0)
-			ealgs = nil;
-		break;
 	case 'C':
 		cflag++;
 		cmd[0] = '!';
@@ -145,15 +137,23 @@ cpumain(int argc, char **argv)
 			strcat(cmd, p);
 		}
 		break;
+	case 'd':
+		dbg++;
+		break;
+	case 'e':
+		ealgs = EARGF(usage());
+		if(*ealgs == 0 || strcmp(ealgs, "clear") == 0)
+			ealgs = nil;
+		break;
 	case 'k':
 		keyspec = EARGF(usage());
 		break;
-	case 'u':
-		user = EARGF(usage());
-		break;
 	case 's':
 		secstoreserver = EARGF(usage());
 		break;
+	case 'u':
+		user = EARGF(usage());
+		break;
 	default:
 		usage();
 	}ARGEND;

+ 12 - 5
sys/src/cmd/upas/vf/vf.c

@@ -158,11 +158,13 @@ main(int argc, char **argv)
 void
 refuse(char *reason)
 {
+	char *full;
 	static char msg[] =
 		"mail refused: we don't accept executable attachments";
 
-	postnote(PNGROUP, getpid(), smprint("%s: %s", msg, reason));
-	exits(msg);
+	full = smprint("%s: %s", msg, reason);
+	postnote(PNGROUP, getpid(), full);
+	exits(full);
 }
 
 
@@ -365,6 +367,7 @@ passbody(Part *p, int dobound)
  *  save the message somewhere
  */
 static vlong bodyoff;	/* clumsy hack */
+
 static int
 save(Part *p, char *file)
 {
@@ -447,7 +450,8 @@ runchecker(Part *p)
 		sysfatal("fork: %r");
 	case 0:
 		dup(2, 1);
-		execl("/mail/lib/validateattachment", "validateattachment", name, nil);
+		execl("/mail/lib/validateattachment", "validateattachment",
+			name, nil);
 		_exits("exec failed");
 	}
 
@@ -463,8 +467,10 @@ runchecker(Part *p)
 		syslog(0, "mail", "vf wrong pid %d != %d", w->pid, pid);
 		return 0;
 	}
-	if(p->filename)
-		name = s_to_c(p->filename);
+	if(p->filename) {
+		free(name);
+		name = strdup(s_to_c(p->filename));
+	}
 	if(strstr(w->msg, "discard")){
 		syslog(0, "mail", "vf validateattachment rejected %s", name);
 		refuse("rejected by validateattachment");
@@ -474,6 +480,7 @@ runchecker(Part *p)
 		return 1;
 	}
 	free(w);
+	free(name);
 	return 0;
 }