Plan 9 from Bell Labs 2004-01-12

dist/replica/plan9.db

@@ -22,12 +22,12 @@
 386/bin - 20000000775 sys sys 1018897690 0
 386/bin/1c - 775 sys sys 1063639729 306762
 386/bin/8a - 775 sys sys 1068385789 113237
-386/bin/8c - 775 sys sys 1068385790 299023
-386/bin/8l - 775 sys sys 1064598018 107653
+386/bin/8c - 775 sys sys 1073851202 299443
+386/bin/8l - 775 sys sys 1073851202 107501
 386/bin/9660srv - 775 sys sys 1064598019 104963
 386/bin/aan - 775 sys sys 1064598020 128816
-386/bin/acid - 775 sys sys 1068558062 379803
-386/bin/acme - 775 sys sys 1071245279 417811
+386/bin/acid - 775 sys sys 1073851203 379815
+386/bin/acme - 775 sys sys 1073851204 422376
 386/bin/ape - 20000000775 sys sys 1016944144 0
 386/bin/ape/basename - 775 sys sys 1071245280 133877
 386/bin/ape/cc - 775 sys sys 1064598025 68790
@@ -67,6 +67,7 @@
 386/bin/auth/keyfs - 775 sys sys 1064598042 116509
 386/bin/auth/login - 775 sys sys 1064598043 101787
 386/bin/auth/newns - 775 sys sys 1064598044 86445
+386/bin/auth/none - 775 sys sys 1073851208 86154
 386/bin/auth/pemdecode - 775 sys sys 1064598044 59378
 386/bin/auth/pemencode - 775 sys sys 1064598045 58097
 386/bin/auth/printnetkey - 775 sys sys 1064598045 40699
@@ -125,8 +126,8 @@
 386/bin/aux/mswordstrings - 775 sys sys 1064598076 64020
 386/bin/aux/na - 775 sys sys 1064598077 153189
 386/bin/aux/nfsmount - 775 sys sys 1064598079 231906
-386/bin/aux/nfsserver - 775 sys sys 1069592360 171438
-386/bin/aux/olefs - 775 sys sys 1068385795 145454
+386/bin/aux/nfsserver - 775 sys sys 1073851212 185782
+386/bin/aux/olefs - 775 sys sys 1073851213 145690
 386/bin/aux/p9bitpost - 775 sys sys 1064598082 127824
 386/bin/aux/pcmcia - 775 sys sys 1071245291 46548
 386/bin/aux/pcnfsd - 775 sys sys 1069592361 127134
@@ -146,7 +147,7 @@
 386/bin/aux/stub - 775 sys sys 1064598090 136225
 386/bin/aux/tcpostio - 775 sys sys 1071245296 199664
 386/bin/aux/text2post - 775 sys sys 1064598091 77005
-386/bin/aux/timesync - 775 sys sys 1064598092 127746
+386/bin/aux/timesync - 775 sys sys 1073851215 128252
 386/bin/aux/tr2post - 775 sys sys 1064598093 175937
 386/bin/aux/trampoline - 775 sys sys 1069592363 81152
 386/bin/aux/typepasswd - 775 sys sys 1064598094 67908
@@ -177,10 +178,10 @@
 386/bin/cdfs - 775 sys sys 1064598107 163031
 386/bin/cfs - 775 sys sys 1064598108 129534
 386/bin/chgrp - 775 sys sys 1064598108 58245
-386/bin/chmod - 775 sys sys 1064598108 61489
+386/bin/chmod - 775 sys sys 1073851217 61472
 386/bin/cleanname - 775 sys sys 1064598109 56400
 386/bin/clock - 775 sys sys 1071245300 155729
-386/bin/cmp - 775 sys sys 1064598110 40864
+386/bin/cmp - 775 sys sys 1073851217 41271
 386/bin/colors - 775 sys sys 1071245301 147903
 386/bin/comm - 775 sys sys 1064598111 59755
 386/bin/con - 775 sys sys 1064598112 76255
@@ -205,12 +206,12 @@
 386/bin/disk/exsort - 775 sys sys 1072729312 58501
 386/bin/disk/fdisk - 775 sys sys 1064598124 106639
 386/bin/disk/format - 775 sys sys 1072729312 91581
-386/bin/disk/kfs - 775 sys sys 1068717499 249427
+386/bin/disk/kfs - 775 sys sys 1073851218 249472
 386/bin/disk/kfscmd - 775 sys sys 1072729312 38425
 386/bin/disk/ksync - 775 sys sys 1020319074 302
 386/bin/disk/mbr - 775 sys sys 1072729313 73154
 386/bin/disk/mk9660 - 775 sys sys 1020319074 144
-386/bin/disk/mkext - 775 sys sys 1071245301 77957
+386/bin/disk/mkext - 775 sys sys 1073851219 77979
 386/bin/disk/mkfs - 775 sys sys 1072729313 87175
 386/bin/disk/mksacfs - 775 sys sys 1020319074 71451
 386/bin/disk/prep - 775 sys sys 1069592365 99123
@@ -223,23 +224,23 @@
 386/bin/execnet - 775 sys sys 1064598134 173621
 386/bin/exportfs - 775 sys sys 1069592365 161581
 386/bin/ext2srv - 775 sys sys 1064598136 176120
-386/bin/faces - 775 sys sys 1071245303 191093
+386/bin/faces - 775 sys sys 1073851220 191138
 386/bin/factor - 775 sys sys 1064598138 59887
-386/bin/file - 775 sys sys 1071245303 117452
+386/bin/file - 775 sys sys 1073851220 117494
 386/bin/fmt - 775 sys sys 1071245303 63683
-386/bin/fortune - 775 sys sys 1064598140 66084
+386/bin/fortune - 775 sys sys 1073851220 66113
 386/bin/fossil - 20000000775 sys sys 1042005470 0
 386/bin/fossil/conf - 775 sys sys 1056364255 1497
-386/bin/fossil/flchk - 775 sys sys 1071245304 232757
-386/bin/fossil/flfmt - 775 sys sys 1071245305 230722
-386/bin/fossil/fossil - 775 sys sys 1071245306 345532
+386/bin/fossil/flchk - 775 sys sys 1073851221 235407
+386/bin/fossil/flfmt - 775 sys sys 1073851222 249218
+386/bin/fossil/fossil - 775 sys sys 1073851223 348716
 386/bin/freq - 775 sys sys 1064598145 60197
 386/bin/fs - 20000000775 sys sys 954380769 0
 386/bin/fs/32vfs - 775 sys sys 1064598146 95907
 386/bin/fs/cpiofs - 775 sys sys 1064598146 94737
 386/bin/fs/tapfs - 775 sys sys 1064598147 97236
