Browse Source

Plan 9 from Bell Labs 2006-10-12

David du Colombier 14 years ago
parent
commit
de3f949632
11 changed files with 365 additions and 229 deletions
  1. 28 6
      dist/replica/_plan9.db
  2. 28 28
      dist/replica/plan9.db
  3. 28 0
      dist/replica/plan9.log
  4. 190 108
      lib/pci
  5. 2 1
      sys/man/2/strcat
  6. 1 0
      sys/src/9/pc/pci.c
  7. 59 70
      sys/src/boot/pc/pci.c
  8. 2 2
      sys/src/cmd/hget.c
  9. 25 8
      sys/src/cmd/tcs/html.c
  10. 1 1
      sys/src/cmd/tcs/utf.c
  11. 1 5
      sys/src/lib9p/file.c

+ 28 - 6
dist/replica/_plan9.db

@@ -5197,7 +5197,7 @@ lib/ndb/local - 664 sys sys 1077723747 292
 lib/ndb/local.complicated - 664 sys sys 1105461604 2976
 lib/ndb/nfs - 664 sys sys 954036707 113
 lib/news - 20000000775 sys sys 944943954 0
-lib/pci - 664 sys sys 1141350058 196607
+lib/pci - 664 sys sys 1160617172 206912
 lib/sky - 20000000775 sys sys 1079376081 0
 lib/sky/abell.scat - 444 sys sys 954015738 86784
 lib/sky/bayer.scat - 444 sys sys 954015738 12136
@@ -7547,7 +7547,7 @@ sys/man/2/sin - 664 sys sys 944959694 967
 sys/man/2/sinh - 664 sys sys 944959694 360
 sys/man/2/sleep - 664 sys sys 944959694 984
 sys/man/2/stat - 664 sys sys 1015091527 6852
-sys/man/2/strcat - 664 sys sys 1045501487 4688
+sys/man/2/strcat - 664 sys sys 1160618277 4704
 sys/man/2/string - 664 sys sys 1055701090 5306
 sys/man/2/stringsize - 664 sys sys 952627482 1409
 sys/man/2/subfont - 664 sys sys 956345937 5140
@@ -12250,7 +12250,7 @@ sys/src/cmd/gzip/mkfile - 664 sys sys 1124884920 124
 sys/src/cmd/gzip/unzip.c - 664 sys sys 1143759338 13800
 sys/src/cmd/gzip/zip.c - 664 sys sys 1135487935 7063
 sys/src/cmd/gzip/zip.h - 664 sys sys 954778719 1428
-sys/src/cmd/hget.c - 664 sys sys 1138048432 25946
+sys/src/cmd/hget.c - 664 sys sys 1160617698 25994
 sys/src/cmd/history.c - 664 sys sys 1136378274 6098
 sys/src/cmd/hoc - 20000000775 sys sys 954036932 0
 sys/src/cmd/hoc/code.c - 664 sys sys 1132451870 10050
@@ -13402,7 +13402,7 @@ sys/src/cmd/tcs/font/qbits.c - 664 sys sys 944961251 2037
 sys/src/cmd/tcs/gb.c - 664 sys sys 944961288 62707
 sys/src/cmd/tcs/gb.h - 664 sys sys 944961287 183
 sys/src/cmd/tcs/hdr.h - 664 sys sys 944961287 1213
-sys/src/cmd/tcs/html.c - 664 sys sys 1143673020 7338
+sys/src/cmd/tcs/html.c - 664 sys sys 1160620720 7701
 sys/src/cmd/tcs/jis.h - 664 sys sys 944961287 2873
 sys/src/cmd/tcs/ksc.c - 664 sys sys 944961289 72413
 sys/src/cmd/tcs/ksc.h - 664 sys sys 944961287 112
@@ -13416,7 +13416,7 @@ sys/src/cmd/tcs/ms.h - 664 sys sys 1138382780 44069
 sys/src/cmd/tcs/plan9.h - 664 sys sys 944961287 751
 sys/src/cmd/tcs/tcs.c - 664 sys sys 1145881809 19215
 sys/src/cmd/tcs/tune.c - 664 sys sys 1143723685 6283
-sys/src/cmd/tcs/utf.c - 664 sys sys 1143673021 7975
+sys/src/cmd/tcs/utf.c - 664 sys sys 1160620948 8004
 sys/src/cmd/tee.c - 664 sys sys 954970286 1062
 sys/src/cmd/telco - 20000000775 sys sys 1015701205 0
 sys/src/cmd/telco/mkfile - 664 sys sys 944961290 201
@@ -14563,7 +14563,7 @@ sys/src/lib9p - 20000000775 sys sys 1015023311 0
 sys/src/lib9p/auth.c - 664 sys sys 1134337555 3392
 sys/src/lib9p/dirread.c - 664 sys sys 1015023310 641
 sys/src/lib9p/fid.c - 664 sys sys 1089299187 1066
-sys/src/lib9p/file.c - 664 sys sys 1132447639 6651
+sys/src/lib9p/file.c - 664 sys sys 1160614660 6601
 sys/src/lib9p/ftest.c - 664 sys sys 1015023310 502
 sys/src/lib9p/intmap.c - 664 sys sys 1016833881 2255
 sys/src/lib9p/listen.c - 664 sys sys 1134335266 1626
