Browse Source

Plan 9 from Bell Labs 2006-09-19

David du Colombier 14 years ago
parent
commit
9bf5e07df9

+ 22 - 24
dist/replica/_plan9.db

@@ -43,21 +43,21 @@
 386/bin/ascii - 775 sys sys 1148500573 64978
 386/bin/astro - 775 sys sys 1148500574 138871
 386/bin/auth - 20000000775 sys sys 1016920815 0
-386/bin/auth/aescbc - 775 sys sys 1148500574 140826
+386/bin/auth/aescbc - 775 sys sys 1158607303 140962
 386/bin/auth/asn12rsa - 775 sys sys 1148500574 120831
 386/bin/auth/authsrv - 775 sys sys 1148500575 166593
 386/bin/auth/changeuser - 775 sys sys 1148500575 97390
-386/bin/auth/convkeys - 775 sys sys 1148500575 87819
-386/bin/auth/convkeys2 - 775 sys sys 1148500576 87878
+386/bin/auth/convkeys - 775 sys sys 1158607304 88100
+386/bin/auth/convkeys2 - 775 sys sys 1158607304 88159
 386/bin/auth/cron - 775 sys sys 1152291495 144824
 386/bin/auth/debug - 775 sys sys 1148500577 101660
 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 1148500577 322095
+386/bin/auth/factotum - 775 sys sys 1158607305 322231
 386/bin/auth/fgui - 775 sys sys 1155491744 219084
 386/bin/auth/guard.srv - 775 sys sys 1148500579 143770
 386/bin/auth/iam - 775 sys sys 1085076981 50791
-386/bin/auth/keyfs - 775 sys sys 1148500579 115969
+386/bin/auth/keyfs - 775 sys sys 1158607305 116201
 386/bin/auth/login - 775 sys sys 1148500580 104841
 386/bin/auth/newns - 775 sys sys 1148500580 90060
 386/bin/auth/none - 775 sys sys 1148500580 89343
@@ -71,13 +71,13 @@
 386/bin/auth/rsafill - 775 sys sys 1148500583 144067
 386/bin/auth/rsagen - 775 sys sys 1148500584 153627
 386/bin/auth/secretpem - 775 sys sys 1045537944 118526
-386/bin/auth/secstore - 775 sys sys 1148500585 195957
+386/bin/auth/secstore - 775 sys sys 1158607306 196093
 386/bin/auth/secstored - 775 sys sys 1148500585 198069
 386/bin/auth/secuser - 775 sys sys 1148500586 153330
 386/bin/auth/status - 775 sys sys 1020319060 738
 386/bin/auth/uniq - 775 sys sys 1148500586 63408
 386/bin/auth/warning - 775 sys sys 1148500587 101389
-386/bin/auth/wrkey - 775 sys sys 1148500587 75558
+386/bin/auth/wrkey - 775 sys sys 1158607306 75694
 386/bin/aux - 20000000775 sys sys 1016920817 0
 386/bin/aux/8prefix - 775 sys sys 1148500587 67197
 386/bin/aux/9pcon - 775 sys sys 1148500588 95247
@@ -150,7 +150,7 @@
 386/bin/aux/trampoline - 775 sys sys 1148500604 84239
 386/bin/aux/typepasswd - 775 sys sys 1148500604 69832
 386/bin/aux/usage - 775 sys sys 1148500605 59903
-386/bin/aux/vga - 775 sys sys 1155696972 336205
+386/bin/aux/vga - 775 sys sys 1158607307 336305
 386/bin/aux/vmmousepoll - 775 sys sys 1032480572 41434
 386/bin/aux/vmware - 775 sys sys 1049428256 453
 386/bin/aux/vmwarefs - 775 sys sys 1095563640 99117
@@ -208,7 +208,7 @@
 386/bin/disk/exsort - 775 sys sys 1148500624 60549
 386/bin/disk/fdisk - 775 sys sys 1148500625 104190
 386/bin/disk/format - 775 sys sys 1148500625 89872
-386/bin/disk/kfs - 775 sys sys 1148500626 249364
+386/bin/disk/kfs - 775 sys sys 1158607307 249500
 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 1148500626 74012
@@ -545,7 +545,7 @@
 386/lib/lib9p.a - 664 sys sys 1143777858 91076
 386/lib/libString.a - 664 sys sys 1143777858 22126
 386/lib/libauth.a - 664 sys sys 1143777858 58570
-386/lib/libauthsrv.a - 664 sys sys 1144256044 34138
+386/lib/libauthsrv.a - 664 sys sys 1158607308 34672
 386/lib/libbin.a - 664 sys sys 1143777859 2534
 386/lib/libbio.a - 664 sys sys 1143777859 25980
 386/lib/libc.a - 664 sys sys 1155491761 503488
@@ -5624,8 +5624,8 @@ sys/doc/acme/bs - 664 sys sys 944959634 556
 sys/doc/acme/mkfile - 664 sys sys 1138459292 295
 sys/doc/ape.ms - 664 sys sys 1146174667 12873
 sys/doc/ape.ps - 664 sys sys 960837914 258779
-sys/doc/asm.ms - 664 sys sys 1138396403 31516
-sys/doc/asm.ps - 664 sys sys 960837915 322051
+sys/doc/asm.ms - 664 sys sys 1158549534 31523
+sys/doc/asm.ps - 664 sys sys 1158549581 333976
 sys/doc/auth.ms - 664 sys sys 1138396404 66854
 sys/doc/auth.ps - 664 sys sys 1021579976 451672
 sys/doc/cleanps - 775 sys sys 961259933 184