-386/bin/fs/tarfs - 775 sys sys 1064598148 95591
-386/bin/fs/tpfs - 775 sys sys 1064598148 94443
+386/bin/fs/tarfs - 775 sys sys 1073851223 95605
+386/bin/fs/tpfs - 775 sys sys 1073851223 94435
 386/bin/fs/v10fs - 775 sys sys 1064598149 95954
 386/bin/fs/v6fs - 775 sys sys 1064598150 95873
 386/bin/ftpfs - 775 sys sys 1064598151 149205
@@ -253,10 +254,11 @@
 386/bin/gzip - 775 sys sys 1064598211 83770
 386/bin/hayes - 775 sys sys 1064598212 63307
 386/bin/hget - 775 sys sys 1071245335 222506
-386/bin/history - 775 sys sys 1064598214 71890
+386/bin/history - 775 sys sys 1073851230 73560
 386/bin/hoc - 775 sys sys 1064598215 98708
 386/bin/html2ms - 775 sys sys 1064598215 64484
 386/bin/htmlfmt - 775 sys sys 1064598217 159021
+386/bin/ico - 775 sys sys 1073851230 159465
 386/bin/iconv - 775 sys sys 1064598217 112579
 386/bin/idiff - 775 sys sys 1064598218 75247
 386/bin/import - 775 sys sys 1064598219 87795
@@ -270,7 +272,7 @@
 386/bin/ip/gping - 775 sys sys 1071245335 180170
 386/bin/ip/hogports - 775 sys sys 1064598225 43028
 386/bin/ip/httpd - 20000000775 sys sys 1016920846 0
-386/bin/ip/httpd/httpd - 775 sys sys 1064598227 288683
+386/bin/ip/httpd/httpd - 775 sys sys 1073851231 290094
 386/bin/ip/httpd/imagemap - 775 sys sys 1064598228 113413
 386/bin/ip/httpd/man2html - 775 sys sys 1064598229 121681
 386/bin/ip/httpd/netlib_find - 775 sys sys 1068385801 114179
@@ -279,9 +281,9 @@
 386/bin/ip/httpd/webls - 775 sys sys 1071245336 129484
 386/bin/ip/httpd/wikipost - 775 sys sys 1064598232 111102
 386/bin/ip/imap4d - 775 sys sys 1071245337 236964
-386/bin/ip/ipconfig - 775 sys sys 1069592367 128851
+386/bin/ip/ipconfig - 775 sys sys 1073851232 134249
 386/bin/ip/ping - 775 sys sys 1064598234 74889
-386/bin/ip/ppp - 775 sys sys 1069592368 217323
+386/bin/ip/ppp - 775 sys sys 1073851232 217343
 386/bin/ip/pppoe - 775 sys sys 1064598236 75233
 386/bin/ip/pptp - 775 sys sys 1064598237 123773
 386/bin/ip/pptpd - 775 sys sys 1070288105 124153
@@ -301,12 +303,12 @@
 386/bin/lex - 775 sys sys 1064598249 97280
 386/bin/lnfs - 775 sys sys 1064598250 100511
 386/bin/look - 775 sys sys 1064598250 64212
-386/bin/ls - 775 sys sys 1064598251 81101
+386/bin/ls - 775 sys sys 1073851233 81182
 386/bin/mc - 775 sys sys 1071245338 129548
 386/bin/md5sum - 775 sys sys 1064598252 59465
 386/bin/mk - 775 sys sys 1064598253 143638
 386/bin/mkdir - 775 sys sys 1064598253 57591
-386/bin/mkpaqfs - 775 sys sys 1072729575 94045
+386/bin/mkpaqfs - 775 sys sys 1073851233 94055
 386/bin/mkstate - 775 sys sys 1064598255 61927
 386/bin/mntgen - 775 sys sys 1064598256 136777
 386/bin/mount - 775 sys sys 1064598256 71496
@@ -329,12 +331,12 @@
 386/bin/netstat - 775 sys sys 1069592373 81380
 386/bin/news - 775 sys sys 1064598268 70266
 386/bin/nfs - 775 sys sys 1064598270 316973
-386/bin/nm - 775 sys sys 1068558088 123128
+386/bin/nm - 775 sys sys 1073851234 123141
 386/bin/nntpfs - 775 sys sys 1064598272 162969
 386/bin/ns - 775 sys sys 1064598273 63582
 386/bin/p - 775 sys sys 1064598274 63537
 386/bin/page - 775 sys sys 1071245340 216518
-386/bin/paqfs - 775 sys sys 1072729576 109516
+386/bin/paqfs - 775 sys sys 1073851235 109518
 386/bin/passwd - 775 sys sys 1069592374 80215
 386/bin/pbd - 775 sys sys 1038443175 4663
 386/bin/pcc - 775 sys sys 1064598277 66117
@@ -352,7 +354,7 @@
 386/bin/ps - 775 sys sys 1064598286 64385
 386/bin/pwd - 775 sys sys 1068385805 37108
 386/bin/qc - 775 sys sys 1063639757 291344
-386/bin/ramfs - 775 sys sys 1064598287 89875
+386/bin/ramfs - 775 sys sys 1073851237 89837
 386/bin/rc - 775 sys sys 1064598288 141342
 386/bin/rdbfs - 775 sys sys 1064598290 170393
 386/bin/read - 775 sys sys 1064598290 56294
@@ -367,7 +369,7 @@
 386/bin/replica/setupdirs - 775 sys sys 1020319083 44
 386/bin/replica/updatedb - 775 sys sys 1068558250 95126
 386/bin/resample - 775 sys sys 1064598294 120124
-386/bin/rio - 775 sys sys 1072729027 312035
+386/bin/rio - 775 sys sys 1073851237 311078
 386/bin/rm - 775 sys sys 1064598298 59786
 386/bin/rtstats - 775 sys sys 1071245345 177818
 386/bin/rx - 775 sys sys 1071245345 80158
@@ -410,6 +412,7 @@
 386/bin/tlsclient - 775 sys sys 1064598330 196114
 386/bin/tlssrv - 775 sys sys 1064598331 196448
 386/bin/togif - 775 sys sys 1071245356 189681
+386/bin/toico - 775 sys sys 1073851241 122133
 386/bin/topng - 775 sys sys 1068717504 137683
 386/bin/toppm - 775 sys sys 1071245357 165019
 386/bin/touch - 775 sys sys 1064598335 62963
@@ -425,62 +428,62 @@
 386/bin/unzip - 775 sys sys 1064598342 89863
 386/bin/upas - 20000000775 sys sys 1016857390 0
 386/bin/upas/addhash - 775 sys sys 1064598343 67859