@@ -15669,3 +15669,25 @@ 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/archfs - 775 sys sys 1160622234 147139
+386/bin/cdfs - 775 sys sys 1160622239 167529
+386/bin/hget - 775 sys sys 1160622240 233907
+386/bin/nntpfs - 775 sys sys 1160622243 166791
+386/bin/webcookies - 775 sys sys 1160622244 167686
+386/bin/rdbfs - 775 sys sys 1160622244 174696
+386/bin/auth/factotum - 775 sys sys 1160622236 322179
+386/bin/aux/apm - 775 sys sys 1160622236 180585
+386/bin/aux/disksim - 775 sys sys 1160622236 150919
+386/bin/aux/flashfs - 775 sys sys 1160622237 166638
+386/bin/aux/gpsfs - 775 sys sys 1160622237 182833
+386/bin/aux/olefs - 775 sys sys 1160622238 149613
+386/bin/aux/stub - 775 sys sys 1160622238 141184
+386/bin/execnet - 775 sys sys 1160622239 178310
+386/bin/ext2srv - 775 sys sys 1160622240 180000
+386/bin/ip/httpfile - 775 sys sys 1160622242 284265
+386/bin/mntgen - 775 sys sys 1160622242 145552
+386/bin/nfs - 775 sys sys 1160622243 321667
+386/lib/lib9p.a - 664 sys sys 1160622245 90956
+acme/bin/386/win - 775 sys sys 1160622245 185274
+sys/src/9/pc/pci.c - 664 sys sys 1160622111 26930
+sys/src/boot/pc/pci.c - 664 sys sys 1160622097 20440

+ 28 - 28
dist/replica/plan9.db

@@ -39,7 +39,7 @@
 386/bin/ape/uname - 775 sys sys 1143741925 134338
 386/bin/aquarela - 775 sys sys 1155491743 332850
 386/bin/ar - 775 sys sys 1148500573 113868
-386/bin/archfs - 775 sys sys 1148500573 147191
+386/bin/archfs - 775 sys sys 1160622234 147139
 386/bin/ascii - 775 sys sys 1148500573 64978
 386/bin/astro - 775 sys sys 1148500574 138871
 386/bin/auth - 20000000775 sys sys 1016920815 0
@@ -53,7 +53,7 @@
 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 1158607305 322231
+386/bin/auth/factotum - 775 sys sys 1160622236 322179
 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
@@ -86,7 +86,7 @@
 386/bin/aux/accupoint - 775 sys sys 1148500588 40094
 386/bin/aux/acidleak - 775 sys sys 1148500589 69771
 386/bin/aux/antiword - 775 sys sys 1070288096 511478
-386/bin/aux/apm - 775 sys sys 1148500590 180637
+386/bin/aux/apm - 775 sys sys 1160622236 180585
 386/bin/aux/astarld - 775 sys sys 1148500590 65012
 386/bin/aux/cddb - 775 sys sys 1159730491 72635
 386/bin/aux/clog - 775 sys sys 1148500590 66783
@@ -95,15 +95,15 @@
 386/bin/aux/cropmarks - 775 sys sys 1020319062 1808
 386/bin/aux/data2s - 775 sys sys 1148500591 60855
 386/bin/aux/depend - 775 sys sys 1148500591 146195
-386/bin/aux/disksim - 775 sys sys 1148500592 150971
+386/bin/aux/disksim - 775 sys sys 1160622236 150919
 386/bin/aux/download - 775 sys sys 1087442506 176016
 386/bin/aux/faxreceive - 775 sys sys 1148500592 84280
 386/bin/aux/faxsend - 775 sys sys 1148500592 89787
-386/bin/aux/flashfs - 775 sys sys 1148500593 166690
+386/bin/aux/flashfs - 775 sys sys 1160622237 166638
 386/bin/aux/g3p9bit - 775 sys sys 1104121976 67278
 386/bin/aux/getflags - 775 sys sys 1148500593 64251
 386/bin/aux/gpsevermore - 775 sys sys 1148500593 71833
-386/bin/aux/gpsfs - 775 sys sys 1148500594 182885
+386/bin/aux/gpsfs - 775 sys sys 1160622237 182833
 386/bin/aux/grabit - 775 sys sys 1020319063 1244
 386/bin/aux/hardcopy - 775 sys sys 1020319063 1699
 386/bin/aux/isvmware - 775 sys sys 1032486791 23997
@@ -124,7 +124,7 @@
 386/bin/aux/na - 775 sys sys 1148500598 154517
 386/bin/aux/nfsmount - 775 sys sys 1148500599 234785
 386/bin/aux/nfsserver - 775 sys sys 1148500600 185997
-386/bin/aux/olefs - 775 sys sys 1148500601 149665
+386/bin/aux/olefs - 775 sys sys 1160622238 149613
 386/bin/aux/p9bitpost - 775 sys sys 1104121982 127974
 386/bin/aux/pcmcia - 775 sys sys 1148500601 46940
 386/bin/aux/pcnfsd - 775 sys sys 1148500601 129897
@@ -142,7 +142,7 @@
 386/bin/aux/ssh_genkey - 775 sys sys 1045537957 194629
 386/bin/aux/sshserve - 775 sys sys 1132506841 252850
 386/bin/aux/statusbar - 775 sys sys 1155491745 152321
-386/bin/aux/stub - 775 sys sys 1148500604 141236
+386/bin/aux/stub - 775 sys sys 1160622238 141184
 386/bin/aux/tcpostio - 775 sys sys 1094040084 200808
 386/bin/aux/text2post - 775 sys sys 1104121986 78336
 386/bin/aux/timesync - 775 sys sys 1148500604 128753
@@ -175,7 +175,7 @@
 386/bin/calendar - 775 sys sys 1148500611 80580
 386/bin/cat - 775 sys sys 1148500611 37482
 386/bin/cb - 775 sys sys 1148500611 77722