@@ -7754,7 +7754,7 @@ sys/man/8/snoopy - 664 sys sys 1146318297 4288
 sys/man/8/stats - 664 sys sys 1067722908 4291
 sys/man/8/statusbar - 664 sys sys 1141313214 1253
 sys/man/8/stub - 664 sys sys 1044830500 943
-sys/man/8/swap - 664 sys sys 944959679 880
+sys/man/8/swap - 664 sys sys 1158604825 886
 sys/man/8/timesync - 664 sys sys 1145882352 1717
 sys/man/8/tlssrv - 664 sys sys 1037580152 2594
 sys/man/8/trampoline - 664 sys sys 1126104844 1199
@@ -8032,7 +8032,7 @@ sys/src/9/pc/screen.c - 664 sys sys 1136336092 13971
 sys/src/9/pc/screen.h - 664 sys sys 1147023549 4256
 sys/src/9/pc/sd53c8xx.c - 664 sys sys 1149280015 55135
 sys/src/9/pc/sd53c8xx.n - 664 sys sys 1131290556 12657
-sys/src/9/pc/sdata.c - 664 sys sys 1155361705 52464
+sys/src/9/pc/sdata.c - 664 sys sys 1158593448 52577
 sys/src/9/pc/sdmv50xx.c - 664 sys sys 1131290638 25780
 sys/src/9/pc/sdmylex.c - 664 sys sys 1133068062 27806
 sys/src/9/pc/sdscsi.c - 664 sys sys 1146746630 7106
@@ -9694,7 +9694,7 @@ sys/src/cmd/aux/typepasswd.c - 664 sys sys 1143759348 1749
 sys/src/cmd/aux/unlock - 664 sys sys 944960793 0
 sys/src/cmd/aux/usage.c - 664 sys sys 1139744276 1095
 sys/src/cmd/aux/vga - 20000000775 sys sys 1018723175 0
-sys/src/cmd/aux/vga/3dfx.c - 664 sys sys 1026337537 6886
+sys/src/cmd/aux/vga/3dfx.c - 664 sys sys 1158594480 6891
 sys/src/cmd/aux/vga/adventure - 664 sys sys 1048274168 14869
 sys/src/cmd/aux/vga/ark2000pv.c - 664 sys sys 1014925006 5958
 sys/src/cmd/aux/vga/att20c49x.c - 664 sys sys 1014925007 1730
@@ -9720,13 +9720,13 @@ sys/src/cmd/aux/vga/io.c - 664 sys sys 1131110425 6329
 sys/src/cmd/aux/vga/mach32.c - 664 sys sys 1014925009 6004
 sys/src/cmd/aux/vga/mach64.c - 664 sys sys 1014925009 8279
 sys/src/cmd/aux/vga/mach64xx.c - 664 sys sys 1097900455 30266
-sys/src/cmd/aux/vga/main.c - 664 sys sys 1131741978 9725
+sys/src/cmd/aux/vga/main.c - 664 sys sys 1158594481 9765
 sys/src/cmd/aux/vga/mga2164w.c - 664 sys sys 1135487945 13173
-sys/src/cmd/aux/vga/mga4xx.c - 664 sys sys 1155364222 36908
+sys/src/cmd/aux/vga/mga4xx.c - 664 sys sys 1158594482 36898
 sys/src/cmd/aux/vga/mkfile - 664 sys sys 1115734903 927
 sys/src/cmd/aux/vga/neomagic.c - 664 sys sys 1104430499 8975
 sys/src/cmd/aux/vga/notes.txt - 664 sys sys 1028334647 14376
-sys/src/cmd/aux/vga/nvidia.c - 664 sys sys 1145906420 33115
+sys/src/cmd/aux/vga/nvidia.c - 664 sys sys 1158594482 33114
 sys/src/cmd/aux/vga/palette.c - 664 sys sys 1014925010 2201
 sys/src/cmd/aux/vga/pci.c - 664 sys sys 1014925011 8659
 sys/src/cmd/aux/vga/pci.h - 664 sys sys 1014925011 3290
@@ -14138,11 +14138,11 @@ sys/src/cmd/vac/source.c - 664 sys sys 1039797584 6723
 sys/src/cmd/vac/srcload.c - 664 sys sys 1036024047 4925
 sys/src/cmd/vac/stdinc.h - 664 sys sys 1036006059 121
 sys/src/cmd/vac/util.c - 664 sys sys 1019678787 930
-sys/src/cmd/vac/vac.c - 664 sys sys 1036470170 23082
+sys/src/cmd/vac/vac.c - 664 sys sys 1158618260 23102
 sys/src/cmd/vac/vac.h - 664 sys sys 1091904424 3598
 sys/src/cmd/vac/vacfs.c - 664 sys sys 1134305451 13635
 sys/src/cmd/vac/vactest.c - 664 sys sys 1036024047 2742
-sys/src/cmd/vac/vtdump.c - 664 sys sys 1036006056 7170
+sys/src/cmd/vac/vtdump.c - 664 sys sys 1158618245 7166
 sys/src/cmd/vac/vtread.c - 664 sys sys 1019678788 2052
 sys/src/cmd/vac/wtest.c - 664 sys sys 1019678788 766
 sys/src/cmd/vc - 20000000775 sys sys 947099614 0