-386/bin/upas/aliasmail - 775 sys sys 1071245360 101743
+386/bin/upas/aliasmail - 775 sys sys 1073851242 103819
 386/bin/upas/bayes - 775 sys sys 1064598344 70530
-386/bin/upas/deliver - 775 sys sys 1071245360 98274
-386/bin/upas/filter - 775 sys sys 1071245361 146352
-386/bin/upas/fs - 775 sys sys 1071245362 334765
+386/bin/upas/deliver - 775 sys sys 1073851242 98459
+386/bin/upas/filter - 775 sys sys 1073851243 146541
+386/bin/upas/fs - 775 sys sys 1073851244 334301
 386/bin/upas/isspam - 775 sys sys 1064598349 38
 386/bin/upas/list - 775 sys sys 1064598349 81216
-386/bin/upas/marshal - 775 sys sys 1071245362 129531
-386/bin/upas/ml - 775 sys sys 1071245363 120511
-386/bin/upas/mlmgr - 775 sys sys 1071245363 101109
+386/bin/upas/marshal - 775 sys sys 1073851244 131607
+386/bin/upas/ml - 775 sys sys 1073851245 122587
+386/bin/upas/mlmgr - 775 sys sys 1073851245 103185
 386/bin/upas/mlowner - 775 sys sys 1064598353 90150
 386/bin/upas/msgcat - 775 sys sys 1064598353 38
 386/bin/upas/msgtok - 775 sys sys 1064598354 75149
-386/bin/upas/nedmail - 775 sys sys 1071245364 150211
-386/bin/upas/pop3 - 775 sys sys 1071245365 257708
-386/bin/upas/qer - 775 sys sys 1071245365 98655
+386/bin/upas/nedmail - 775 sys sys 1073851246 152649
+386/bin/upas/pop3 - 775 sys sys 1073851246 259903
+386/bin/upas/qer - 775 sys sys 1073851247 98840
 386/bin/upas/ratfs - 775 sys sys 1071245366 112106
-386/bin/upas/runq - 775 sys sys 1071245366 111469
-386/bin/upas/scanmail - 775 sys sys 1071245367 127754
-386/bin/upas/send - 775 sys sys 1071245368 190512
-386/bin/upas/smtp - 775 sys sys 1071245369 271129
-386/bin/upas/smtpd - 775 sys sys 1071245370 320529
+386/bin/upas/runq - 775 sys sys 1073851247 111600
+386/bin/upas/scanmail - 775 sys sys 1073851248 127943
+386/bin/upas/send - 775 sys sys 1073851248 190699
+386/bin/upas/smtp - 775 sys sys 1073851249 271626
+386/bin/upas/smtpd - 775 sys sys 1073851250 320788
 386/bin/upas/spam - 775 sys sys 1064598366 36
 386/bin/upas/testscan - 775 sys sys 1064598366 82161
 386/bin/upas/token - 775 sys sys 1064598367 75930
 386/bin/upas/unspam - 775 sys sys 1064598367 38
 386/bin/upas/vf - 775 sys sys 1064598368 91313
 386/bin/usb - 20000000775 sys sys 1019538890 0
-386/bin/usb/usbaudio - 775 sys sys 1064598369 176059
+386/bin/usb/usbaudio - 775 sys sys 1073851250 175810
 386/bin/usb/usbd - 775 sys sys 1064598370 122722
 386/bin/usb/usbmouse - 775 sys sys 1064598371 137915
-386/bin/vac - 775 sys sys 1064598372 171529
-386/bin/vacfs - 775 sys sys 1064598373 177702
+386/bin/vac - 775 sys sys 1073851251 171848
+386/bin/vacfs - 775 sys sys 1073851251 178021
 386/bin/venti - 20000000775 sys sys 947360466 0
-386/bin/venti/buildindex - 775 sys sys 1064598374 160540
-386/bin/venti/checkarenas - 775 sys sys 1068558263 164862
-386/bin/venti/checkindex - 775 sys sys 1064598376 161346
-386/bin/venti/clumpstats - 775 sys sys 1064598377 150452
+386/bin/venti/buildindex - 775 sys sys 1073851252 161262
+386/bin/venti/checkarenas - 775 sys sys 1073851252 165195
+386/bin/venti/checkindex - 775 sys sys 1073851253 162068
+386/bin/venti/clumpstats - 775 sys sys 1073851253 151173
 386/bin/venti/conf - 775 sys sys 1056364399 1506
 386/bin/venti/copy - 775 sys sys 1064598378 104558
-386/bin/venti/findscore - 775 sys sys 1068558264 131782
-386/bin/venti/fmtarenas - 775 sys sys 1064598380 132572
-386/bin/venti/fmtindex - 775 sys sys 1064598381 150815
-386/bin/venti/fmtisect - 775 sys sys 1064598382 150699
-386/bin/venti/rdarena - 775 sys sys 1068558264 131508
+386/bin/venti/findscore - 775 sys sys 1073851254 132115
+386/bin/venti/fmtarenas - 775 sys sys 1073851254 133293
+386/bin/venti/fmtindex - 775 sys sys 1073851254 151536
+386/bin/venti/fmtisect - 775 sys sys 1073851255 151420
+386/bin/venti/rdarena - 775 sys sys 1073851255 131839
 386/bin/venti/read - 775 sys sys 1064598384 100831
 386/bin/venti/sync - 775 sys sys 1064598384 99981
-386/bin/venti/syncindex - 775 sys sys 1068558265 176332
-386/bin/venti/venti - 775 sys sys 1069592386 252180
-386/bin/venti/verifyarena - 775 sys sys 1068558266 105025
-386/bin/venti/wrarena - 775 sys sys 1068558267 182318
+386/bin/venti/syncindex - 775 sys sys 1073851256 176665
+386/bin/venti/venti - 775 sys sys 1073851256 252511
+386/bin/venti/verifyarena - 775 sys sys 1073851257 105348
+386/bin/venti/wrarena - 775 sys sys 1073851257 182651
 386/bin/venti/write - 775 sys sys 1064598391 100783
 386/bin/vncs - 775 sys sys 1064598394 442530
 386/bin/vncv - 775 sys sys 1071245371 271560
 386/bin/vt - 775 sys sys 1071245372 171391
-386/bin/vtdump - 775 sys sys 1064598398 161142
+386/bin/vtdump - 775 sys sys 1073851258 161461
 386/bin/wc - 775 sys sys 1064598399 42148
 386/bin/webcookies - 775 sys sys 1068558171 162995
 386/bin/webfs - 775 sys sys 1068558224 352388
@@ -501,50 +504,51 @@
 386/include/ape/ureg.h - 664 sys sys 944946041 812
 386/include/u.h - 664 sys sys 1042604326 1450
 386/include/ureg.h - 664 sys sys 944946012 523