-386/bin/cdfs - 775 sys sys 1148500612 167581
+386/bin/cdfs - 775 sys sys 1160622239 167529
 386/bin/cfs - 775 sys sys 1148500612 128365
 386/bin/chgrp - 775 sys sys 1148500612 59616
 386/bin/chmod - 775 sys sys 1148500613 62612
@@ -223,9 +223,9 @@
 386/bin/echo - 775 sys sys 1148500628 57686
 386/bin/ed - 775 sys sys 1148500629 93366
 386/bin/eqn - 775 sys sys 1141927235 244405
-386/bin/execnet - 775 sys sys 1148500629 178362
+386/bin/execnet - 775 sys sys 1160622239 178310
 386/bin/exportfs - 775 sys sys 1148500630 162644
-386/bin/ext2srv - 775 sys sys 1148500631 180052
+386/bin/ext2srv - 775 sys sys 1160622240 180000
 386/bin/faces - 775 sys sys 1155491750 194710
 386/bin/factor - 775 sys sys 1148500632 61793
 386/bin/fcp - 775 sys sys 1148500632 82527
@@ -271,7 +271,7 @@
 386/bin/gview - 775 sys sys 1155491751 239077
 386/bin/gzip - 775 sys sys 1148500642 85078
 386/bin/hayes - 775 sys sys 1148500642 64887
-386/bin/hget - 775 sys sys 1148500643 233879
+386/bin/hget - 775 sys sys 1160622240 233907
 386/bin/history - 775 sys sys 1148500644 75799
 386/bin/hoc - 775 sys sys 1155491751 100190
 386/bin/html2ms - 775 sys sys 1148500645 66415
@@ -299,7 +299,7 @@
 386/bin/ip/httpd/save - 775 sys sys 1148500658 133531
 386/bin/ip/httpd/webls - 775 sys sys 1148500658 133642
 386/bin/ip/httpd/wikipost - 775 sys sys 1148500658 115002
-386/bin/ip/httpfile - 775 sys sys 1148500659 284317
+386/bin/ip/httpfile - 775 sys sys 1160622242 284265
 386/bin/ip/imap4d - 775 sys sys 1156976707 238121
 386/bin/ip/ipconfig - 775 sys sys 1157916203 139417
 386/bin/ip/ping - 775 sys sys 1148500661 76814
@@ -330,7 +330,7 @@
 386/bin/mk - 775 sys sys 1148500670 144972
 386/bin/mkdir - 775 sys sys 1148500671 61299
 386/bin/mkpaqfs - 775 sys sys 1148500671 94826
-386/bin/mntgen - 775 sys sys 1148500672 145604
+386/bin/mntgen - 775 sys sys 1160622242 145552
 386/bin/mount - 775 sys sys 1148500672 73436
 386/bin/ms2html - 775 sys sys 1148500672 104279
 386/bin/mtime - 775 sys sys 1148500673 59470
@@ -351,9 +351,9 @@
 386/bin/netkey - 775 sys sys 1148500678 72690
 386/bin/netstat - 775 sys sys 1148500678 85246
 386/bin/news - 775 sys sys 1148500679 72050
-386/bin/nfs - 775 sys sys 1148500680 321719
+386/bin/nfs - 775 sys sys 1160622243 321667
 386/bin/nm - 775 sys sys 1148500680 127107
-386/bin/nntpfs - 775 sys sys 1148500681 166843
+386/bin/nntpfs - 775 sys sys 1160622243 166791
 386/bin/ns - 775 sys sys 1148500681 65586
 386/bin/p - 775 sys sys 1148500681 65314
 386/bin/page - 775 sys sys 1155491755 234276
@@ -376,7 +376,7 @@
 386/bin/pwd - 775 sys sys 1148500685 36932
 386/bin/ramfs - 775 sys sys 1148500686 90121
 386/bin/rc - 775 sys sys 1135101637 143284
-386/bin/rdbfs - 775 sys sys 1148500686 174748
+386/bin/rdbfs - 775 sys sys 1160622244 174696
 386/bin/read - 775 sys sys 1148500687 58377
 386/bin/replica - 20000000775 sys sys 1018321168 0
 386/bin/replica/applychanges - 775 sys sys 1132506870 98629
@@ -508,7 +508,7 @@
 386/bin/vt - 775 sys sys 1133820585 176212
 386/bin/vtdump - 775 sys sys 1132506892 159534
 386/bin/wc - 775 sys sys 1148500701 41191
-386/bin/webcookies - 775 sys sys 1148500701 167738
+386/bin/webcookies - 775 sys sys 1160622244 167686
 386/bin/webfs - 775 sys sys 1134389883 360008
 386/bin/webfsget - 775 sys sys 1148500702 39177
 386/bin/wikifs - 775 sys sys 1157570247 203727
@@ -542,7 +542,7 @@
 386/lib/ape/libregexp.a - 664 sys sys 1143777857 47500
 386/lib/ape/libutf.a - 664 sys sys 1146156980 88500
 386/lib/ape/libv.a - 664 sys sys 1143777858 19668
-386/lib/lib9p.a - 664 sys sys 1143777858 91076
+386/lib/lib9p.a - 664 sys sys 1160622245 90956
 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 1158607308 34672
@@ -634,7 +634,7 @@ acme/bin/386/acd - 775 sys sys 1032232412 137068
 acme/bin/386/adict - 775 sys sys 1015011247 99806
 acme/bin/386/mkwnew - 775 sys sys 1148500707 38992
 acme/bin/386/spout - 775 sys sys 1148500707 61935