@@ -14172,7 +14172,7 @@ sys/src/cmd/venti/clumpstats.c - 664 sys sys 1055707430 2239
 sys/src/cmd/venti/conf.rc - 775 sys sys 1055707446 1416
 sys/src/cmd/venti/config.c - 664 sys sys 1138471074 4930
 sys/src/cmd/venti/conv.c - 664 sys sys 1019678878 8202
-sys/src/cmd/venti/copy.c - 664 sys sys 1055707434 3517
+sys/src/cmd/venti/copy.c - 664 sys sys 1158618908 3713
 sys/src/cmd/venti/dat.h - 664 sys sys 1132452191 15346
 sys/src/cmd/venti/dcache.c - 664 sys sys 1019678878 7374
 sys/src/cmd/venti/dump.c - 664 sys sys 1068520313 1578
@@ -14630,7 +14630,7 @@ sys/src/libauthsrv/mkfile - 664 sys sys 1035389776 409
 sys/src/libauthsrv/nvcsum.c - 664 sys sys 1015091654 192
 sys/src/libauthsrv/opasstokey.c - 664 sys sys 1015091654 448
 sys/src/libauthsrv/passtokey.c - 664 sys sys 1143695654 488
-sys/src/libauthsrv/readnvram.c - 664 sys sys 1143695645 8769
+sys/src/libauthsrv/readnvram.c - 664 sys sys 1158593647 8945
 sys/src/libbin - 20000000775 sys sys 984777332 0
 sys/src/libbin/bin.c - 664 sys sys 1135487932 1829
 sys/src/libbin/mkfile - 664 sys sys 1035389776 197
@@ -15666,5 +15666,3 @@ 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
-sys/doc/asm.ms - 664 sys sys 1158549534 31523
-sys/doc/asm.ps - 664 sys sys 1158549581 333976

+ 20 - 20
dist/replica/plan9.db

@@ -43,21 +43,21 @@
 386/bin/ascii - 775 sys sys 1148500573 64978
 386/bin/astro - 775 sys sys 1148500574 138871
 386/bin/auth - 20000000775 sys sys 1016920815 0
-386/bin/auth/aescbc - 775 sys sys 1148500574 140826
+386/bin/auth/aescbc - 775 sys sys 1158607303 140962
 386/bin/auth/asn12rsa - 775 sys sys 1148500574 120831
 386/bin/auth/authsrv - 775 sys sys 1148500575 166593
 386/bin/auth/changeuser - 775 sys sys 1148500575 97390
-386/bin/auth/convkeys - 775 sys sys 1148500575 87819
-386/bin/auth/convkeys2 - 775 sys sys 1148500576 87878
+386/bin/auth/convkeys - 775 sys sys 1158607304 88100
+386/bin/auth/convkeys2 - 775 sys sys 1158607304 88159
 386/bin/auth/cron - 775 sys sys 1152291495 144824
 386/bin/auth/debug - 775 sys sys 1148500577 101660
 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 1148500577 322095
+386/bin/auth/factotum - 775 sys sys 1158607305 322231
 386/bin/auth/fgui - 775 sys sys 1155491744 219084
 386/bin/auth/guard.srv - 775 sys sys 1148500579 143770
 386/bin/auth/iam - 775 sys sys 1085076981 50791
-386/bin/auth/keyfs - 775 sys sys 1148500579 115969
+386/bin/auth/keyfs - 775 sys sys 1158607305 116201
 386/bin/auth/login - 775 sys sys 1148500580 104841
 386/bin/auth/newns - 775 sys sys 1148500580 90060
 386/bin/auth/none - 775 sys sys 1148500580 89343
@@ -71,13 +71,13 @@
 386/bin/auth/rsafill - 775 sys sys 1148500583 144067
 386/bin/auth/rsagen - 775 sys sys 1148500584 153627
 386/bin/auth/secretpem - 775 sys sys 1045537944 118526
-386/bin/auth/secstore - 775 sys sys 1148500585 195957
+386/bin/auth/secstore - 775 sys sys 1158607306 196093
 386/bin/auth/secstored - 775 sys sys 1148500585 198069
 386/bin/auth/secuser - 775 sys sys 1148500586 153330
 386/bin/auth/status - 775 sys sys 1020319060 738
 386/bin/auth/uniq - 775 sys sys 1148500586 63408
 386/bin/auth/warning - 775 sys sys 1148500587 101389
-386/bin/auth/wrkey - 775 sys sys 1148500587 75558
+386/bin/auth/wrkey - 775 sys sys 1158607306 75694
 386/bin/aux - 20000000775 sys sys 1016920817 0
 386/bin/aux/8prefix - 775 sys sys 1148500587 67197
 386/bin/aux/9pcon - 775 sys sys 1148500588 95247
@@ -150,7 +150,7 @@
 386/bin/aux/trampoline - 775 sys sys 1148500604 84239
 386/bin/aux/typepasswd - 775 sys sys 1148500604 69832
 386/bin/aux/usage - 775 sys sys 1148500605 59903
-386/bin/aux/vga - 775 sys sys 1155696972 336205
+386/bin/aux/vga - 775 sys sys 1158607307 336305
 386/bin/aux/vmmousepoll - 775 sys sys 1032480572 41434
 386/bin/aux/vmware - 775 sys sys 1049428256 453
 386/bin/aux/vmwarefs - 775 sys sys 1095563640 99117
@@ -208,7 +208,7 @@
 386/bin/disk/exsort - 775 sys sys 1148500624 60549
 386/bin/disk/fdisk - 775 sys sys 1148500625 104190
 386/bin/disk/format - 775 sys sys 1148500625 89872