-386/init - 775 sys sys 1071873631 99057
+386/init - 775 sys sys 1073851259 98515
 386/ld.com - 775 sys sys 1071340494 65192
 386/lib - 20000000775 sys sys 1016826328 0
 386/lib/ape - 20000000775 sys sys 944969312 0
 386/lib/ape/lib9.a - 664 sys sys 1038237538 6378
-386/lib/ape/libap.a - 664 sys sys 1072835459 812790
-386/lib/ape/libbsd.a - 664 sys sys 1070342465 179718
-386/lib/ape/libdraw.a - 664 sys sys 1071245377 574556
-386/lib/ape/libfmt.a - 664 sys sys 1070519112 148600
-386/lib/ape/libl.a - 664 sys sys 1068558290 9450
-386/lib/ape/libnet.a - 664 sys sys 1068558291 16996
-386/lib/ape/libregexp.a - 664 sys sys 1068558291 47642
-386/lib/ape/libutf.a - 664 sys sys 1070519112 81400
-386/lib/ape/libv.a - 664 sys sys 1068558291 19718
-386/lib/lib9p.a - 664 sys sys 1068385833 80602
-386/lib/libString.a - 664 sys sys 1068385833 22324
-386/lib/libauth.a - 664 sys sys 1068385834 56258
-386/lib/libauthsrv.a - 664 sys sys 1068385834 33962
-386/lib/libbin.a - 664 sys sys 1068385834 2556
-386/lib/libbio.a - 664 sys sys 1068385834 28408
-386/lib/libc.a - 664 sys sys 1068385836 506616
-386/lib/libcontrol.a - 664 sys sys 1068385837 243448
-386/lib/libdisk.a - 664 sys sys 1068385837 43692
-386/lib/libdraw.a - 664 sys sys 1071245378 373032
-386/lib/libflate.a - 664 sys sys 1068385839 77880
-386/lib/libframe.a - 664 sys sys 1068385839 65832
-386/lib/libgeometry.a - 664 sys sys 1068385839 50806
-386/lib/libhtml.a - 664 sys sys 1068385840 220944
-386/lib/libhttpd.a - 664 sys sys 1068385841 98914
-386/lib/libip.a - 664 sys sys 1070288108 34142
-386/lib/libl.a - 664 sys sys 1068385841 5412
-386/lib/libmach.a - 664 sys sys 1068558293 748290
-386/lib/libmemdraw.a - 664 sys sys 1068385844 292604
-386/lib/libmemlayer.a - 664 sys sys 1068385845 47650
-386/lib/libmp.a - 664 sys sys 1068385845 77924
-386/lib/libndb.a - 664 sys sys 1069592386 54610
-386/lib/libplumb.a - 664 sys sys 1068385846 19000
-386/lib/libregexp.a - 664 sys sys 1068385846 37616
-386/lib/libscribble.a - 664 sys sys 1068385846 108138
-386/lib/libsec.a - 664 sys sys 1068385848 647418
-386/lib/libstdio.a - 664 sys sys 1068385849 128500
-386/lib/libsunrpc.a - 664 sys sys 1068385850 357292
-386/lib/libthread.a - 664 sys sys 1068385850 71406
-386/lib/libventi.a - 664 sys sys 1068385851 98382
+386/lib/ape/libap.a - 664 sys sys 1073851261 812790
+386/lib/ape/libbsd.a - 664 sys sys 1073851261 179408
+386/lib/ape/libdraw.a - 664 sys sys 1073851262 574102
+386/lib/ape/libfmt.a - 664 sys sys 1073851263 147912
+386/lib/ape/libl.a - 664 sys sys 1073851263 9420
+386/lib/ape/libnet.a - 664 sys sys 1073851263 16950
+386/lib/ape/libregexp.a - 664 sys sys 1073851263 47524
+386/lib/ape/libutf.a - 664 sys sys 1073851264 81308
+386/lib/ape/libv.a - 664 sys sys 1073851264 19648
+386/lib/lib9p.a - 664 sys sys 1073851264 80496
+386/lib/libString.a - 664 sys sys 1073851264 22204
+386/lib/libauth.a - 664 sys sys 1073851265 56162
+386/lib/libauthsrv.a - 664 sys sys 1073851265 33806
+386/lib/libbin.a - 664 sys sys 1073851265 2556
+386/lib/libbio.a - 664 sys sys 1073851265 28338
+386/lib/libc.a - 664 sys sys 1073851266 504454
+386/lib/libcomplete.a - 664 sys sys 1073851266 6152
+386/lib/libcontrol.a - 664 sys sys 1073851267 242856
+386/lib/libdisk.a - 664 sys sys 1073851267 43536
+386/lib/libdraw.a - 664 sys sys 1073851268 372528
+386/lib/libflate.a - 664 sys sys 1073851268 77194
+386/lib/libframe.a - 664 sys sys 1073851269 65534
+386/lib/libgeometry.a - 664 sys sys 1073851269 50732
+386/lib/libhtml.a - 664 sys sys 1073851269 220320
+386/lib/libhttpd.a - 664 sys sys 1073851270 98532
+386/lib/libip.a - 664 sys sys 1073851270 34012
+386/lib/libl.a - 664 sys sys 1073851270 5386
+386/lib/libmach.a - 664 sys sys 1073851272 746962
+386/lib/libmemdraw.a - 664 sys sys 1073851273 291288
+386/lib/libmemlayer.a - 664 sys sys 1073851273 47636
+386/lib/libmp.a - 664 sys sys 1073851273 77700
+386/lib/libndb.a - 664 sys sys 1073851273 54474
+386/lib/libplumb.a - 664 sys sys 1073851274 18876
+386/lib/libregexp.a - 664 sys sys 1073851274 37502
+386/lib/libscribble.a - 664 sys sys 1073851274 107542
+386/lib/libsec.a - 664 sys sys 1073851276 646286
+386/lib/libstdio.a - 664 sys sys 1073851276 127052
+386/lib/libsunrpc.a - 664 sys sys 1073851277 357030
+386/lib/libthread.a - 664 sys sys 1073851277 71296
+386/lib/libventi.a - 664 sys sys 1073851278 98178
 386/mbr - 775 sys sys 1022125974 407
 386/mkfile - 664 sys sys 948141303 46
 386/pbs - 775 sys sys 1022125973 494
@@ -3950,7 +3954,7 @@ sys/lib/man/preface4 - 664 sys sys 1020082276 1758
 sys/lib/man/secindex - 775 sys sys 956337727 322
 sys/lib/man/title - 664 sys sys 1019915894 746
 sys/lib/man/trademarks - 664 sys sys 958527089 1838