-acme/bin/386/win - 775 sys sys 1148500707 185326
+acme/bin/386/win - 775 sys sys 1160622245 185274
 acme/bin/Battery - 775 sys sys 1017457907 451
 acme/bin/Isspam - 775 sys sys 1063951165 235
 acme/bin/Mail - 775 sys sys 1114697798 201
@@ -5197,7 +5197,7 @@ lib/ndb/local - 664 sys sys 1077723747 292
 lib/ndb/local.complicated - 664 sys sys 1105461604 2976
 lib/ndb/nfs - 664 sys sys 954036707 113
 lib/news - 20000000775 sys sys 944943954 0
-lib/pci - 664 sys sys 1141350058 196607
+lib/pci - 664 sys sys 1160617172 206912
 lib/sky - 20000000775 sys sys 1079376081 0
 lib/sky/abell.scat - 444 sys sys 954015738 86784
 lib/sky/bayer.scat - 444 sys sys 954015738 12136
@@ -7547,7 +7547,7 @@ sys/man/2/sin - 664 sys sys 944959694 967
 sys/man/2/sinh - 664 sys sys 944959694 360
 sys/man/2/sleep - 664 sys sys 944959694 984
 sys/man/2/stat - 664 sys sys 1015091527 6852
-sys/man/2/strcat - 664 sys sys 1045501487 4688
+sys/man/2/strcat - 664 sys sys 1160618277 4704
 sys/man/2/string - 664 sys sys 1055701090 5306
 sys/man/2/stringsize - 664 sys sys 952627482 1409
 sys/man/2/subfont - 664 sys sys 956345937 5140
@@ -8021,7 +8021,7 @@ sys/src/9/pc/pcdisk - 664 sys sys 1138115243 1471
 sys/src/9/pc/pcf - 664 sys sys 1138115243 1529
 sys/src/9/pc/pcfl - 664 sys sys 1042004821 1563
 sys/src/9/pc/pcflop - 664 sys sys 1158061762 1513
-sys/src/9/pc/pci.c - 664 sys sys 1155995367 26873
+sys/src/9/pc/pci.c - 664 sys sys 1160622111 26930
 sys/src/9/pc/pcmciamodem.c - 664 sys sys 1099761153 1586
 sys/src/9/pc/pcmkfile - 664 sys sys 1109303822 101
 sys/src/9/pc/piix4smbus.c - 664 sys sys 1091129037 5230
@@ -9078,7 +9078,7 @@ sys/src/boot/pc/pbsdisk.s - 664 sys sys 1017854325 6371
 sys/src/boot/pc/pbsdisklba - 775 sys sys 1015007954 509
 sys/src/boot/pc/pbsdisklba.s - 664 sys sys 1015007954 6022
 sys/src/boot/pc/pbslba.s - 664 sys sys 1143465392 8158
-sys/src/boot/pc/pci.c - 664 sys sys 1153333456 20363
+sys/src/boot/pc/pci.c - 664 sys sys 1160622097 20440
 sys/src/boot/pc/print.c - 664 sys sys 1094674483 219
 sys/src/boot/pc/queue.c - 664 sys sys 1015007954 566
 sys/src/boot/pc/sd.h - 664 sys sys 1153333456 2244
@@ -12250,7 +12250,7 @@ sys/src/cmd/gzip/mkfile - 664 sys sys 1124884920 124
 sys/src/cmd/gzip/unzip.c - 664 sys sys 1143759338 13800
 sys/src/cmd/gzip/zip.c - 664 sys sys 1135487935 7063
 sys/src/cmd/gzip/zip.h - 664 sys sys 954778719 1428
-sys/src/cmd/hget.c - 664 sys sys 1138048432 25946
+sys/src/cmd/hget.c - 664 sys sys 1160617698 25994
 sys/src/cmd/history.c - 664 sys sys 1136378274 6098
 sys/src/cmd/hoc - 20000000775 sys sys 954036932 0
 sys/src/cmd/hoc/code.c - 664 sys sys 1132451870 10050
@@ -13402,7 +13402,7 @@ sys/src/cmd/tcs/font/qbits.c - 664 sys sys 944961251 2037
 sys/src/cmd/tcs/gb.c - 664 sys sys 944961288 62707
 sys/src/cmd/tcs/gb.h - 664 sys sys 944961287 183
 sys/src/cmd/tcs/hdr.h - 664 sys sys 944961287 1213
-sys/src/cmd/tcs/html.c - 664 sys sys 1143673020 7338
+sys/src/cmd/tcs/html.c - 664 sys sys 1160620720 7701
 sys/src/cmd/tcs/jis.h - 664 sys sys 944961287 2873
 sys/src/cmd/tcs/ksc.c - 664 sys sys 944961289 72413
 sys/src/cmd/tcs/ksc.h - 664 sys sys 944961287 112
@@ -13416,7 +13416,7 @@ sys/src/cmd/tcs/ms.h - 664 sys sys 1138382780 44069
 sys/src/cmd/tcs/plan9.h - 664 sys sys 944961287 751
 sys/src/cmd/tcs/tcs.c - 664 sys sys 1145881809 19215
 sys/src/cmd/tcs/tune.c - 664 sys sys 1143723685 6283
-sys/src/cmd/tcs/utf.c - 664 sys sys 1143673021 7975
+sys/src/cmd/tcs/utf.c - 664 sys sys 1160620948 8004
 sys/src/cmd/tee.c - 664 sys sys 954970286 1062
 sys/src/cmd/telco - 20000000775 sys sys 1015701205 0
 sys/src/cmd/telco/mkfile - 664 sys sys 944961290 201