-386/bin/disk/kfs - 775 sys sys 1148500626 249364
+386/bin/disk/kfs - 775 sys sys 1158607307 249500
 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 1148500626 74012
@@ -545,7 +545,7 @@
 386/lib/lib9p.a - 664 sys sys 1143777858 91076
 386/lib/libString.a - 664 sys sys 1143777858 22126
 386/lib/libauth.a - 664 sys sys 1143777858 58570
-386/lib/libauthsrv.a - 664 sys sys 1144256044 34138
+386/lib/libauthsrv.a - 664 sys sys 1158607308 34672
 386/lib/libbin.a - 664 sys sys 1143777859 2534
 386/lib/libbio.a - 664 sys sys 1143777859 25980
 386/lib/libc.a - 664 sys sys 1155491761 503488
@@ -7754,7 +7754,7 @@ sys/man/8/snoopy - 664 sys sys 1146318297 4288
 sys/man/8/stats - 664 sys sys 1067722908 4291
 sys/man/8/statusbar - 664 sys sys 1141313214 1253
 sys/man/8/stub - 664 sys sys 1044830500 943
-sys/man/8/swap - 664 sys sys 944959679 880
+sys/man/8/swap - 664 sys sys 1158604825 886
 sys/man/8/timesync - 664 sys sys 1145882352 1717
 sys/man/8/tlssrv - 664 sys sys 1037580152 2594
 sys/man/8/trampoline - 664 sys sys 1126104844 1199
@@ -8032,7 +8032,7 @@ sys/src/9/pc/screen.c - 664 sys sys 1136336092 13971
 sys/src/9/pc/screen.h - 664 sys sys 1147023549 4256
 sys/src/9/pc/sd53c8xx.c - 664 sys sys 1149280015 55135
 sys/src/9/pc/sd53c8xx.n - 664 sys sys 1131290556 12657
-sys/src/9/pc/sdata.c - 664 sys sys 1155361705 52464
+sys/src/9/pc/sdata.c - 664 sys sys 1158593448 52577
 sys/src/9/pc/sdmv50xx.c - 664 sys sys 1131290638 25780
 sys/src/9/pc/sdmylex.c - 664 sys sys 1133068062 27806
 sys/src/9/pc/sdscsi.c - 664 sys sys 1146746630 7106
@@ -9694,7 +9694,7 @@ sys/src/cmd/aux/typepasswd.c - 664 sys sys 1143759348 1749
 sys/src/cmd/aux/unlock - 664 sys sys 944960793 0
 sys/src/cmd/aux/usage.c - 664 sys sys 1139744276 1095
 sys/src/cmd/aux/vga - 20000000775 sys sys 1018723175 0
-sys/src/cmd/aux/vga/3dfx.c - 664 sys sys 1026337537 6886
+sys/src/cmd/aux/vga/3dfx.c - 664 sys sys 1158594480 6891
 sys/src/cmd/aux/vga/adventure - 664 sys sys 1048274168 14869
 sys/src/cmd/aux/vga/ark2000pv.c - 664 sys sys 1014925006 5958
 sys/src/cmd/aux/vga/att20c49x.c - 664 sys sys 1014925007 1730
@@ -9720,13 +9720,13 @@ sys/src/cmd/aux/vga/io.c - 664 sys sys 1131110425 6329
 sys/src/cmd/aux/vga/mach32.c - 664 sys sys 1014925009 6004
 sys/src/cmd/aux/vga/mach64.c - 664 sys sys 1014925009 8279
 sys/src/cmd/aux/vga/mach64xx.c - 664 sys sys 1097900455 30266
-sys/src/cmd/aux/vga/main.c - 664 sys sys 1131741978 9725
+sys/src/cmd/aux/vga/main.c - 664 sys sys 1158594481 9765
 sys/src/cmd/aux/vga/mga2164w.c - 664 sys sys 1135487945 13173
-sys/src/cmd/aux/vga/mga4xx.c - 664 sys sys 1155364222 36908
+sys/src/cmd/aux/vga/mga4xx.c - 664 sys sys 1158594482 36898
 sys/src/cmd/aux/vga/mkfile - 664 sys sys 1115734903 927
 sys/src/cmd/aux/vga/neomagic.c - 664 sys sys 1104430499 8975
 sys/src/cmd/aux/vga/notes.txt - 664 sys sys 1028334647 14376
-sys/src/cmd/aux/vga/nvidia.c - 664 sys sys 1145906420 33115
+sys/src/cmd/aux/vga/nvidia.c - 664 sys sys 1158594482 33114
 sys/src/cmd/aux/vga/palette.c - 664 sys sys 1014925010 2201
 sys/src/cmd/aux/vga/pci.c - 664 sys sys 1014925011 8659
 sys/src/cmd/aux/vga/pci.h - 664 sys sys 1014925011 3290
@@ -14138,11 +14138,11 @@ sys/src/cmd/vac/source.c - 664 sys sys 1039797584 6723
 sys/src/cmd/vac/srcload.c - 664 sys sys 1036024047 4925
 sys/src/cmd/vac/stdinc.h - 664 sys sys 1036006059 121
 sys/src/cmd/vac/util.c - 664 sys sys 1019678787 930