-sys/lib/mimetype - 664 sys sys 1071926670 5633
+sys/lib/mimetype - 664 sys sys 1073826820 5674
 sys/lib/newuser - 775 sys sys 1018386991 1229
 sys/lib/plumb - 20000000775 sys sys 944957365 0
 sys/lib/plumb/basic - 664 sys sys 1070330856 2930
@@ -4923,7 +4927,7 @@ sys/man/4/execnet - 664 sys sys 1019866708 1069
 sys/man/4/exportfs - 664 sys sys 1069024226 4370
 sys/man/4/ext2srv - 664 sys sys 1055692986 2409
 sys/man/4/factotum - 664 sys sys 1053127875 14460
-sys/man/4/fossil - 664 sys sys 1055701130 9208
+sys/man/4/fossil - 664 sys sys 1073853397 9333
 sys/man/4/fs - 664 sys sys 1019058716 3387
 sys/man/4/ftpfs - 664 sys sys 1048285446 4327
 sys/man/4/import - 664 sys sys 1034195346 2204
@@ -5326,13 +5330,13 @@ sys/src/9/pc/mmu.c - 664 sys sys 1049509456 10014
 sys/src/9/pc/mouse.c - 664 sys sys 1065717607 6625
 sys/src/9/pc/mp.c - 664 sys sys 1048644112 16928
 sys/src/9/pc/mp.h - 664 sys sys 1015014520 6575
-sys/src/9/pc/pc - 664 sys sys 1067722635 1335
-sys/src/9/pc/pcauth - 664 sys sys 1062721660 632
+sys/src/9/pc/pc - 664 sys sys 1073852088 1360
+sys/src/9/pc/pcauth - 664 sys sys 1073851852 657
 sys/src/9/pc/pccd - 664 sys sys 1055090302 1302
-sys/src/9/pc/pccpu - 664 sys sys 1067722636 777
-sys/src/9/pc/pccpuf - 664 sys sys 1067722888 1286
-sys/src/9/pc/pcdisk - 664 sys sys 1067722637 1402
-sys/src/9/pc/pcf - 664 sys sys 1067722637 1431
+sys/src/9/pc/pccpu - 664 sys sys 1073852088 802
+sys/src/9/pc/pccpuf - 664 sys sys 1073851852 1315
+sys/src/9/pc/pcdisk - 664 sys sys 1073851851 1427
+sys/src/9/pc/pcf - 664 sys sys 1073851852 1455
 sys/src/9/pc/pcf.c - 664 sys sys 1058659039 5110
 sys/src/9/pc/pcfl - 664 sys sys 1042004821 1563
 sys/src/9/pc/pcflop - 664 sys sys 1067722894 1383
@@ -7017,7 +7021,7 @@ sys/src/cmd/aux/consolefs.c - 664 sys sys 1068916113 20175
 sys/src/cmd/aux/conswdir.c - 664 sys sys 1045504955 2077
 sys/src/cmd/aux/data2s.c - 664 sys sys 1032059295 796
 sys/src/cmd/aux/depend.c - 664 sys sys 1015008684 25780
-sys/src/cmd/aux/disksim.c - 664 sys sys 1050521402 10227
+sys/src/cmd/aux/disksim.c - 664 sys sys 1073852076 10914
 sys/src/cmd/aux/flashfs - 20000000775 sys sys 1015009082 0
 sys/src/cmd/aux/flashfs/aux.c - 664 sys sys 1015009080 699
 sys/src/cmd/aux/flashfs/aux.h - 664 sys sys 1015009080 111
@@ -7536,15 +7540,15 @@ sys/src/cmd/fossil/archive.c - 664 sys sys 1072705705 9558
 sys/src/cmd/fossil/build - 664 sys sys 1042005505 449
 sys/src/cmd/fossil/buildsh - 775 sys sys 1042005505 561
 sys/src/cmd/fossil/bwatch.c - 664 sys sys 1042005505 6754
-sys/src/cmd/fossil/cache.c - 664 sys sys 1072705706 42740
+sys/src/cmd/fossil/cache.c - 664 sys sys 1073851928 42849
 sys/src/cmd/fossil/conf.rc - 775 sys sys 1055703747 1407
 sys/src/cmd/fossil/dat.h - 664 sys sys 1061530727 7851
 sys/src/cmd/fossil/deadlock - 775 sys sys 1042005506 413
 sys/src/cmd/fossil/disk.c - 664 sys sys 1072705706 6409
 sys/src/cmd/fossil/dump.c - 664 sys sys 1042005506 1340
 sys/src/cmd/fossil/epoch.c - 664 sys sys 1045600021 997
-sys/src/cmd/fossil/error.c - 664 sys sys 1072705707 1413
-sys/src/cmd/fossil/error.h - 664 sys sys 1072705710 772
+sys/src/cmd/fossil/error.c - 664 sys sys 1073851927 1450
+sys/src/cmd/fossil/error.h - 664 sys sys 1073851928 796
 sys/src/cmd/fossil/file.c - 664 sys sys 1073140359 30215
 sys/src/cmd/fossil/flchk.c - 664 sys sys 1061530720 14296
 sys/src/cmd/fossil/flfmt.c - 664 sys sys 1072705703 10799

dist/replica/plan9.log

@@ -13283,3 +13283,120 @@
 1073566966 3 c sys/src/cmd/acme/wind.c - 664 sys sys 1073566950 11094
 1073660579 0 c sys/src/cmd/usb/mkfile - 664 sys sys 1073660279 211
 1073660579 1 c sys/src/cmd/usb/print/mkfile - 664 sys sys 1073660166 195