@@ -14563,7 +14563,7 @@ sys/src/lib9p - 20000000775 sys sys 1015023311 0
 sys/src/lib9p/auth.c - 664 sys sys 1134337555 3392
 sys/src/lib9p/dirread.c - 664 sys sys 1015023310 641
 sys/src/lib9p/fid.c - 664 sys sys 1089299187 1066
-sys/src/lib9p/file.c - 664 sys sys 1132447639 6651
+sys/src/lib9p/file.c - 664 sys sys 1160614660 6601
 sys/src/lib9p/ftest.c - 664 sys sys 1015023310 502
 sys/src/lib9p/intmap.c - 664 sys sys 1016833881 2255
 sys/src/lib9p/listen.c - 664 sys sys 1134335266 1626

+ 28 - 0
dist/replica/plan9.log

@@ -30526,3 +30526,31 @@
 1160073012 0 c sys/man/8/dhcpd - 664 sys sys 1160071627 5460
 1160073012 1 c sys/src/cmd/ip/dhcpd/dhcpd.c - 664 sys sys 1160071607 33096
 1160103606 0 c 386/bin/ip/dhcpd - 775 sys sys 1160103260 151069
+1160614806 0 c sys/src/lib9p/file.c - 664 sys sys 1160614660 6601
+1160618406 0 c lib/pci - 664 sys sys 1160617172 206912
+1160618406 1 c sys/man/2/strcat - 664 sys sys 1160618277 4704
+1160618406 2 c sys/src/cmd/hget.c - 664 sys sys 1160617698 25994
+1160622005 0 c sys/src/cmd/tcs/html.c - 664 sys sys 1160620720 7701
+1160622005 1 c sys/src/cmd/tcs/utf.c - 664 sys sys 1160620948 8004
+1160623806 0 c 386/bin/archfs - 775 sys sys 1160622234 147139
+1160623806 1 c 386/bin/cdfs - 775 sys sys 1160622239 167529
+1160623806 2 c 386/bin/hget - 775 sys sys 1160622240 233907
+1160623806 3 c 386/bin/nntpfs - 775 sys sys 1160622243 166791
+1160623806 4 c 386/bin/webcookies - 775 sys sys 1160622244 167686
+1160623806 5 c 386/bin/rdbfs - 775 sys sys 1160622244 174696
+1160623806 6 c 386/bin/auth/factotum - 775 sys sys 1160622236 322179
+1160623806 7 c 386/bin/aux/apm - 775 sys sys 1160622236 180585
+1160623806 8 c 386/bin/aux/disksim - 775 sys sys 1160622236 150919
+1160623806 9 c 386/bin/aux/flashfs - 775 sys sys 1160622237 166638
+1160623806 10 c 386/bin/aux/gpsfs - 775 sys sys 1160622237 182833
+1160623806 11 c 386/bin/aux/olefs - 775 sys sys 1160622238 149613
+1160623806 12 c 386/bin/aux/stub - 775 sys sys 1160622238 141184
+1160623806 13 c 386/bin/execnet - 775 sys sys 1160622239 178310
+1160623806 14 c 386/bin/ext2srv - 775 sys sys 1160622240 180000
+1160623806 15 c 386/bin/ip/httpfile - 775 sys sys 1160622242 284265
+1160623806 16 c 386/bin/mntgen - 775 sys sys 1160622242 145552
+1160623806 17 c 386/bin/nfs - 775 sys sys 1160622243 321667
+1160623806 18 c 386/lib/lib9p.a - 664 sys sys 1160622245 90956
+1160623806 19 c acme/bin/386/win - 775 sys sys 1160622245 185274
+1160623806 20 c sys/src/9/pc/pci.c - 664 sys sys 1160622111 26930
+1160623806 21 c sys/src/boot/pc/pci.c - 664 sys sys 1160622097 20440

File diff suppressed because it is too large
+ 190 - 108
lib/pci


+ 2 - 1
sys/man/2/strcat

@@ -250,7 +250,8 @@ implementations in
 .SH SEE ALSO
 .IR memory (2),
 .IR rune (2),
-.IR runestrcat (2)
+.IR runestrcat (2),
+.IR string (2)
 .SH BUGS
 These routines know nothing about
 .SM UTF.

+ 1 - 0
sys/src/9/pc/pci.c

@@ -635,6 +635,7 @@ static Bridge southbridges[] = {
 	{ 0x8086, 0x24cc, pIIxget, pIIxset },	// Intel 82801DBM
 	{ 0x8086, 0x24d0, pIIxget, pIIxset },	// Intel 82801EB
 	{ 0x8086, 0x2640, pIIxget, pIIxset },	// Intel 82801FB
+	{ 0x8086, 0x27b9, pIIxget, pIIxset },	// Intel 82801GBM
 	{ 0x1106, 0x0586, viaget, viaset },	// Viatech 82C586
 	{ 0x1106, 0x0596, viaget, viaset },	// Viatech 82C596
 	{ 0x1106, 0x0686, viaget, viaset },	// Viatech 82C686

+ 59 - 70
sys/src/boot/pc/pci.c

@@ -209,7 +209,18 @@ pciscan(int bno, Pcidev** list)
 	return maxubn;
 }
 
-static uchar 
+static uchar
+null_link(Pcidev *, uchar )
+{
+	return 0;
+}
+
+static void
+null_init(Pcidev *, uchar , uchar )
+{
+}
+
+static uchar
 pIIx_link(Pcidev *router, uchar link)
 {
 	uchar pirq;
@@ -219,13 +230,13 @@ pIIx_link(Pcidev *router, uchar link)
 	return (pirq < 16)? pirq: 0;
 }
 