-sys/src/cmd/vac/vac.c - 664 sys sys 1036470170 23082
+sys/src/cmd/vac/vac.c - 664 sys sys 1158618260 23102
 sys/src/cmd/vac/vac.h - 664 sys sys 1091904424 3598
 sys/src/cmd/vac/vacfs.c - 664 sys sys 1134305451 13635
 sys/src/cmd/vac/vactest.c - 664 sys sys 1036024047 2742
-sys/src/cmd/vac/vtdump.c - 664 sys sys 1036006056 7170
+sys/src/cmd/vac/vtdump.c - 664 sys sys 1158618245 7166
 sys/src/cmd/vac/vtread.c - 664 sys sys 1019678788 2052
 sys/src/cmd/vac/wtest.c - 664 sys sys 1019678788 766
 sys/src/cmd/vc - 20000000775 sys sys 947099614 0
@@ -14172,7 +14172,7 @@ sys/src/cmd/venti/clumpstats.c - 664 sys sys 1055707430 2239
 sys/src/cmd/venti/conf.rc - 775 sys sys 1055707446 1416
 sys/src/cmd/venti/config.c - 664 sys sys 1138471074 4930
 sys/src/cmd/venti/conv.c - 664 sys sys 1019678878 8202
-sys/src/cmd/venti/copy.c - 664 sys sys 1055707434 3517
+sys/src/cmd/venti/copy.c - 664 sys sys 1158618908 3713
 sys/src/cmd/venti/dat.h - 664 sys sys 1132452191 15346
 sys/src/cmd/venti/dcache.c - 664 sys sys 1019678878 7374
 sys/src/cmd/venti/dump.c - 664 sys sys 1068520313 1578
@@ -14630,7 +14630,7 @@ sys/src/libauthsrv/mkfile - 664 sys sys 1035389776 409
 sys/src/libauthsrv/nvcsum.c - 664 sys sys 1015091654 192
 sys/src/libauthsrv/opasstokey.c - 664 sys sys 1015091654 448
 sys/src/libauthsrv/passtokey.c - 664 sys sys 1143695654 488
-sys/src/libauthsrv/readnvram.c - 664 sys sys 1143695645 8769
+sys/src/libauthsrv/readnvram.c - 664 sys sys 1158593647 8945
 sys/src/libbin - 20000000775 sys sys 984777332 0
 sys/src/libbin/bin.c - 664 sys sys 1135487932 1829
 sys/src/libbin/mkfile - 664 sys sys 1035389776 197

+ 21 - 0
dist/replica/plan9.log

@@ -30458,3 +30458,24 @@
 1158543005 0 c lib/face/48x48x8/.dict - 664 sys sys 1158542759 2706
 1158550206 0 c sys/doc/asm.ms - 664 sys sys 1158549534 31523
 1158550206 1 c sys/doc/asm.ps - 664 sys sys 1158549581 333976
+1158593407 0 c sys/src/9/pc/sdata.c - 664 sys sys 1158593448 52577
+1158595207 0 c sys/src/cmd/aux/vga/3dfx.c - 664 sys sys 1158594480 6891
+1158595207 1 c sys/src/cmd/aux/vga/main.c - 664 sys sys 1158594481 9765
+1158595207 2 c sys/src/cmd/aux/vga/mga4xx.c - 664 sys sys 1158594482 36898
+1158595207 3 c sys/src/cmd/aux/vga/nvidia.c - 664 sys sys 1158594482 33114
+1158595207 4 c sys/src/libauthsrv/readnvram.c - 664 sys sys 1158593647 8945
+1158606007 0 c sys/man/8/swap - 664 sys sys 1158604825 886
+1158607806 0 c 386/bin/auth/aescbc - 775 sys sys 1158607303 140962
+1158607806 1 c 386/bin/auth/convkeys - 775 sys sys 1158607304 88100
+1158607806 2 c 386/bin/auth/convkeys2 - 775 sys sys 1158607304 88159
+1158607806 3 c 386/bin/auth/factotum - 775 sys sys 1158607305 322231
+1158607806 4 c 386/bin/auth/keyfs - 775 sys sys 1158607305 116201
+1158607806 5 c 386/bin/auth/secstore - 775 sys sys 1158607306 196093
+1158607806 6 c 386/bin/auth/wrkey - 775 sys sys 1158607306 75694
+1158607806 7 c 386/bin/aux/vga - 775 sys sys 1158607307 336305
+1158607806 8 c 386/bin/disk/kfs - 775 sys sys 1158607307 249500
+1158607806 9 c 386/lib/libauthsrv.a - 664 sys sys 1158607308 34672
+1158618607 0 c sys/src/cmd/vac/vac.c - 664 sys sys 1158618260 23102
+1158618607 1 c sys/src/cmd/vac/vtdump.c - 664 sys sys 1158618245 7166
+1158618607 2 c sys/src/cmd/venti/copy.c - 664 sys sys 1158618341 3488
+1158620407 0 c sys/src/cmd/venti/copy.c - 664 sys sys 1158618908 3713

+ 1 - 1
sys/man/8/swap

@@ -25,6 +25,6 @@ the device an error is returned instead.
 .SH SOURCE
 .B /sys/src/cmd/swap.c
 .SH BUGS
-Swapping to a file served by a user-level process, such as
+Swapping to a file served by a local user-level process, such as
 .IR kfs (4),
 can lead to deadlock; use raw devices or remote files instead.

+ 3 - 1
sys/src/9/pc/sdata.c