+1073827883 0 c sys/lib/mimetype - 664 sys sys 1073826820 5674
+1073851287 0 c 386/bin/8c - 775 sys sys 1073851202 299443
+1073851287 1 c 386/bin/8l - 775 sys sys 1073851202 107501
+1073851287 2 c 386/bin/acid - 775 sys sys 1073851203 379815
+1073851287 3 c 386/bin/acme - 775 sys sys 1073851204 422376
+1073851287 4 c 386/bin/chmod - 775 sys sys 1073851217 61472
+1073851287 5 c 386/bin/cmp - 775 sys sys 1073851217 41271
+1073851287 6 c 386/bin/faces - 775 sys sys 1073851220 191138
+1073851287 7 c 386/bin/fs/tarfs - 775 sys sys 1073851223 95605
+1073851287 8 c 386/bin/fs/tpfs - 775 sys sys 1073851223 94435
+1073851287 9 c 386/bin/history - 775 sys sys 1073851230 73560
+1073851287 10 c 386/bin/usb/usbaudio - 775 sys sys 1073851250 175810
+1073851287 11 c 386/bin/venti/buildindex - 775 sys sys 1073851252 161262
+1073851287 12 c 386/bin/venti/checkarenas - 775 sys sys 1073851252 165195
+1073851287 13 c 386/bin/venti/checkindex - 775 sys sys 1073851253 162068
+1073851287 14 c 386/bin/venti/clumpstats - 775 sys sys 1073851253 151173
+1073851287 15 c 386/bin/venti/findscore - 775 sys sys 1073851254 132115
+1073851287 16 c 386/bin/venti/fmtarenas - 775 sys sys 1073851254 133293
+1073851287 17 c 386/bin/venti/fmtindex - 775 sys sys 1073851254 151536
+1073851287 18 c 386/bin/venti/fmtisect - 775 sys sys 1073851255 151420
+1073851287 19 c 386/bin/venti/rdarena - 775 sys sys 1073851255 131839
+1073851287 20 c 386/bin/venti/syncindex - 775 sys sys 1073851256 176665
+1073851287 21 c 386/bin/venti/venti - 775 sys sys 1073851256 252511
+1073851287 22 c 386/bin/venti/verifyarena - 775 sys sys 1073851257 105348
+1073851287 23 c 386/bin/venti/wrarena - 775 sys sys 1073851257 182651
+1073851287 24 c 386/bin/file - 775 sys sys 1073851220 117494
+1073851287 25 c 386/bin/fortune - 775 sys sys 1073851220 66113
+1073851287 26 c 386/bin/ls - 775 sys sys 1073851233 81182
+1073851287 27 c 386/bin/nm - 775 sys sys 1073851234 123141
+1073851287 28 c 386/bin/ramfs - 775 sys sys 1073851237 89837
+1073851287 29 c 386/bin/rio - 775 sys sys 1073851237 311078
+1073851287 30 c 386/bin/vtdump - 775 sys sys 1073851258 161461
+1073851287 31 a 386/bin/auth/none - 775 sys sys 1073851208 86154
+1073851287 32 c 386/bin/aux/nfsserver - 775 sys sys 1073851212 185782
+1073851287 33 c 386/bin/aux/olefs - 775 sys sys 1073851213 145690
+1073851287 34 c 386/bin/aux/timesync - 775 sys sys 1073851215 128252
+1073851287 35 c 386/bin/disk/kfs - 775 sys sys 1073851218 249472
+1073851287 36 c 386/bin/disk/mkext - 775 sys sys 1073851219 77979
+1073851287 37 c 386/bin/fossil/flchk - 775 sys sys 1073851221 235407
+1073851287 38 c 386/bin/fossil/flfmt - 775 sys sys 1073851222 249218
+1073851287 39 c 386/bin/fossil/fossil - 775 sys sys 1073851223 348716
+1073851287 40 a 386/bin/ico - 775 sys sys 1073851230 159465
+1073851287 41 c 386/bin/ip/httpd/httpd - 775 sys sys 1073851231 290094
+1073851287 42 c 386/bin/ip/ipconfig - 775 sys sys 1073851232 134249
+1073851287 43 c 386/bin/ip/ppp - 775 sys sys 1073851232 217343
+1073851287 44 c 386/bin/mkpaqfs - 775 sys sys 1073851233 94055
+1073851287 45 c 386/bin/paqfs - 775 sys sys 1073851235 109518
+1073851287 46 a 386/bin/toico - 775 sys sys 1073851241 122133
+1073851287 47 c 386/bin/upas/aliasmail - 775 sys sys 1073851242 103819
+1073851287 48 c 386/bin/upas/deliver - 775 sys sys 1073851242 98459
+1073851287 49 c 386/bin/upas/filter - 775 sys sys 1073851243 146541
+1073851287 50 c 386/bin/upas/fs - 775 sys sys 1073851244 334301
+1073851287 51 c 386/bin/upas/marshal - 775 sys sys 1073851244 131607
+1073851287 52 c 386/bin/upas/ml - 775 sys sys 1073851245 122587
+1073851287 53 c 386/bin/upas/mlmgr - 775 sys sys 1073851245 103185
+1073851287 54 c 386/bin/upas/nedmail - 775 sys sys 1073851246 152649
+1073851287 55 c 386/bin/upas/pop3 - 775 sys sys 1073851246 259903
+1073851287 56 c 386/bin/upas/qer - 775 sys sys 1073851247 98840
+1073851287 57 c 386/bin/upas/runq - 775 sys sys 1073851247 111600
+1073851287 58 c 386/bin/upas/scanmail - 775 sys sys 1073851248 127943
+1073851287 59 c 386/bin/upas/send - 775 sys sys 1073851248 190699
+1073851287 60 c 386/bin/upas/smtp - 775 sys sys 1073851249 271626
+1073851287 61 c 386/bin/upas/smtpd - 775 sys sys 1073851250 320788
+1073851287 62 c 386/bin/vac - 775 sys sys 1073851251 171848
+1073851287 63 c 386/bin/vacfs - 775 sys sys 1073851251 178021
+1073851287 64 c 386/init - 775 sys sys 1073851259 98515
+1073851287 65 c 386/lib/ape/libap.a - 664 sys sys 1073851261 812790
+1073851287 66 c 386/lib/ape/libbsd.a - 664 sys sys 1073851261 179408
+1073851287 67 c 386/lib/ape/libdraw.a - 664 sys sys 1073851262 574102
+1073851287 68 c 386/lib/ape/libfmt.a - 664 sys sys 1073851263 147912
+1073851287 69 c 386/lib/ape/libl.a - 664 sys sys 1073851263 9420
+1073851287 70 c 386/lib/ape/libnet.a - 664 sys sys 1073851263 16950
+1073851287 71 c 386/lib/ape/libregexp.a - 664 sys sys 1073851263 47524
+1073851287 72 c 386/lib/ape/libutf.a - 664 sys sys 1073851264 81308
+1073851287 73 c 386/lib/ape/libv.a - 664 sys sys 1073851264 19648
+1073851287 74 c 386/lib/lib9p.a - 664 sys sys 1073851264 80496
+1073851287 75 c 386/lib/libString.a - 664 sys sys 1073851264 22204
+1073851287 76 c 386/lib/libauth.a - 664 sys sys 1073851265 56162
+1073851287 77 c 386/lib/libauthsrv.a - 664 sys sys 1073851265 33806
+1073851287 78 c 386/lib/libbin.a - 664 sys sys 1073851265 2556
+1073851287 79 c 386/lib/libbio.a - 664 sys sys 1073851265 28338
+1073851287 80 c 386/lib/libc.a - 664 sys sys 1073851266 504454
+1073851287 81 a 386/lib/libcomplete.a - 664 sys sys 1073851266 6152
+1073851287 82 c 386/lib/libcontrol.a - 664 sys sys 1073851267 242856
+1073851287 83 c 386/lib/libdisk.a - 664 sys sys 1073851267 43536
+1073851287 84 c 386/lib/libdraw.a - 664 sys sys 1073851268 372528
+1073851287 85 c 386/lib/libflate.a - 664 sys sys 1073851268 77194
+1073851287 86 c 386/lib/libframe.a - 664 sys sys 1073851269 65534
+1073851287 87 c 386/lib/libgeometry.a - 664 sys sys 1073851269 50732
+1073851287 88 c 386/lib/libhtml.a - 664 sys sys 1073851269 220320
+1073851287 89 c 386/lib/libhttpd.a - 664 sys sys 1073851270 98532
+1073851287 90 c 386/lib/libip.a - 664 sys sys 1073851270 34012
+1073851287 91 c 386/lib/libl.a - 664 sys sys 1073851270 5386
+1073851287 92 c 386/lib/libmach.a - 664 sys sys 1073851272 746962
+1073851287 93 c 386/lib/libmemdraw.a - 664 sys sys 1073851273 291288
+1073851287 94 c 386/lib/libmemlayer.a - 664 sys sys 1073851273 47636
+1073851287 95 c 386/lib/libmp.a - 664 sys sys 1073851273 77700
+1073851287 96 c 386/lib/libndb.a - 664 sys sys 1073851273 54474
+1073851287 97 c 386/lib/libplumb.a - 664 sys sys 1073851274 18876
+1073851287 98 c 386/lib/libregexp.a - 664 sys sys 1073851274 37502
+1073851287 99 c 386/lib/libscribble.a - 664 sys sys 1073851274 107542
+1073851287 100 c 386/lib/libsec.a - 664 sys sys 1073851276 646286
+1073851287 101 c 386/lib/libstdio.a - 664 sys sys 1073851276 127052
+1073851287 102 c 386/lib/libsunrpc.a - 664 sys sys 1073851277 357030
+1073851287 103 c 386/lib/libthread.a - 664 sys sys 1073851277 71296
+1073851287 104 c 386/lib/libventi.a - 664 sys sys 1073851278 98178
+1073853087 0 c sys/src/9/pc/pc - 664 sys sys 1073852088 1360
+1073853087 1 c sys/src/9/pc/pcauth - 664 sys sys 1073851852 657
+1073853087 2 c sys/src/9/pc/pccpu - 664 sys sys 1073852088 802
+1073853087 3 c sys/src/9/pc/pcdisk - 664 sys sys 1073851851 1427
+1073853087 4 c sys/src/9/pc/pcf - 664 sys sys 1073851852 1455
+1073853087 5 c sys/src/9/pc/pccpuf - 664 sys sys 1073851852 1315
+1073853087 6 c sys/src/cmd/aux/disksim.c - 664 sys sys 1073852076 10914
+1073853087 7 c sys/src/cmd/fossil/cache.c - 664 sys sys 1073851928 42849
+1073853087 8 c sys/src/cmd/fossil/error.c - 664 sys sys 1073851927 1450
+1073853087 9 c sys/src/cmd/fossil/error.h - 664 sys sys 1073851928 796
+1073854887 0 c sys/man/4/fossil - 664 sys sys 1073853397 9333