-static void 
+static void
 pIIx_init(Pcidev *router, uchar link, uchar irq)
 {
 	pcicfgw8(router, link, irq);
 }
 
-static uchar 
+static uchar
 via_link(Pcidev *router, uchar link)
 {
 	uchar pirq;
@@ -236,7 +247,7 @@ via_link(Pcidev *router, uchar link)
 	return (link & 1)? (pirq >> 4): (pirq & 15);
 }
 
-static void 
+static void
 via_init(Pcidev *router, uchar link, uchar irq)
 {
 	uchar pirq;
@@ -247,7 +258,7 @@ via_init(Pcidev *router, uchar link, uchar irq)
 	pcicfgw8(router, 0x55 + (link>>1), pirq);
 }
 
-static uchar 
+static uchar
 opti_link(Pcidev *router, uchar link)
 {
 	uchar pirq = 0;
@@ -258,7 +269,7 @@ opti_link(Pcidev *router, uchar link)
 	return (link & 0x10)? (pirq >> 4): (pirq & 15);
 }
 
-static void 
+static void
 opti_init(Pcidev *router, uchar link, uchar irq)
 {
 	uchar pirq;
@@ -269,7 +280,7 @@ opti_init(Pcidev *router, uchar link, uchar irq)
 	pcicfgw8(router, 0xb8 + (link >> 5), pirq);
 }
 
-static uchar 
+static uchar
 ali_link(Pcidev *router, uchar link)
 {
 	/* No, you're not dreaming */
@@ -281,7 +292,7 @@ ali_link(Pcidev *router, uchar link)
 	return (link & 1)? map[pirq&15]: map[pirq>>4];
 }
 
-static void 
+static void
 ali_init(Pcidev *router, uchar link, uchar irq)
 {
 	/* Inverse of map in ali_link */
@@ -294,7 +305,7 @@ ali_init(Pcidev *router, uchar link, uchar irq)
 	pcicfgw8(router, 0x48 + ((link-1)>>1), pirq);
 }
 
-static uchar 
+static uchar
 cyrix_link(Pcidev *router, uchar link)
 {
 	uchar pirq;
@@ -304,7 +315,7 @@ cyrix_link(Pcidev *router, uchar link)
 	return ((link & 1)? pirq >> 4: pirq & 15);
 }
 
-static void 
+static void
 cyrix_init(Pcidev *router, uchar link, uchar irq)
 {
 	uchar pirq;
@@ -315,64 +326,42 @@ cyrix_init(Pcidev *router, uchar link, uchar irq)
 	pcicfgw8(router, 0x5c + (link>>1), pirq);
 }
 