@@ -1915,7 +1915,7 @@ atapnp(void)
 		case (0x4D69<<16)|0x105A:	/* Promise Ultra/133 TX2 */
 		case (0x3373<<16)|0x105A:	/* Promise 20378 RAID */
 		case (0x3149<<16)|0x1106:	/* VIA VT8237 SATA/RAID */
-		case (0x3112<<16)|0x1095:   	/* SiI 3112 SATA/RAID */
+		case (0x3112<<16)|0x1095:	/* SiI 3112 SATA/RAID */
 			maxio = 15;
 			span = 8*1024;
 			/*FALLTHROUGH*/
@@ -1968,6 +1968,8 @@ atapnp(void)
 		case (0x0053<<16)|0x10DE:	/* nVidia nForce4 */
 		case (0x0054<<16)|0x10DE:	/* nVidia nForce4 SATA */
 		case (0x0055<<16)|0x10DE:	/* nVidia nForce4 SATA */
+		case (0x0266<<16)|0x10DE:	/* nVidia nForce4 430 SATA */
+		case (0x0267<<16)|0x10DE:	/* nVidia nForce4 430 SATA */
 			/*
 			 * Ditto, although it may have a different base
 			 * address for the registers (0x50?).

+ 2 - 1
sys/src/cmd/aux/vga/3dfx.c

@@ -125,7 +125,8 @@ options(Vga*, Ctlr* ctlr)
 static void
 tdfxclock(Vga* vga, Ctlr*)
 {
-	uint d, dmin, f, m, n, p;
+	int d, dmin;
+	uint f, m, n, p;
 
 	dmin = vga->f[0];
 	for(m = 1; m < vga->m[1]; m++){

+ 16 - 23
sys/src/cmd/aux/vga/main.c

@@ -8,8 +8,6 @@
 Biobuf stdout;
 
 static int iflag, lflag, pflag, rflag;
-static char *usage =
-	"usage: aux/vga [ -BcdilpvV ] [ -b bios-id ] [ -m monitor ] [ -x db ] [ mode [ virtualsize ] ]\n";
 
 static char *dbname = "/lib/vgadb";
 static char monitordb[128];
@@ -148,6 +146,13 @@ chanstr[32+1] = {
 [32]	"x8r8g8b8",
 };
 
+static void
+usage(void)
+{
+	fprint(2, "usage: aux/vga [ -BcdilpvV ] [ -b bios-id ] [ -m monitor ] [ -x db ] [ mode [ virtualsize ] ]\n");
+	exits("usage");
+}
+
 void
 main(int argc, char** argv)
 {
@@ -166,66 +171,56 @@ main(int argc, char** argv)
 	psize = vsize = "640x480x8";
 
 	ARGBEGIN{
-
+	default:
+		usage();
+		break;
 	case 'b':
-		bios = ARGF();
+		bios = EARGF(usage());
 		break;
-
 	case 'B':
 		dumpbios(0x10000);
 		exits(0);
-
 	case 'c':
 		cflag = 1;
 		break;
-
 	case 'd':
 		dflag = 1;
 		break;
-
 	case 'i':
 		iflag = 1;
 		break;
-
 	case 'l':
 		lflag = 1;
 		break;
-
 	case 'm':
-		type = ARGF();
+		type = EARGF(usage());
 		break;
-
 	case 'p':
 		pflag = 1;
 		break;
-
 	case 'r':
 		/*
 		 * rflag > 1 means "leave me alone, I know what I'm doing."
 		 */
 		rflag++;
 		break;
-
 	case 'v':
 		vflag = 1;
 		break;
-
 	case 'V':
 		vflag = 1;
 		Vflag = 1;
 		break;
-
 	case 'x':
-		dbname = ARGF();
+		dbname = EARGF(usage());
 		break;
-
-	default:
-		error(usage, argv0);
-
 	}ARGEND
 
 	virtual = 0;
 	switch(argc){
+	default:
+		usage();
+		break;
 	case 1:
 		vsize = psize = argv[0];
 		break;
@@ -236,8 +231,6 @@ main(int argc, char** argv)
 		break;
 	case 0:
 		break;
-	default:
-		error(usage, argv0);
 	}
 
 	if(lflag && strcmp(vsize, "text") == 0){

+ 3 - 3
sys/src/cmd/aux/vga/mga4xx.c

@@ -647,7 +647,7 @@ G450FindNextPLLParam(Mga* mga, ulong ulFout, ulong *pulPLLMNP)
 	{
 		ulVCOMin = 230000;
 	}
-   
+
 	if((ucM == 9) && (ucP & 0x40))
 	{
 		*pulPLLMNP = 0xffffffff;
@@ -696,7 +696,7 @@ G450FindNextPLLParam(Mga* mga, ulong ulFout, ulong *pulPLLMNP)
 		*pulPLLMNP |= (ulong)ucP;
 	}
 }
- 
+
 static void 
 G450FindFirstPLLParam(Mga* mga, ulong ulFout, ulong *pulPLLMNP)
 {
@@ -1642,7 +1642,7 @@ load(Vga* vga, Ctlr* ctlr)
 			mgawrite8(mga, RAMDACPALDATA, i);
 		}
 	}
-      
+
 	trace("mga: Palette initialised !\n");
 
 	/* Enable Cursor */

+ 1 - 1
sys/src/cmd/aux/vga/nvidia.c

@@ -677,7 +677,7 @@ load(Vga* vga, Ctlr* ctlr)
 			regions = 15;
 		else
 			regions = 12;