sys/lib/mimetype

@@ -17,6 +17,7 @@
 .bbl		text		plain		-		y # BibTex output
 .bcpio		application	x-bcpio		-		m
 .bib		text		plain		-		y # BibTex input
+.bmp		image		bmp		-		y # bitmapped image
 .c		text		plain		-		y # C program
 .c++		text		plain		-		y # C++ program
 .cacert		application	x-x509-ca-cert	-		y # DER X.509 CA certificate

sys/man/4/fossil

@@ -357,6 +357,9 @@ reads a new configuration from
 .I config
 (or else from standard input)
 and writes it to the disk.
+Inside the configuration file, the argument
+.L *
+may be used to stand in for the name of the disk holding the configuration.
 The Plan 9 kernel boot process runs
 .RB `` fossil
 .B -f

sys/src/9/pc/pc

@@ -50,6 +50,7 @@ link
 	etherelnk3	pci
 	etherga620	pci
 	etherigbe	pci ethermii
+	etherrhine	pci ethermii
 	ethersink
 	ethersmc	devi82365 cis
 	etherwavelan	wavelan devi82365 cis pci
@@ -103,8 +104,8 @@ port
 	int cpuserver = 0;
 
 boot
-	il
 	tcp
+	il
 
 bootdir
 	bootpc.out boot

sys/src/9/pc/pcauth

@@ -31,6 +31,7 @@ dev
 link
 	apm		apmjump
 	ether82557	pci
+	etherrhine	pci ethermii
 	ethermedium
 	netdevmedium
 	loopbackmedium
@@ -56,8 +57,8 @@ port
 	int cpuserver = 1;
 
 boot cpu boot #S/sdC0/
-	il
 	tcp
+	il
 	local
 
 bootdir

sys/src/9/pc/pccpu

@@ -37,6 +37,7 @@ link
 	etherelnk3	pci
 	etherga620	pci
 	etherigbe	pci ethermii
+	etherrhine	pci ethermii
 	ethersink
 	ethermedium
 	loopbackmedium
@@ -67,8 +68,8 @@ port
 	int cpuserver = 1;
 
 boot cpu
-	il
 	tcp
+	il
 
 bootdir
 	bootpccpu.out boot

sys/src/9/pc/pccpuf

@@ -16,6 +16,7 @@ dev
 	sdp		thwack unthwack
 	cap
 	kprof
+	fs
 
 	ether		netif
 	ip		arp chandial ip ipv6 ipaux iproute netlog nullmedium pktmedium ptclbsum386 inferno
@@ -42,6 +43,7 @@ link
 	etherelnk3	pci
 	etherga620	pci
 	etherigbe	pci ethermii
+	etherrhine	pci ethermii
 	ethersink
 	ethermedium
 	netdevmedium
@@ -96,8 +98,8 @@ port
 	int cpuserver = 1;
 
 boot cpu boot #S/sdC0/
-	il
 	tcp
+	il
 	local
 
 bootdir

sys/src/9/pc/pcdisk

@@ -49,6 +49,7 @@ link
 	etherelnk3	pci
 	etherga620	pci
 	etherigbe	pci ethermii
+	etherrhine	pci ethermii
 	ethersink
 	ethersmc	devi82365 cis
 	etherwavelan	wavelan devi82365 cis pci
@@ -102,8 +103,8 @@ port
 	int cpuserver = 0;
 
 boot boot #S/sdC0/
-	il
 	tcp
+	il
 	local
 
 bootdir

sys/src/9/pc/pcf

@@ -49,6 +49,7 @@ link
 	etherelnk3	pci
 	etherga620	pci
 	etherigbe	pci ethermii