-enum {
-	Intel = 0x8086,		
-		Intel_82371FB_0 = 0x122e,
-		Intel_82371MX_0 = 0x1234,
-		Intel_82371SB_0 = 0x7000,
-		Intel_82371AB_0 = 0x7110,
-		Intel_82443MX_1 = 0x7198,
-		Intel_82801AA_0 = 0x2410,
-		Intel_82801AB_0 = 0x2420,
-		Intel_82801BA_0 = 0x2440,
-		Intel_82801BAM_0 = 0x244c,
-		Intel_82801CAM_0 = 0x248c,
-		Intel_82801DBM_0 = 0x24cc,
-		Intel_82801EB_0 = 0x24d0,
-		Intel_82801FB_0 = 0x2640,
-	Viatech = 0x1106,
-		Via_82C586_0 = 0x0586,
-		Via_82C596 = 0x0596,
-		Via_82C686 = 0x0686,
-	Opti = 0x1045,
-		Opti_82C700 = 0xc700,
-	Al = 0x10b9,
-		Al_M1533 = 0x1533,
-	SI = 0x1039,
-		SI_503 = 0x0008,
-		SI_496 = 0x0496,
-	Cyrix = 0x1078,
-		Cyrix_5530_Legacy = 0x0100,
-};
-
 typedef struct {
 	ushort	sb_vid, sb_did;
 	uchar	(*sb_translate)(Pcidev *, uchar);
-	void	(*sb_initialize)(Pcidev *, uchar, uchar);	
+	void	(*sb_initialize)(Pcidev *, uchar, uchar);
 } bridge_t;
 
 static bridge_t southbridges[] = {
-{	Intel, Intel_82371FB_0,		pIIx_link,	pIIx_init },
-{	Intel, Intel_82371MX_0,		pIIx_link,	pIIx_init },
-{	Intel, Intel_82371SB_0,		pIIx_link,	pIIx_init },
-{	Intel, Intel_82371AB_0,		pIIx_link,	pIIx_init },
-{	Intel, Intel_82443MX_1,		pIIx_link,	pIIx_init },
-{	Intel, Intel_82801AA_0,		pIIx_link,	pIIx_init },
-{	Intel, Intel_82801AB_0,		pIIx_link,	pIIx_init },
-{	Intel, Intel_82801BA_0,		pIIx_link,	pIIx_init },
-{	Intel, Intel_82801BAM_0,	pIIx_link,	pIIx_init },
-{	Intel, Intel_82801CAM_0,	pIIx_link,	pIIx_init },
-{	Intel, Intel_82801DBM_0,	pIIx_link,	pIIx_init },
-{	Intel, Intel_82801EB_0,		pIIx_link,	pIIx_init },
-{	Intel, Intel_82801FB_0,		pIIx_link,	pIIx_init },
-{	Viatech, Via_82C586_0,		via_link,	via_init },
-{	Viatech, Via_82C596,		via_link,	via_init },
-{	Viatech, Via_82C686,		via_link,	via_init },
-{	Opti, Opti_82C700,		opti_link,	opti_init },
-{	Al, Al_M1533,			ali_link,	ali_init },
-{	SI, SI_503,			pIIx_link,	pIIx_init },
-{	SI, SI_496,			pIIx_link,	pIIx_init },
-{	Cyrix, Cyrix_5530_Legacy,	cyrix_link,	cyrix_init }
+	{ 0x8086, 0x122e, pIIx_link, pIIx_init },	// Intel 82371FB
+	{ 0x8086, 0x1234, pIIx_link, pIIx_init },	// Intel 82371MX
+	{ 0x8086, 0x7000, pIIx_link, pIIx_init },	// Intel 82371SB
+	{ 0x8086, 0x7110, pIIx_link, pIIx_init },	// Intel 82371AB
+	{ 0x8086, 0x7198, pIIx_link, pIIx_init },	// Intel 82443MX (fn 1)
+	{ 0x8086, 0x2410, pIIx_link, pIIx_init },	// Intel 82801AA
+	{ 0x8086, 0x2420, pIIx_link, pIIx_init },	// Intel 82801AB
+	{ 0x8086, 0x2440, pIIx_link, pIIx_init },	// Intel 82801BA
+	{ 0x8086, 0x244c, pIIx_link, pIIx_init },	// Intel 82801BAM
+	{ 0x8086, 0x248c, pIIx_link, pIIx_init },	// Intel 82801CAM
+	{ 0x8086, 0x24c0, pIIx_link, pIIx_init },	// Intel 82801DBL
+	{ 0x8086, 0x24cc, pIIx_link, pIIx_init },	// Intel 82801DBM
+	{ 0x8086, 0x24d0, pIIx_link, pIIx_init },	// Intel 82801EB
+	{ 0x8086, 0x2640, pIIx_link, pIIx_init },	// Intel 82801FB
+	{ 0x8086, 0x27b9, pIIx_link, pIIx_init },	// Intel 82801GBM
+	{ 0x1106, 0x0586, via_link, via_init },		// Viatech 82C586
+	{ 0x1106, 0x0596, via_link, via_init },		// Viatech 82C596
+	{ 0x1106, 0x0686, via_link, via_init },		// Viatech 82C686
+	{ 0x1106, 0x3227, via_link, via_init },		// Viatech VT8237
+	{ 0x1045, 0xc700, opti_link, opti_init },	// Opti 82C700
+	{ 0x10b9, 0x1533, ali_link, ali_init },		// Al M1533
+	{ 0x1039, 0x0008, pIIx_link, pIIx_init },	// SI 503
+	{ 0x1039, 0x0496, pIIx_link, pIIx_init },	// SI 496
+	{ 0x1078, 0x0100, cyrix_link, cyrix_init },	// Cyrix 5530 Legacy
+
+	{ 0x1002, 0x4377, nil, nil },		// ATI Radeon Xpress 200M
+	{ 0x1022, 0x746B, nil, nil },		// AMD 8111
+	{ 0x10DE, 0x00D1, nil, nil },		// NVIDIA nForce 3
+	{ 0x1166, 0x0200, nil, nil },		// ServerWorks ServerSet III LE
 };
 
 typedef struct {
@@ -443,7 +432,7 @@ pcirouting(void)
 			  vid, did);
 		return;
 	}
-	
+
 	pciirqs = (r->rt_pciirqs[1] << 8)|r->rt_pciirqs[0];
 
 	size = (r->rt_size[1] << 8)|r->rt_size[0];
@@ -463,12 +452,12 @@ pcirouting(void)
 			// obtaining the Pcidev structure.
 			tbdf = (BusPCI << 24)|(e->e_bus << 16)|((e->e_dev | fn) << 8);
 			vdid = pcicfgrw32(tbdf, PciVID, 0, 1);
-			if (vdid == 0xFFFFFFFF || vdid == 0) 
+			if (vdid == 0xFFFFFFFF || vdid == 0)
 				continue;
 
 			vid = vdid;
 			did = vdid >> 16;