- 
+
 		for(i = 0; i < regions; i++){
 			nv->pfb[(0x0600 + (i * 0x10))/4] = 0;
 			nv->pfb[(0x0604 + (i * 0x10))/4] = vga->vmz - 1;

+ 25 - 24
sys/src/cmd/vac/vac.c

@@ -125,7 +125,7 @@ main(int argc, char *argv[])
 		break;
 	case 'e':
 		if(nexclude >= MaxExclude)
-			sysfatal("too many exclusions\n");
+			sysfatal("too many exclusions");
 		exclude[nexclude] = ARGF();
 		if(exclude[nexclude] == nil)
 			usage();
@@ -239,7 +239,7 @@ assert(n > 0);
 		return 0;
 	if(!vtSha1Check(score, buf, n)) {
 		uchar score2[VtScoreSize];
-		
+
 		vtSha1(score2, buf, n);
 fprint(2, "vtSha1Check: n = %d %V %V\n", n, score, score2);
 		vtSetError("vtSha1Check failed");
@@ -266,7 +266,7 @@ vac(VtSession *z, char *argv[])
 	VacDir vd;
 
 	if(getwd(cwd, sizeof(cwd)) == 0)
-		sysfatal("can't find current directory: %r\n");
+		sysfatal("can't find current directory: %r");
 
 	dsink = dirSinkAlloc(z, bsize, bsize);
 
@@ -276,13 +276,13 @@ vac(VtSession *z, char *argv[])
 		if(fs == nil)
 			fprint(2, "could not open diff: %s: %s\n", dfile, vtGetError());
 	}
-		
+
 
 	if(oname != nil) {
 		fd = create(oname, OWRITE, 0666);
 		if(fd < 0)
 			sysfatal("could not create file: %s: %r", oname);
-	} else 
+	} else
 		fd = 1;
 
 	dir = dirfstat(fd);
@@ -297,7 +297,8 @@ vac(VtSession *z, char *argv[])
 				cp2 = cp;
 		if (cp2 != *argv) {
 			*cp2 = '\0';
-			chdir(*argv);
+			if (chdir(*argv) < 0)
+				sysfatal("can't cd to %s: %r", *argv);
 			*cp2 = '/';
 			cp2++;
 			cd = 1;
@@ -309,9 +310,9 @@ vac(VtSession *z, char *argv[])
 		if(vff)
 			vfDecRef(vff);
 		if(cd && chdir(cwd) < 0)
-			sysfatal("can't cd back to %s: %r\n", cwd);
+			sysfatal("can't cd back to %s: %r", cwd);
 	}