+	etherrhine	pci ethermii
 	ethersink
 	ethersmc	devi82365 cis
 	etherwavelan	wavelan devi82365 cis pci
@@ -62,7 +63,7 @@ misc
 	archmp		mp apic
 
 	sdata		pci sdscsi
-	sd53c8xx		pci sdscsi
+	sd53c8xx	pci sdscsi
 	sdmylex		pci sdscsi
 
 	uarti8250
@@ -102,8 +103,8 @@ port
 	int cpuserver = 0;
 
 boot boot #S/sdC0/
-	il
 	tcp
+	il
 	local
 
 bootdir

sys/src/cmd/aux/disksim.c

@@ -60,12 +60,13 @@ enum
 };
 
 Part tab[64];
-
+int fd = -1;
 char *sdname = "sdXX";
 ulong ctlmode = 0666;
 char *inquiry = "aux/disksim hard drive";
 vlong nsect, sectsize, c, h, s;
 ulong time0;
+int rdonly;
 
 char*
 ctlstring(void)
@@ -214,7 +215,7 @@ ctlwrite(Req *r)
 }
 	
 void*
-allocblk(void)
+allocblk(vlong addr)
 {
 	uchar *op;
 	static uchar *p;
@@ -230,6 +231,8 @@ allocblk(void)
 	p += BLKSZ;
 	n -= BLKSZ;
 	memset(op, 0, BLKSZ);
+	if(fd != -1 && addr != -1)
+		pread(fd, op, BLKSZ, addr);
 	return op;
 }
 
@@ -241,8 +244,13 @@ getblock(vlong addr, int alloc)
 	Ind *p1;
 	uchar *p0;
 	uint i0, i1, i2;
+	vlong oaddr;
+
+	if(fd)
+		alloc = 1;
 
 	addr >>= LOGBLKSZ;
+	oaddr = addr<<LOGBLKSZ;
 	i0 = addr & (NPTR-1);
 	addr >>= LOGNPTR;
 	i1 = addr & (NPTR-1);
@@ -254,23 +262,35 @@ getblock(vlong addr, int alloc)
 	if((p2 = trip.dbl[i2]) == 0){
 		if(!alloc)
 			return zero;
-		trip.dbl[i2] = p2 = allocblk();
+		trip.dbl[i2] = p2 = allocblk(-1);
 	}
 
 	if((p1 = p2->ind[i1]) == 0){
 		if(!alloc)
 			return zero;
-		p2->ind[i1] = p1 = allocblk();
+		p2->ind[i1] = p1 = allocblk(-1);
 	}
 
 	if((p0 = p1->blk[i0]) == 0){
 		if(!alloc)
 			return zero;
-		p1->blk[i0] = p0 = allocblk();
+		p1->blk[i0] = p0 = allocblk(oaddr);
 	}
 	return p0;
 }
 
+void
+dirty(vlong addr, uchar *buf)
+{
+	vlong oaddr;
+
+	if(fd == -1 || rdonly)
+		return;
+	oaddr = addr&~((vlong)BLKSZ-1);
+	if(pwrite(fd, buf, BLKSZ, oaddr) != BLKSZ)
+		sysfatal("write: %r");
+}
+	
 int
 rootgen(int off, Dir *d, void*)
 {
@@ -391,6 +411,8 @@ rdwrpart(Req *r)
 		if(n > count)
 			n = count;
 		(*move)(dat, blk+o, n);
+		if(r->ifcall.type == Twrite)
+			dirty(offset, blk);
 		tot += n;
 	}
 	/* full and right fringe blocks */
@@ -399,9 +421,11 @@ rdwrpart(Req *r)
 		if(blk == nil)
 			abort();
 		n = BLKSZ;
-		if(n > count)
-			n = count;
+		if(n > count-tot)
+			n = count-tot;
 		(*move)(dat+tot, blk, n);
+		if(r->ifcall.type == Twrite)
+			dirty(offset+tot, blk);
 		tot += n;
 	}
 	r->ofcall.count = tot;
@@ -582,7 +606,7 @@ char *srvname;
 void
 usage(void)
 {
-	fprint(2, "usage: aux/disksim [-D] [-s srvname] [-m mtpt] [sdXX]\n");
+	fprint(2, "usage: aux/disksim [-D] [-f file] [-s srvname] [-m mtpt] [sdXX]\n");
 	fprint(2, "\tdefault mtpt is /dev\n");
 	exits("usage");
 }
@@ -590,6 +614,9 @@ usage(void)
 void
 main(int argc, char **argv)
 {
+	char *file;
+
+	file = nil;
 	quotefmtinstall();
 	time0 = time(0);
 	if(NPTR != BLKSZ/sizeof(void*))
@@ -599,6 +626,12 @@ main(int argc, char **argv)
 	case 'D':
 		chatty9p++;
 		break;
+	case 'f':
+		file = EARGF(usage());
+		break;
+	case 'r':
+		rdonly = 1;
+		break;
 	case 's':
 		srvname = EARGF(usage());
 		break;
@@ -614,6 +647,11 @@ main(int argc, char **argv)
 	if(argc == 1)
 		sdname = argv[0];
 
+	if(file){
+		if((fd = open(file, rdonly ? OREAD : ORDWR)) < 0)
+			sysfatal("open %s: %r", file);
+	}
+
 	inquiry = estrdup9p(inquiry);
 	tab[0].name = estrdup9p("data");
 	tab[0].inuse = 1;

sys/src/cmd/fossil/cache.c

@@ -443,6 +443,9 @@ _cacheLocalLookup(Cache *c, int part, u32int addr, u32int vers,
 			vtSleep(b->ioready);
 			break;
 		case BioVentiError:
+			blockPut(b);
+			vtSetError(EVentiIO);
+			return nil;
 		case BioReadError:
 			blockPut(b);
 			vtSetError(EIO);
@@ -673,6 +676,9 @@ if(0)fprint(2, "cacheGlobal %V %d\n", score, type);
 	case BioClean:
 		return b;
 	case BioVentiError:
+		blockPut(b);
+		vtSetError(EVentiIO);
+		return nil;
 	case BioReadError:
 		blockPut(b);
 		vtSetError(EIO);

sys/src/cmd/fossil/error.c

@@ -35,3 +35,4 @@ char ERoot[] = "cannot remove root";
 char ESnapOld[] = "snapshot has been deleted";
 char ESnapRO[] = "snapshot is read only";
 char ETooBig[] = "file too big";
+char EVentiIO[] = "venti i/o error";

sys/src/cmd/fossil/error.h

@@ -30,3 +30,4 @@ extern char ERoot[];
 extern char ESnapOld[];
 extern char ESnapRO[];
 extern char ETooBig[];
+extern char EVentiIO[];