-	
+
 			pci = nil;
 			while ((pci = pcimatch(pci, vid, did)) != nil) {
 
@@ -476,13 +465,13 @@ pcirouting(void)
 					continue;
 
 				pin = pcicfgr8(pci, PciINTP);
-				if (pin == 0 || pin == 0xff) 
+				if (pin == 0 || pin == 0xff)
 					continue;
-	
+
 				m = &e->e_maps[(pin - 1) * 3];
 				irq = southbridge->sb_translate(sbpci, m[0]);
 				if (irq) {
-					print("pcirouting: %.4uX/%.4uX at pin %d irq %d\n", 
+					print("pcirouting: %.4uX/%.4uX at pin %d irq %d\n",
 						  vid, did, pin, irq);
 					pcicfgw8(pci, PciINTL, irq);
 					pci->intl = irq;
@@ -541,7 +530,7 @@ pcicfginit(void)
 		}
 		outb(PciCSE, n);
 	}
-	
+
 	if(pcicfgmode < 0)
 		goto out;
 
@@ -917,7 +906,7 @@ pcigetpmrb(Pcidev* p)
 	 * power management method.
 	 * Find the capabilities pointer based on PCI header type.
 	 */
-	if(!(p->pcr & 0x0010))
+	if(!(pcicfgr16(p, PciPSR) & 0x0010))
 		return -1;
 	switch(pcicfgr8(p, PciHDT)){
 	default:

+ 2 - 2
sys/src/cmd/hget.c

@@ -534,7 +534,7 @@ dohttp(URL *u, URL *px, Range *r, Out *out, long mtime)
 		if(output(out, buf, n) != n)
 			break;
 		tot += n;
-		if(verbose && vtime != time(0)) {
+		if(verbose && (vtime != time(0) || r->start == r->end)) {
 			vtime = time(0);
 			fprint(2, "%ld %ld\n", r->start+tot, r->end);
 		}
@@ -1220,7 +1220,7 @@ ftpxfer(int in, Out *out, Range *r)
 		if(output(out, buf, i) != i)
 			return Error;
 		r->start += i;
-		if(verbose && vtime != time(0)) {
+		if(verbose && (vtime != time(0) || r->start == r->end)) {
 			vtime = time(0);
 			fprint(2, "%ld %ld\n", r->start, r->end);
 		}

+ 25 - 8
sys/src/cmd/tcs/html.c

@@ -13,6 +13,11 @@ struct Hchar
 
 /* &lt;, &gt;, &quot;, &amp; intentionally omitted */
 
+/*
+ * Names beginning with _ are names we recognize
+ * (without the underscore) but will not generate,
+ * because they are nonstandard.
+ */
 static Hchar byname[] =
 {
 	{"AElig", 198},
@@ -116,10 +121,10 @@ static Hchar byname[] =
 	{"eacute", 233},
 	{"ecirc", 234},
 	{"egrave", 232},
-	{"emdash", 8212},	/* non-standard but commonly used */
+	{"_emdash", 8212},	/* non-standard but commonly used */
 	{"empty", 8709},
 	{"emsp", 8195},
-	{"endash", 8211},	/* non-standard but commonly used */
+	{"_endash", 8211},	/* non-standard but commonly used */
 	{"ensp", 8194},
 	{"epsilon", 949},
 	{"equiv", 8801},
@@ -159,7 +164,7 @@ static Hchar byname[] =
 	{"laquo", 171},
 	{"larr", 8592},
 	{"lceil", 8968},
-	{"ldots", 8230},
+	{"_ldots", 8230},
 	{"ldquo", 8220},
 	{"le", 8804},
 	{"lfloor", 8970},
@@ -237,7 +242,7 @@ static Hchar byname[] =
 	{"sigma", 963},
 	{"sigmaf", 962},
 	{"sim", 8764},
-	{"sp", 8194},
+	{"_sp", 8194},
 	{"spades", 9824},
 	{"sub", 8834},
 	{"sube", 8838},
@@ -266,13 +271,13 @@ static Hchar byname[] =
 	{"upsih", 978},
 	{"upsilon", 965},
 	{"uuml", 252},
-	{"varepsilon", 8712},
+	{"_varepsilon", 8712},
 	{"varphi", 981},
-	{"varpi", 982},
+	{"_varpi", 982},
 	{"varrho", 1009},
 	{"vdots", 8942},
-	{"vsigma", 962},
-	{"vtheta", 977},
+	{"_vsigma", 962},
+	{"_vtheta", 977},
 	{"weierp", 8472},
 	{"xi", 958},
 	{"yacute", 253},
@@ -309,11 +314,21 @@ static void
 html_init(void)
 {
 	static int init;
+	int i;
 	
 	if(init)
 		return;
 	init = 1;
 	memmove(byrune, byname, sizeof byrune);
+	
+	/* Eliminate names we aren't allowed to generate. */
+	for(i=0; i<nelem(byrune); i++){
+		if(byrune[i].s[0] == '_'){
+			byrune[i].r = Runeerror;
+			byname[i].s++;
+		}
+	}
+	
 	qsort(byname, nelem(byname), sizeof byname[0], hnamecmp);
 	qsort(byrune, nelem(byrune), sizeof byrune[0], hrunecmp);
 }
@@ -346,6 +361,8 @@ findbyrune(Rune r)
 	Hchar *h;
 	int n, m;
 
+	if(r == Runeerror)
+		return nil;
 	h = byrune;
 	n = nelem(byrune);
 	while(n > 0){

+ 1 - 1
sys/src/cmd/tcs/utf.c

@@ -37,7 +37,7 @@ utf_in(int fd, long *notused, struct convert *out)
 	tot = 0;
 	while((n = read(fd, buf+tot, N-tot)) >= 0){
 		tot += n;
-		for(i=j=0; i<tot-UTFmax || (n==0 && i<tot); ){
+		for(i=j=0; i<=tot-UTFmax || (i<tot && (n==0 || fullrune(buf+i, tot-i))); ){
 			c = our_mbtowc(&l, buf+i, tot-i);
 			if(c == -1){
 				if(squawk)

+ 1 - 5
sys/src/lib9p/file.c

@@ -277,21 +277,17 @@ File*
 walkfile(File *f, char *path)
 {
 	char *os, *s, *nexts;
-	File *nf;
 
 	if(strchr(path, '/') == nil)
 		return walkfile1(f, path);	/* avoid malloc */
 
 	os = s = estrdup9p(path);
-	incref(f);
 	for(; *s; s=nexts){
 		if(nexts = strchr(s, '/'))
 			*nexts++ = '\0';
 		else
 			nexts = s+strlen(s);
-		nf = walkfile1(f, s);
-		closefile(f);
-		f = nf;
+		f = walkfile1(f, s);
 		if(f == nil)
 			break;
 	}

Some files were not shown because too many files changed in this diff