-	
+
 	if(isi) {
 		vff = nil;
 		if(fs)
@@ -337,14 +338,14 @@ vac(VtSession *z, char *argv[])
 	metaSinkWriteDir(ms, &vd);
 	vdCleanup(&vd);
 	metaSinkClose(ms);
-	
+
 	ds = dirSinkAlloc(z, bsize, bsize);
 	dirSinkWriteSink(ds, dsink->sink);
 	dirSinkWriteSink(ds, dsink->msink->sink);
 	dirSinkWriteSink(ds, ms->sink);
 	dirSinkClose(ds);
 
-	memset(&root, 0, sizeof(root));		
+	memset(&root, 0, sizeof(root));
 	root.version = VtRootVersion;
 	strncpy(root.name, dir->name, sizeof(root.name));
 	root.name[sizeof(root.name)-1] = 0;
@@ -360,7 +361,7 @@ vac(VtSession *z, char *argv[])
 	dirSinkFree(dsink);
 	if(fs != nil)
 		vfsClose(fs);
-	
+
 	vtRootPack(&root, buf);
 	if(!vacWrite(z, score, VtRootType, buf, VtRootSize))
 		vtFatal("vacWrite failed: %s", vtGetError());
@@ -369,7 +370,7 @@ vac(VtSession *z, char *argv[])
 	for(i=0; i<VtScoreSize; i++)
 		fprint(fd, "%.2x", score[i]);
 	fprint(fd, "\n");
-	
+
 	/* avoid remove at cleanup */
 	oname = nil;
 	return 1;
@@ -380,7 +381,7 @@ isExcluded(char *name)
 {
 	int bot, top, i, x;
 
-	bot = 0;	
+	bot = 0;
 	top = nexclude;
 	while(bot < top) {
 		i = (bot+top)>>1;
@@ -429,7 +430,7 @@ vacFile(DirSink *dsink, char *lname, char *sname, VacFile *vf)
 
 	entry = dsink->nentry;
 
-	if(dir->mode & DMDIR) 
+	if(dir->mode & DMDIR)
 		vacDir(dsink, fd, lname, sname, vf);
 	else
 		vacData(dsink, fd, lname, vf, dir);
@@ -633,7 +634,7 @@ vacMergeFile(DirSink *dsink, VacFile *vf, VacDir *dir, uvlong offset, uvlong *ma
 		e = dir->mentry;
 		if(e == 0)
 			e = dir->entry + 1;
-		
+
 		if(vfRead(vf, buf, VtEntrySize, e*VtEntrySize) != VtEntrySize) {
 			warn("could not read venti dir entry: %s\n", dir->elem);
 			return 0;
@@ -659,10 +660,10 @@ vacMergeFile(DirSink *dsink, VacFile *vf, VacDir *dir, uvlong offset, uvlong *ma
 	}
 
 	dirSinkWrite(dsink, &dd);
-	if(dir->mode & ModeDir)	
+	if(dir->mode & ModeDir)
 		dirSinkWrite(dsink, &md);
 	metaSinkWriteDir(dsink->msink, dir);
-	
+
 	return 1;
 }
 
@@ -703,7 +704,7 @@ vacMerge(DirSink *dsink, char *lname, char *sname)
 		if(vdeRead(d, &dir, 1) < 1)
 			break;
 		vacMergeFile(dsink, vf, &dir, fileid, &max);
-		vdCleanup(&dir);	
+		vdCleanup(&dir);
 	}
 	fileid += max;
 
@@ -766,7 +767,7 @@ sinkWriteScore(Sink *k, uchar score[VtScoreSize], int n)
 
 	/* round size up to multiple of dsize */
 	d->size = d->dsize * ((d->size + d->dsize-1)/d->dsize);
-	
+
 	d->size += n;
 }
 
@@ -797,7 +798,7 @@ sizeToDepth(uvlong s, int psize, int dsize)
 {
 	int np;
 	int d;
-	
+
 	/* determine pointer depth */
 	np = psize/VtScoreSize;
 	s = (s + dsize - 1)/dsize;
@@ -988,14 +989,14 @@ metaSinkFlush(MetaSink *k)
 	mb.maxindex = k->maxindex;
 	mb.buf = p;
 	mbPack(&mb);
-	
+
 	p += MetaHeaderSize;
 
 	/* XXX this is not reentrant! */
 	blockBase = k->buf;
 	qsort(p, k->nindex, MetaIndexSize, dirCmp);
 	p += k->nindex*MetaIndexSize;
-	
+
 	memset(p, 0, (k->maxindex-k->nindex)*MetaIndexSize);
 	p += (k->maxindex-k->nindex)*MetaIndexSize;
 
@@ -1052,7 +1053,7 @@ metaSinkWrite(MetaSink *k, uchar *data, int n)
 		metaSinkFlush(k);
 	if(k->p + n > k->ep)
 		vtFatal("directory entry too large");
-	
+
 	memmove(k->p, data, n);
 	k->p += n;
 }
@@ -1062,7 +1063,7 @@ metaSinkWriteDir(MetaSink *ms, VacDir *dir)
 {
 	metaSinkPutUint32(ms, DirMagic);
 	metaSinkPutc(ms, Version>>8);
-	metaSinkPutc(ms, Version);		
+	metaSinkPutc(ms, Version);
 	metaSinkPutString(ms, dir->elem);
 	metaSinkPutUint32(ms, dir->entry);
 	metaSinkPutUint64(ms, dir->qid);

+ 2 - 2
sys/src/cmd/vac/vtdump.c

@@ -364,11 +364,11 @@ readRoot(VtRoot *root, uchar *score, char *file)
 	else {
 		fd = open(file, OREAD);
 		if(fd < 0)
-			sysfatal("could not open file: %s: %r\n", file);
+			sysfatal("could not open file: %s: %r", file);
 	}
 	n = readn(fd, buf, sizeof(buf)-1);
 	if(n < 0)
-		sysfatal("read failed: %r\n");
+		sysfatal("read failed: %r");
 	buf[n] = 0;
 	close(fd);
 

+ 11 - 4
sys/src/cmd/venti/copy.c

@@ -62,8 +62,16 @@ walk(uchar score[VtScoreSize], uint type, int base)
 	}
 
 	n = vtRead(zsrc, score, type, buf, VtMaxLumpSize);
+	/*
+	 * we usually see this at the end of a venti/copy of a vac tree:
+	 * warning: could not read block \
+	 * 0000000000000000000000000000000000000000 1: \
+	 * no block with that score exists
+	 * maybe it's harmless.
+	 */
 	if(n < 0){
-		fprint(2, "warning: could not read block %V %d: %R", score, type);
+		fprint(2, "warning: could not read block %V %d: %R\n",
+			score, type);
 		return;
 	}
 
@@ -112,11 +120,11 @@ walk(uchar score[VtScoreSize], uint type, int base)
 	}
 
 	if(!vtWrite(zdst, score, type, buf, n))
-		fprint(2, "warning: could not write block %V %d: %R", score, type);
+		fprint(2, "warning: could not write block %V %d: %R\n", score, type);
 	free(buf);
 }
 
-int
+void
 main(int argc, char *argv[])
 {
 	int type, n;
@@ -182,5 +190,4 @@ main(int argc, char *argv[])
 
 	vtDetach();
 	exits(0);
-	return 0;	/* shut up compiler */
 }

+ 4 - 0
sys/src/libauthsrv/readnvram.c

@@ -31,6 +31,10 @@ static struct {
 	"pc", "#S/sdC1/9fat", -1, sizeof(Nvrsafe),
 	"pc", "#S/sdD0/nvram", 0, sizeof(Nvrsafe),
 	"pc", "#S/sdD0/9fat", -1, sizeof(Nvrsafe),
+	"pc", "#S/sdE0/nvram", 0, sizeof(Nvrsafe),
+	"pc", "#S/sdE0/9fat", -1, sizeof(Nvrsafe),
+	"pc", "#S/sdF0/nvram", 0, sizeof(Nvrsafe),
+	"pc", "#S/sdF0/9fat", -1, sizeof(Nvrsafe),
 	"pc", "#S/sd00/nvram", 0, sizeof(Nvrsafe),
 	"pc", "#S/sd00/9fat", -1, sizeof(Nvrsafe),
 	"pc", "#S/sd01/nvram", 0, sizeof(Nvrsafe),