Browse Source

Plan 9 from Bell Labs 2007-02-23

David du Colombier 14 years ago
parent
commit
dafb271276

+ 24 - 24
dist/replica/_plan9.db

@@ -19,7 +19,7 @@
 386/bin/8l - 775 sys sys 1148500567 115711
 386/bin/9660srv - 775 sys sys 1168402261 104975
 386/bin/aan - 775 sys sys 1168402261 131298
-386/bin/acid - 775 sys sys 1168402262 401157
+386/bin/acid - 775 sys sys 1172203052 401181
 386/bin/acme - 775 sys sys 1168402263 432256
 386/bin/ape - 20000000775 sys sys 1016944144 0
 386/bin/ape/basename - 775 sys sys 1136656314 132873
@@ -118,7 +118,7 @@
 386/bin/aux/mklatinkbd - 775 sys sys 1168402282 64407
 386/bin/aux/mnihongo - 775 sys sys 1168402283 140020
 386/bin/aux/mouse - 775 sys sys 1148500597 44061
-386/bin/aux/ms2 - 775 sys sys 1168402283 87373
+386/bin/aux/ms2 - 775 sys sys 1172203053 87397
 386/bin/aux/msexceltables - 775 sys sys 1168402283 82921
 386/bin/aux/mswordstrings - 775 sys sys 1168402283 65541
 386/bin/aux/na - 775 sys sys 1168402284 154423
@@ -176,7 +176,7 @@
 386/bin/cat - 775 sys sys 1148500611 37482
 386/bin/cb - 775 sys sys 1168402293 77628
 386/bin/cdfs - 775 sys sys 1168402294 167435
-386/bin/cfs - 775 sys sys 1171830300 128247
+386/bin/cfs - 775 sys sys 1172175927 128780
 386/bin/chgrp - 775 sys sys 1168402294 59522
 386/bin/chmod - 775 sys sys 1168402294 62518
 386/bin/cifscmd - 775 sys sys 1169612022 343611
@@ -193,7 +193,7 @@
 386/bin/cpu - 775 sys sys 1168402297 139484
 386/bin/crop - 775 sys sys 1168402298 116374
 386/bin/date - 775 sys sys 1148500618 43311
-386/bin/db - 775 sys sys 1168402299 345979
+386/bin/db - 775 sys sys 1172203054 346003
 386/bin/dc - 775 sys sys 1168402299 99260
 386/bin/dd - 775 sys sys 1159039156 45991
 386/bin/deroff - 775 sys sys 1168402299 74474
@@ -230,7 +230,7 @@
 386/bin/faces - 775 sys sys 1168402306 194616
 386/bin/factor - 775 sys sys 1168402307 61699
 386/bin/fcp - 775 sys sys 1168402307 82433
-386/bin/file - 775 sys sys 1168402307 124983
+386/bin/file - 775 sys sys 1172203054 125007
 386/bin/fmt - 775 sys sys 1168402307 65567
 386/bin/fortune - 775 sys sys 1168402308 67356
 386/bin/fossil - 20000000775 sys sys 1042005470 0
@@ -319,8 +319,8 @@
 386/bin/join - 775 sys sys 1168402330 114382
 386/bin/jpg - 775 sys sys 1168402330 174923
 386/bin/kbmap - 775 sys sys 1168402330 144015
-386/bin/kprof - 775 sys sys 1168402331 105405
-386/bin/ktrace - 775 sys sys 1168402331 123085
+386/bin/kprof - 775 sys sys 1172203054 105429
+386/bin/ktrace - 775 sys sys 1172203054 123109
 386/bin/lens - 775 sys sys 1168402332 151119
 386/bin/lex - 775 sys sys 1168402332 99261
 386/bin/lnfs - 775 sys sys 1168402333 99675
@@ -353,7 +353,7 @@
 386/bin/netstat - 775 sys sys 1169612032 85184
 386/bin/news - 775 sys sys 1168402341 71956
 386/bin/nfs - 775 sys sys 1168402342 321573
-386/bin/nm - 775 sys sys 1168402342 127013
+386/bin/nm - 775 sys sys 1172203055 127037
 386/bin/nntpfs - 775 sys sys 1168402342 166697
 386/bin/ns - 775 sys sys 1168402343 65492
 386/bin/p - 775 sys sys 1168402343 65220
@@ -371,7 +371,7 @@
 386/bin/ppm - 775 sys sys 1168402345 149765
 386/bin/pr - 775 sys sys 1168402345 77717
 386/bin/primes - 775 sys sys 1148500685 38820
-386/bin/prof - 775 sys sys 1168402345 110868
+386/bin/prof - 775 sys sys 1172203055 110892
 386/bin/proof - 775 sys sys 1132506869 178756
 386/bin/ps - 775 sys sys 1168402346 68812
 386/bin/pwd - 775 sys sys 1148500685 36932
@@ -400,7 +400,7 @@
 386/bin/sed - 775 sys sys 1168402348 89763
 386/bin/seq - 775 sys sys 1162241047 38441
 386/bin/sha1sum - 775 sys sys 1168402348 61366
-386/bin/size - 775 sys sys 1168402348 78681
+386/bin/size - 775 sys sys 1172203055 78705
 386/bin/sleep - 775 sys sys 1158088708 3875
 386/bin/snap - 775 sys sys 1136346852 313627
 386/bin/snapfs - 775 sys sys 1134389876 388292
@@ -416,7 +416,7 @@
 386/bin/sshnet - 775 sys sys 1134389877 288327
 386/bin/stats - 775 sys sys 1168402350 190989
 386/bin/strings - 775 sys sys 1168402350 62855
-386/bin/strip - 775 sys sys 1168402350 80670
+386/bin/strip - 775 sys sys 1172203055 80694
 386/bin/sum - 775 sys sys 1148500691 39505
 386/bin/swap - 775 sys sys 1168402350 62373
 386/bin/syscall - 775 sys sys 1130594788 73568
@@ -436,7 +436,7 @@
 386/bin/topng - 775 sys sys 1168402354 138683
 386/bin/toppm - 775 sys sys 1168402354 165616
 386/bin/touch - 775 sys sys 1168402354 64048
-386/bin/tprof - 775 sys sys 1168402355 297738
+386/bin/tprof - 775 sys sys 1172203056 297762
 386/bin/tr - 775 sys sys 1168402355 62088
 386/bin/trace - 775 sys sys 1168402356 181838
 386/bin/troff - 775 sys sys 1134151360 357941
@@ -561,7 +561,7 @@
 386/lib/libhttpd.a - 664 sys sys 1168402367 99458
 386/lib/libip.a - 664 sys sys 1169612032 35672
 386/lib/libl.a - 664 sys sys 1168402367 5372
-386/lib/libmach.a - 664 sys sys 1168402369 785352
+386/lib/libmach.a - 664 sys sys 1172203058 785440
 386/lib/libmemdraw.a - 664 sys sys 1168402369 284092
 386/lib/libmemlayer.a - 664 sys sys 1168402369 47360
 386/lib/libmp.a - 664 sys sys 1170879862 79978
@@ -5764,7 +5764,7 @@ sys/games - 20000000775 sys sys 1117225532 0
 sys/games/lib - 20000000775 sys sys 1165337608 0
 sys/games/lib/4scores - 10000000666 sys sys 1118680448 0
 sys/games/lib/5scores - 10000000666 sys sys 1118680453 0
-sys/games/lib/fortunes - 664 sys sys 1171231680 263238
+sys/games/lib/fortunes - 664 sys sys 1172125060 263335
 sys/games/lib/mahjongg - 20000000775 sys sys 1095792278 0
 sys/games/lib/mahjongg/backgrounds - 20000000775 sys sys 1095792293 0
 sys/games/lib/mahjongg/backgrounds/default.bit - 664 sys sys 1095792293 346803
@@ -9880,21 +9880,21 @@ sys/src/cmd/cdfs/main.c - 664 sys sys 1017679316 11040
 sys/src/cmd/cdfs/mkfile - 664 sys sys 959922196 182
 sys/src/cmd/cdfs/mmc.c - 664 sys sys 1146318348 17198
 sys/src/cmd/cfs - 20000000775 sys sys 1045505024 0
-sys/src/cmd/cfs/bcache.c - 664 sys sys 1014925219 2956
+sys/src/cmd/cfs/bcache.c - 664 sys sys 1172123361 2964
 sys/src/cmd/cfs/bcache.h - 664 sys sys 1014925220 797
-sys/src/cmd/cfs/cformat.h - 664 sys sys 1014925220 1404
-sys/src/cmd/cfs/cfs.c - 664 sys sys 1171785255 16484
-sys/src/cmd/cfs/disk.c - 664 sys sys 1134305455 5949
-sys/src/cmd/cfs/disk.h - 664 sys sys 1014925220 467
-sys/src/cmd/cfs/file.c - 664 sys sys 944960876 5124
+sys/src/cmd/cfs/cformat.h - 664 sys sys 1172125152 1400
+sys/src/cmd/cfs/cfs.c - 664 sys sys 1172123357 16567
+sys/src/cmd/cfs/disk.c - 664 sys sys 1172123358 5900
+sys/src/cmd/cfs/disk.h - 664 sys sys 1172123358 471
+sys/src/cmd/cfs/file.c - 664 sys sys 1172123358 5088
 sys/src/cmd/cfs/file.h - 664 sys sys 944960876 225
-sys/src/cmd/cfs/inode.c - 664 sys sys 1014925220 6967
+sys/src/cmd/cfs/inode.c - 664 sys sys 1172123357 6939
 sys/src/cmd/cfs/inode.h - 664 sys sys 944960876 1145
 sys/src/cmd/cfs/lru.c - 664 sys sys 944960876 1013
 sys/src/cmd/cfs/lru.h - 664 sys sys 944960876 197
 sys/src/cmd/cfs/mkfile - 664 sys sys 1032457443 663
 sys/src/cmd/cfs/notes - 664 sys sys 944960876 570
-sys/src/cmd/cfs/stats.h - 664 sys sys 1014925220 918
+sys/src/cmd/cfs/stats.h - 664 sys sys 1172123357 931
 sys/src/cmd/chgrp.c - 664 sys sys 1014926580 624
 sys/src/cmd/chmod.c - 664 sys sys 1079372923 1904
 sys/src/cmd/cleanname.c - 664 sys sys 944960760 715
@@ -15267,7 +15267,7 @@ sys/src/libmach/8db.c - 664 sys sys 1136322405 50889
 sys/src/libmach/8obj.c - 664 sys sys 1148106912 2258
 sys/src/libmach/access.c - 664 sys sys 1131289377 4588
 sys/src/libmach/elf.h - 664 sys sys 1131292881 2301
-sys/src/libmach/executable.c - 664 sys sys 1144256627 16172
+sys/src/libmach/executable.c - 664 sys sys 1172172965 16228
 sys/src/libmach/k.c - 664 sys sys 1138471021 3381
 sys/src/libmach/kdb.c - 664 sys sys 1136322404 21222
 sys/src/libmach/kobj.c - 664 sys sys 1148106912 2275
@@ -15280,7 +15280,7 @@ sys/src/libmach/obj.h - 664 sys sys 1148170078 648
 sys/src/libmach/q.c - 664 sys sys 1158071179 3641
 sys/src/libmach/qdb.c - 664 sys sys 1136322404 27544
 sys/src/libmach/qobj.c - 664 sys sys 1148106912 2368
-sys/src/libmach/setmach.c - 664 sys sys 1119476886 2911
+sys/src/libmach/setmach.c - 664 sys sys 1172172965 2911
 sys/src/libmach/swap.c - 664 sys sys 1131289376 1056
 sys/src/libmach/sym.c - 664 sys sys 1138471012 26745
 sys/src/libmach/u.c - 664 sys sys 1138471017 3447

+ 24 - 24
dist/replica/plan9.db

@@ -19,7 +19,7 @@
 386/bin/8l - 775 sys sys 1148500567 115711
 386/bin/9660srv - 775 sys sys 1168402261 104975
 386/bin/aan - 775 sys sys 1168402261 131298
-386/bin/acid - 775 sys sys 1168402262 401157
+386/bin/acid - 775 sys sys 1172203052 401181
 386/bin/acme - 775 sys sys 1168402263 432256
 386/bin/ape - 20000000775 sys sys 1016944144 0
 386/bin/ape/basename - 775 sys sys 1136656314 132873
@@ -118,7 +118,7 @@
 386/bin/aux/mklatinkbd - 775 sys sys 1168402282 64407
 386/bin/aux/mnihongo - 775 sys sys 1168402283 140020
 386/bin/aux/mouse - 775 sys sys 1148500597 44061
-386/bin/aux/ms2 - 775 sys sys 1168402283 87373
+386/bin/aux/ms2 - 775 sys sys 1172203053 87397
 386/bin/aux/msexceltables - 775 sys sys 1168402283 82921
 386/bin/aux/mswordstrings - 775 sys sys 1168402283 65541
 386/bin/aux/na - 775 sys sys 1168402284 154423
@@ -176,7 +176,7 @@
 386/bin/cat - 775 sys sys 1148500611 37482
 386/bin/cb - 775 sys sys 1168402293 77628
 386/bin/cdfs - 775 sys sys 1168402294 167435
-386/bin/cfs - 775 sys sys 1171830300 128247
+386/bin/cfs - 775 sys sys 1172175927 128780
 386/bin/chgrp - 775 sys sys 1168402294 59522
 386/bin/chmod - 775 sys sys 1168402294 62518
 386/bin/cifscmd - 775 sys sys 1169612022 343611
@@ -193,7 +193,7 @@
 386/bin/cpu - 775 sys sys 1168402297 139484
 386/bin/crop - 775 sys sys 1168402298 116374
 386/bin/date - 775 sys sys 1148500618 43311
-386/bin/db - 775 sys sys 1168402299 345979
+386/bin/db - 775 sys sys 1172203054 346003
 386/bin/dc - 775 sys sys 1168402299 99260
 386/bin/dd - 775 sys sys 1159039156 45991
 386/bin/deroff - 775 sys sys 1168402299 74474
@@ -230,7 +230,7 @@
 386/bin/faces - 775 sys sys 1168402306 194616
 386/bin/factor - 775 sys sys 1168402307 61699
 386/bin/fcp - 775 sys sys 1168402307 82433
-386/bin/file - 775 sys sys 1168402307 124983
+386/bin/file - 775 sys sys 1172203054 125007
 386/bin/fmt - 775 sys sys 1168402307 65567
 386/bin/fortune - 775 sys sys 1168402308 67356
 386/bin/fossil - 20000000775 sys sys 1042005470 0
@@ -319,8 +319,8 @@
 386/bin/join - 775 sys sys 1168402330 114382
 386/bin/jpg - 775 sys sys 1168402330 174923
 386/bin/kbmap - 775 sys sys 1168402330 144015
-386/bin/kprof - 775 sys sys 1168402331 105405
-386/bin/ktrace - 775 sys sys 1168402331 123085
+386/bin/kprof - 775 sys sys 1172203054 105429
+386/bin/ktrace - 775 sys sys 1172203054 123109
 386/bin/lens - 775 sys sys 1168402332 151119
 386/bin/lex - 775 sys sys 1168402332 99261
 386/bin/lnfs - 775 sys sys 1168402333 99675
@@ -353,7 +353,7 @@
 386/bin/netstat - 775 sys sys 1169612032 85184
 386/bin/news - 775 sys sys 1168402341 71956
 386/bin/nfs - 775 sys sys 1168402342 321573
-386/bin/nm - 775 sys sys 1168402342 127013
+386/bin/nm - 775 sys sys 1172203055 127037
 386/bin/nntpfs - 775 sys sys 1168402342 166697
 386/bin/ns - 775 sys sys 1168402343 65492
 386/bin/p - 775 sys sys 1168402343 65220
@@ -371,7 +371,7 @@
 386/bin/ppm - 775 sys sys 1168402345 149765
 386/bin/pr - 775 sys sys 1168402345 77717
 386/bin/primes - 775 sys sys 1148500685 38820
-386/bin/prof - 775 sys sys 1168402345 110868
+386/bin/prof - 775 sys sys 1172203055 110892
 386/bin/proof - 775 sys sys 1132506869 178756
 386/bin/ps - 775 sys sys 1168402346 68812
 386/bin/pwd - 775 sys sys 1148500685 36932
@@ -400,7 +400,7 @@
 386/bin/sed - 775 sys sys 1168402348 89763
 386/bin/seq - 775 sys sys 1162241047 38441
 386/bin/sha1sum - 775 sys sys 1168402348 61366
-386/bin/size - 775 sys sys 1168402348 78681
+386/bin/size - 775 sys sys 1172203055 78705
 386/bin/sleep - 775 sys sys 1158088708 3875
 386/bin/snap - 775 sys sys 1136346852 313627
 386/bin/snapfs - 775 sys sys 1134389876 388292
@@ -416,7 +416,7 @@
 386/bin/sshnet - 775 sys sys 1134389877 288327
 386/bin/stats - 775 sys sys 1168402350 190989
 386/bin/strings - 775 sys sys 1168402350 62855
-386/bin/strip - 775 sys sys 1168402350 80670
+386/bin/strip - 775 sys sys 1172203055 80694
 386/bin/sum - 775 sys sys 1148500691 39505
 386/bin/swap - 775 sys sys 1168402350 62373
 386/bin/syscall - 775 sys sys 1130594788 73568
@@ -436,7 +436,7 @@
 386/bin/topng - 775 sys sys 1168402354 138683
 386/bin/toppm - 775 sys sys 1168402354 165616
 386/bin/touch - 775 sys sys 1168402354 64048
-386/bin/tprof - 775 sys sys 1168402355 297738
+386/bin/tprof - 775 sys sys 1172203056 297762
 386/bin/tr - 775 sys sys 1168402355 62088
 386/bin/trace - 775 sys sys 1168402356 181838
 386/bin/troff - 775 sys sys 1134151360 357941
@@ -561,7 +561,7 @@
 386/lib/libhttpd.a - 664 sys sys 1168402367 99458
 386/lib/libip.a - 664 sys sys 1169612032 35672
 386/lib/libl.a - 664 sys sys 1168402367 5372
-386/lib/libmach.a - 664 sys sys 1168402369 785352
+386/lib/libmach.a - 664 sys sys 1172203058 785440
 386/lib/libmemdraw.a - 664 sys sys 1168402369 284092
 386/lib/libmemlayer.a - 664 sys sys 1168402369 47360
 386/lib/libmp.a - 664 sys sys 1170879862 79978
@@ -5764,7 +5764,7 @@ sys/games - 20000000775 sys sys 1117225532 0
 sys/games/lib - 20000000775 sys sys 1165337608 0
 sys/games/lib/4scores - 10000000666 sys sys 1118680448 0
 sys/games/lib/5scores - 10000000666 sys sys 1118680453 0
-sys/games/lib/fortunes - 664 sys sys 1171231680 263238
+sys/games/lib/fortunes - 664 sys sys 1172125060 263335
 sys/games/lib/mahjongg - 20000000775 sys sys 1095792278 0
 sys/games/lib/mahjongg/backgrounds - 20000000775 sys sys 1095792293 0
 sys/games/lib/mahjongg/backgrounds/default.bit - 664 sys sys 1095792293 346803
@@ -9880,21 +9880,21 @@ sys/src/cmd/cdfs/main.c - 664 sys sys 1017679316 11040
 sys/src/cmd/cdfs/mkfile - 664 sys sys 959922196 182
 sys/src/cmd/cdfs/mmc.c - 664 sys sys 1146318348 17198
 sys/src/cmd/cfs - 20000000775 sys sys 1045505024 0
-sys/src/cmd/cfs/bcache.c - 664 sys sys 1014925219 2956
+sys/src/cmd/cfs/bcache.c - 664 sys sys 1172123361 2964
 sys/src/cmd/cfs/bcache.h - 664 sys sys 1014925220 797
-sys/src/cmd/cfs/cformat.h - 664 sys sys 1014925220 1404
-sys/src/cmd/cfs/cfs.c - 664 sys sys 1171785255 16484
-sys/src/cmd/cfs/disk.c - 664 sys sys 1134305455 5949
-sys/src/cmd/cfs/disk.h - 664 sys sys 1014925220 467
-sys/src/cmd/cfs/file.c - 664 sys sys 944960876 5124
+sys/src/cmd/cfs/cformat.h - 664 sys sys 1172125152 1400
+sys/src/cmd/cfs/cfs.c - 664 sys sys 1172123357 16567
+sys/src/cmd/cfs/disk.c - 664 sys sys 1172123358 5900
+sys/src/cmd/cfs/disk.h - 664 sys sys 1172123358 471
+sys/src/cmd/cfs/file.c - 664 sys sys 1172123358 5088
 sys/src/cmd/cfs/file.h - 664 sys sys 944960876 225
-sys/src/cmd/cfs/inode.c - 664 sys sys 1014925220 6967
+sys/src/cmd/cfs/inode.c - 664 sys sys 1172123357 6939
 sys/src/cmd/cfs/inode.h - 664 sys sys 944960876 1145
 sys/src/cmd/cfs/lru.c - 664 sys sys 944960876 1013
 sys/src/cmd/cfs/lru.h - 664 sys sys 944960876 197
 sys/src/cmd/cfs/mkfile - 664 sys sys 1032457443 663
 sys/src/cmd/cfs/notes - 664 sys sys 944960876 570
-sys/src/cmd/cfs/stats.h - 664 sys sys 1014925220 918
+sys/src/cmd/cfs/stats.h - 664 sys sys 1172123357 931
 sys/src/cmd/chgrp.c - 664 sys sys 1014926580 624
 sys/src/cmd/chmod.c - 664 sys sys 1079372923 1904
 sys/src/cmd/cleanname.c - 664 sys sys 944960760 715
@@ -15267,7 +15267,7 @@ sys/src/libmach/8db.c - 664 sys sys 1136322405 50889
 sys/src/libmach/8obj.c - 664 sys sys 1148106912 2258
 sys/src/libmach/access.c - 664 sys sys 1131289377 4588
 sys/src/libmach/elf.h - 664 sys sys 1131292881 2301
-sys/src/libmach/executable.c - 664 sys sys 1144256627 16172
+sys/src/libmach/executable.c - 664 sys sys 1172172965 16228
 sys/src/libmach/k.c - 664 sys sys 1138471021 3381
 sys/src/libmach/kdb.c - 664 sys sys 1136322404 21222
 sys/src/libmach/kobj.c - 664 sys sys 1148106912 2275
@@ -15280,7 +15280,7 @@ sys/src/libmach/obj.h - 664 sys sys 1148170078 648
 sys/src/libmach/q.c - 664 sys sys 1158071179 3641
 sys/src/libmach/qdb.c - 664 sys sys 1136322404 27544
 sys/src/libmach/qobj.c - 664 sys sys 1148106912 2368
-sys/src/libmach/setmach.c - 664 sys sys 1119476886 2911
+sys/src/libmach/setmach.c - 664 sys sys 1172172965 2911
 sys/src/libmach/swap.c - 664 sys sys 1131289376 1056
 sys/src/libmach/sym.c - 664 sys sys 1138471012 26745
 sys/src/libmach/u.c - 664 sys sys 1138471017 3447

+ 25 - 0
dist/replica/plan9.log

@@ -47525,3 +47525,28 @@
 1172005206 1 a sys/man/1/col - 664 sys sys 1172005089 962
 1172005206 2 a sys/src/cmd/col.c - 664 sys sys 1172005084 3850
 1172030406 0 a 386/bin/col - 775 sys sys 1172029864 64995
+1172124006 0 c sys/src/cmd/cfs/bcache.c - 664 sys sys 1172123361 2964
+1172124006 1 c sys/src/cmd/cfs/cformat.h - 664 sys sys 1172123357 1400
+1172124006 2 c sys/src/cmd/cfs/cfs.c - 664 sys sys 1172123357 16567
+1172124006 3 c sys/src/cmd/cfs/disk.c - 664 sys sys 1172123358 5900
+1172124006 4 c sys/src/cmd/cfs/disk.h - 664 sys sys 1172123358 471
+1172124006 5 c sys/src/cmd/cfs/file.c - 664 sys sys 1172123358 5088
+1172124006 6 c sys/src/cmd/cfs/inode.c - 664 sys sys 1172123357 6939
+1172124006 7 c sys/src/cmd/cfs/stats.h - 664 sys sys 1172123357 931
+1172125806 0 c sys/games/lib/fortunes - 664 sys sys 1172125060 263335
+1172125806 1 c sys/src/cmd/cfs/cformat.h - 664 sys sys 1172125152 1400
+1172174407 0 c sys/src/libmach/executable.c - 664 sys sys 1172172965 16228
+1172174407 1 c sys/src/libmach/setmach.c - 664 sys sys 1172172965 2911
+1172176206 0 c 386/bin/cfs - 775 sys sys 1172175927 128780
+1172203206 0 c 386/bin/acid - 775 sys sys 1172203052 401181
+1172203206 1 c 386/bin/db - 775 sys sys 1172203054 346003
+1172203206 2 c 386/bin/file - 775 sys sys 1172203054 125007
+1172203206 3 c 386/bin/kprof - 775 sys sys 1172203054 105429
+1172203206 4 c 386/bin/ktrace - 775 sys sys 1172203054 123109
+1172203206 5 c 386/bin/nm - 775 sys sys 1172203055 127037
+1172203206 6 c 386/bin/prof - 775 sys sys 1172203055 110892
+1172203206 7 c 386/bin/size - 775 sys sys 1172203055 78705
+1172203206 8 c 386/bin/strip - 775 sys sys 1172203055 80694
+1172203206 9 c 386/bin/aux/ms2 - 775 sys sys 1172203053 87397
+1172203206 10 c 386/bin/tprof - 775 sys sys 1172203056 297762
+1172203206 11 c 386/lib/libmach.a - 664 sys sys 1172203058 785440

+ 2 - 0
sys/games/lib/fortunes

@@ -4165,3 +4165,5 @@ I guess the idea is that ... even though the structures are all different. Every
 Can't get device information: Success -- Linux Bluetooth discovery.
 Linux is neither Unix nor Windows — it's the worst of both worlds -- jmk
 Did you ever try to write poetry in a committee meeting? It's like a bunch of fat construction guys trying to write an opera while sitting on the couch watching Baywatch. The more fat construction guys you add to the couch, the less likely you are to get opera out of it.  - Joel Spolsky
+Don't interrupt!  Let me finish! - Rae McLellan
+bool x = "false";  // valid C++ [sets x to true]

+ 7 - 10
sys/src/cmd/cfs/bcache.c

@@ -46,10 +46,9 @@ bcfind(Bcache *bc, ulong bno)
 	/*
 	 *  if we already have a buffer for this bno, use it
 	 */
-	for(b = bc->bb; b < &bc->bb[Nbcache]; b++){
+	for(b = bc->bb; b < &bc->bb[Nbcache]; b++)
 		if(b->inuse && b->bno==bno)
 			goto out;
-	}
 
 	/*
 	 *  get least recently used block
@@ -59,10 +58,9 @@ out:
 	/*
 	 *  if dirty, write it out
 	 */
-	if(b->dirty){
+	if(b->dirty)
 		if(bcwrite(bc, b) < 0)
 			warning("writing dirty page");
-	}
 	lruref(bc, b);
 	return b;
 }
@@ -94,7 +92,7 @@ bcread(Bcache *bc, ulong bno)
 
 	b = bcfind(bc, bno);
 	bno &= ~Indbno;
-	if(b->bno!=bno || !b->inuse){
+	if(b->bno!=bno || !b->inuse)
 		/*
 		 *  read in the one we really want
 		 */
@@ -102,7 +100,6 @@ bcread(Bcache *bc, ulong bno)
 			b->inuse = 0;
 			return 0;
 		}
-	}
 	b->bno = bno;
 	b->inuse = 1;
 	return b;
@@ -132,7 +129,7 @@ bcmark(Bcache *bc, Bbuf *b)
 }
 
 /*
- *  write out a page (and all preceeding dirty ones)
+ *  write out a page (and all preceding dirty ones)
  */
 int
 bcwrite(Bcache *bc, Bbuf *b)
@@ -140,7 +137,7 @@ bcwrite(Bcache *bc, Bbuf *b)
 	Bbuf *nb;
 
 	/*
-	 *  write out all preceeding pages
+	 *  write out all preceding pages
 	 */
 	while(nb = bc->dfirst){
 		if(bwrite(bc, nb->bno, nb->data) < 0)
@@ -179,7 +176,7 @@ bcsync(Bcache *bc)
 int
 bread(Bcache *bc, ulong bno, void *buf)
 {
-	ulong x = bno*bc->bsize;
+	uvlong x = (uvlong)bno * bc->bsize;
 
 	if(pread(bc->f, buf, bc->bsize, x) != bc->bsize)
 		return -1;
@@ -192,7 +189,7 @@ bread(Bcache *bc, ulong bno, void *buf)
 int
 bwrite(Bcache *bc, ulong bno, void *buf)
 {
-	ulong x = bno*bc->bsize;
+	uvlong x = (uvlong)bno * bc->bsize;
 
 	if(pwrite(bc->f, buf, bc->bsize, x) != bc->bsize)
 		return -1;

+ 5 - 5
sys/src/cmd/cfs/cformat.h

@@ -12,8 +12,8 @@ typedef struct Dinode	Dinode;
 
 enum
 {
-	Amagic= 		0xbebedded,	/* allocation block magic */
-	Imagic=		0xbadc0c0a,	/* inode block magic */
+	Amagic= 	0xbebeefed,	/* allocation block magic */
+	Imagic=		0xbadc00ce,	/* inode block magic */
 	BtoUL=		8*sizeof(ulong),/* bits in a ulong */
 	KNAMELEN=	28	/* old NAMELEN: BUG */
 };
@@ -54,10 +54,10 @@ struct Dptr
  */
 struct Inode
 {
-	Qid		qid;
+	Qid	qid;
 	vlong	length;
-	Dptr		ptr;		/* pointer page */	
-	char		inuse;
+	Dptr	ptr;		/* pointer page */	
+	char	inuse;
 };
 
 /*

+ 90 - 67
sys/src/cmd/cfs/cfs.c

@@ -457,15 +457,15 @@ rremove(Mfile *mf)
 void
 rread(Mfile *mf)
 {
-	int cnt;
-	long off, first;
-	char *cp;
-	Ibuf *b;
+	int cnt, done;
 	long n;
+	vlong off, first;
+	char *cp;
 	char data[MAXFDATA];
-	int done;
+	Ibuf *b;
 
-	first = off = c.thdr.offset;
+	off = c.thdr.offset;
+	first = off;
 	cnt = c.thdr.count;
 
 	if(statson && ctltest(mf)){
@@ -511,7 +511,8 @@ rread(Mfile *mf)
 	done = 0;
 	while(cnt>0 && !done){
 		if(off >= b->inode.length){
-			DPRINT(2, "offset %ld greater than length %lld\n", off, b->inode.length);
+			DPRINT(2, "offset %lld greater than length %lld\n",
+				off, b->inode.length);
 			break;
 		}
 		n = fread(&ic, b, cp, off, cnt);
@@ -519,15 +520,16 @@ rread(Mfile *mf)
 			n = -n;
 			if(n==0 || n>cnt)
 				n = cnt;
-			DPRINT(2, "fetch %ld bytes of data from server at offset %ld\n", n, off);
+			DPRINT(2,
+			 "fetch %ld bytes of data from server at offset %lld\n",
+				n, off);
 			s.thdr.type = c.thdr.type;
 			s.thdr.fid = c.thdr.fid;
 			s.thdr.tag = c.thdr.tag;
 			s.thdr.offset = off;
 			s.thdr.count = n;
-			if(statson){
+			if(statson)
 				cfsstat.ndelegateread++;
-			}
 			if(askserver() < 0){
 				sendreply(s.rhdr.ename);
 				return;
@@ -538,8 +540,9 @@ rread(Mfile *mf)
 			if(n == 0){
 				/* end of file */
 				if(b->inode.length > off){
-					DPRINT(2, "file %llud.%ld, length %ld\n",
-						b->inode.qid.path, b->inode.qid.vers, off);
+					DPRINT(2, "file %llud.%ld, length %lld\n",
+						b->inode.qid.path,
+						b->inode.qid.vers, off);
 					b->inode.length = off;
 				}
 				break;
@@ -552,9 +555,8 @@ rread(Mfile *mf)
 			}
 		}else{
 			DPRINT(2, "fetched %ld bytes from cache\n", n);
-			if(statson){
+			if(statson)
 				cfsstat.bytesfromcache += n;
-			}
 		}
 		cnt -= n;
 		off += n;
@@ -562,9 +564,8 @@ rread(Mfile *mf)
 	}
 	c.rhdr.data = data;
 	c.rhdr.count = off - first;
-	if(statson){
+	if(statson)
 		cfsstat.bytesread += c.rhdr.count;
-	}
 	sendreply(0);
 }
 
@@ -591,7 +592,8 @@ rwrite(Mfile *mf)
 
 	if(s.rhdr.count > 0)
 		cfsstat.byteswritten += s.rhdr.count;
-	if(mf->qid.type & QTAPPEND)	/* don't modify our cache for append-only data; always read from server*/
+	/* don't modify our cache for append-only data; always read from server*/
+	if(mf->qid.type & QTAPPEND)
 		return;
 	b = iget(&ic, mf->qid);
 	if(b == 0)
@@ -625,7 +627,8 @@ rstat(Mfile *mf)
 		d.muid = "none";
 		d.atime = time(nil);
 		d.mtime = d.atime;
-		c.rhdr.nstat = convD2M(&d, c.rhdr.stat, sizeof(c.rhdr) - (c.rhdr.stat - (uchar*)&c.rhdr));
+		c.rhdr.nstat = convD2M(&d, c.rhdr.stat,
+			sizeof c.rhdr - (c.rhdr.stat - (uchar*)&c.rhdr));
 		sendreply(0);
 		return;
 	}
@@ -655,7 +658,8 @@ rwstat(Mfile *mf)
 }
 
 void
-error(char *fmt, ...) {
+error(char *fmt, ...)
+{
 	va_list arg;
 	static char buf[2048];
 
@@ -708,9 +712,8 @@ delegate(void)
 	sendmsg(&s, &c.thdr);
 	rcvmsg(&s, &s.rhdr);
 
-	if(statson){
+	if(statson)
 		cfsstat.sm[type].t += nsec() - cfsstat.sm[type].s;
-	}
 
 	sendmsg(&c, &s.rhdr);
 	return c.thdr.type+1 == s.rhdr.type ? 0 : -1;
@@ -735,9 +738,8 @@ askserver(void)
 	sendmsg(&s, &s.thdr);
 	rcvmsg(&s, &s.rhdr);
 
-	if(statson){
+	if(statson)
 		cfsstat.sm[type].t += nsec() - cfsstat.sm[type].s;
-	}
 
 	return s.thdr.type+1 == s.rhdr.type ? 0 : -1;
 }
@@ -761,10 +763,8 @@ void
 dump(uchar *p, int len)
 {
 	fprint(2, "%d bytes", len);
-	while(len > 0){
+	while(len-- > 0)
 		fprint(2, " %.2ux", *p++);
-		len--;
-	}
 	fprint(2, "\n");
 }
 
@@ -777,16 +777,17 @@ rcvmsg(P9fs *p, Fcall *f)
 	olen = p->len;
 	p->len = read9pmsg(p->fd[0], datarcv, sizeof(datarcv));
 	if(p->len <= 0){
-		sprint(buf, "read9pmsg(%d)->%ld: %r", p->fd[0], p->len);
+		snprint(buf, sizeof buf, "read9pmsg(%d)->%ld: %r",
+			p->fd[0], p->len);
 		error(buf);
 	}
 
 	if((rlen = convM2S(datarcv, p->len, f)) != p->len)
-		error("rcvmsg format error, expected length %d, got %d", rlen, p->len);
+		error("rcvmsg format error, expected length %d, got %d",
+			rlen, p->len);
 	if(f->fid >= Nfid){
 		fprint(2, "<-%s: %d %s on %d\n", p->name, f->type,
-			mname[f->type]? mname[f->type] : "mystery",
-			f->fid);
+			mname[f->type]? mname[f->type]: "mystery", f->fid);
 		dump((uchar*)datasnd, olen);
 		dump((uchar*)datarcv, p->len);
 		error("rcvmsg fid out of range");
@@ -797,7 +798,8 @@ rcvmsg(P9fs *p, Fcall *f)
 int
 ctltest(Mfile *mf)
 {
-	return mf->busy && mf->qid.type == ctlqid.type && mf->qid.path == ctlqid.path;
+	return mf->busy && mf->qid.type == ctlqid.type &&
+		mf->qid.path == ctlqid.path;
 }
 
 void
@@ -808,59 +810,80 @@ genstats(void)
 
 	p = statbuf;
 
-	p += snprint(p, sizeof(statbuf)+statbuf-p, "        Client                          Server\n");
-	p += snprint(p, sizeof(statbuf)+statbuf-p, "   #calls     Δ  ms/call    Δ      #calls     Δ  ms/call    Δ\n");
+	p += snprint(p, sizeof statbuf+statbuf-p,
+		"        Client                          Server\n");
+	p += snprint(p, sizeof statbuf+statbuf-p,
+	    "   #calls     Δ  ms/call    Δ      #calls     Δ  ms/call    Δ\n");
 	for (i = 0; i < nelem(cfsstat.cm); i++)
 		if(cfsstat.cm[i].n || cfsstat.sm[i].n) {
-			p += snprint(p, sizeof(statbuf)+statbuf-p, "%7lud %7lud ",
-				cfsstat.cm[i].n, cfsstat.cm[i].n - cfsprev.cm[i].n);
+			p += snprint(p, sizeof statbuf+statbuf-p,
+				"%7lud %7lud ", cfsstat.cm[i].n,
+				cfsstat.cm[i].n - cfsprev.cm[i].n);
 			if (cfsstat.cm[i].n)
-				p += snprint(p, sizeof(statbuf)+statbuf-p, "%7.3f ",
-					0.000001*cfsstat.cm[i].t/cfsstat.cm[i].n);
+				p += snprint(p, sizeof statbuf+statbuf-p,
+					"%7.3f ", 0.000001*cfsstat.cm[i].t/
+					cfsstat.cm[i].n);
 			else
-				p += snprint(p, sizeof(statbuf)+statbuf-p, "        ");
+				p += snprint(p, sizeof statbuf+statbuf-p,
+					"        ");
 			if(cfsstat.cm[i].n - cfsprev.cm[i].n)
-				p += snprint(p, sizeof(statbuf)+statbuf-p, "%7.3f ",
-					0.000001*(cfsstat.cm[i].t - cfsprev.cm[i].t)/(cfsstat.cm[i].n - cfsprev.cm[i].n));
+				p += snprint(p, sizeof statbuf+statbuf-p,
+					"%7.3f ", 0.000001*
+					(cfsstat.cm[i].t - cfsprev.cm[i].t)/
+					(cfsstat.cm[i].n - cfsprev.cm[i].n));
 			else
-				p += snprint(p, sizeof(statbuf)+statbuf-p, "        ");
-			p += snprint(p, sizeof(statbuf)+statbuf-p, "%7lud %7lud ",
-				cfsstat.sm[i].n, cfsstat.sm[i].n - cfsprev.sm[i].n);
+				p += snprint(p, sizeof statbuf+statbuf-p,
+					"        ");
+			p += snprint(p, sizeof statbuf+statbuf-p,
+				"%7lud %7lud ", cfsstat.sm[i].n,
+				cfsstat.sm[i].n - cfsprev.sm[i].n);
 			if (cfsstat.sm[i].n)
-				p += snprint(p, sizeof(statbuf)+statbuf-p, "%7.3f ",
-					0.000001*cfsstat.sm[i].t/cfsstat.sm[i].n);
+				p += snprint(p, sizeof statbuf+statbuf-p,
+					"%7.3f ", 0.000001*cfsstat.sm[i].t/
+					cfsstat.sm[i].n);
 			else
-				p += snprint(p, sizeof(statbuf)+statbuf-p, "        ");
+				p += snprint(p, sizeof statbuf+statbuf-p,
+					"        ");
 			if(cfsstat.sm[i].n - cfsprev.sm[i].n)
-				p += snprint(p, sizeof(statbuf)+statbuf-p, "%7.3f ",
-					0.000001*(cfsstat.sm[i].t - cfsprev.sm[i].t)/(cfsstat.sm[i].n - cfsprev.sm[i].n));
+				p += snprint(p, sizeof statbuf+statbuf-p,
+					"%7.3f ", 0.000001*
+					(cfsstat.sm[i].t - cfsprev.sm[i].t)/
+					(cfsstat.sm[i].n - cfsprev.sm[i].n));
 			else
-				p += snprint(p, sizeof(statbuf)+statbuf-p, "        ");
-			p += snprint(p, sizeof(statbuf)+statbuf-p, "%s\n", mname[i]);
+				p += snprint(p, sizeof statbuf+statbuf-p,
+					"        ");
+			p += snprint(p, sizeof statbuf+statbuf-p, "%s\n",
+				mname[i]);
 		}
-	p += snprint(p, sizeof(statbuf)+statbuf-p, "%7lud %7lud ndirread\n",
+	p += snprint(p, sizeof statbuf+statbuf-p, "%7lud %7lud ndirread\n",
 		cfsstat.ndirread, cfsstat.ndirread - cfsprev.ndirread);
-	p += snprint(p, sizeof(statbuf)+statbuf-p, "%7lud %7lud ndelegateread\n",
-		cfsstat.ndelegateread, cfsstat.ndelegateread - cfsprev.ndelegateread);
-	p += snprint(p, sizeof(statbuf)+statbuf-p, "%7lud %7lud ninsert\n",
+	p += snprint(p, sizeof statbuf+statbuf-p, "%7lud %7lud ndelegateread\n",
+		cfsstat.ndelegateread, cfsstat.ndelegateread -
+		cfsprev.ndelegateread);
+	p += snprint(p, sizeof statbuf+statbuf-p, "%7lud %7lud ninsert\n",
 		cfsstat.ninsert, cfsstat.ninsert - cfsprev.ninsert);
-	p += snprint(p, sizeof(statbuf)+statbuf-p, "%7lud %7lud ndelete\n",
+	p += snprint(p, sizeof statbuf+statbuf-p, "%7lud %7lud ndelete\n",
 		cfsstat.ndelete, cfsstat.ndelete - cfsprev.ndelete);
-	p += snprint(p, sizeof(statbuf)+statbuf-p, "%7lud %7lud nupdate\n",
+	p += snprint(p, sizeof statbuf+statbuf-p, "%7lud %7lud nupdate\n",
 		cfsstat.nupdate, cfsstat.nupdate - cfsprev.nupdate);
 
-	p += snprint(p, sizeof(statbuf)+statbuf-p, "%7lud %7lud bytesread\n",
+	p += snprint(p, sizeof statbuf+statbuf-p, "%7llud %7llud bytesread\n",
 		cfsstat.bytesread, cfsstat.bytesread - cfsprev.bytesread);
-	p += snprint(p, sizeof(statbuf)+statbuf-p, "%7lud %7lud byteswritten\n",
-		cfsstat.byteswritten, cfsstat.byteswritten - cfsprev.byteswritten);
-	p += snprint(p, sizeof(statbuf)+statbuf-p, "%7lud %7lud bytesfromserver\n",
-		cfsstat.bytesfromserver, cfsstat.bytesfromserver - cfsprev.bytesfromserver);
-	p += snprint(p, sizeof(statbuf)+statbuf-p, "%7lud %7lud bytesfromdirs\n",
-		cfsstat.bytesfromdirs, cfsstat.bytesfromdirs - cfsprev.bytesfromdirs);
-	p += snprint(p, sizeof(statbuf)+statbuf-p, "%7lud %7lud bytesfromcache\n",
-		cfsstat.bytesfromcache, cfsstat.bytesfromcache - cfsprev.bytesfromcache);
-	p += snprint(p, sizeof(statbuf)+statbuf-p, "%7lud %7lud bytestocache\n",
-		cfsstat.bytestocache, cfsstat.bytestocache - cfsprev.bytestocache);
+	p += snprint(p, sizeof statbuf+statbuf-p, "%7llud %7llud byteswritten\n",
+		cfsstat.byteswritten, cfsstat.byteswritten -
+		cfsprev.byteswritten);
+	p += snprint(p, sizeof statbuf+statbuf-p, "%7llud %7llud bytesfromserver\n",
+		cfsstat.bytesfromserver, cfsstat.bytesfromserver -
+		cfsprev.bytesfromserver);
+	p += snprint(p, sizeof statbuf+statbuf-p, "%7llud %7llud bytesfromdirs\n",
+		cfsstat.bytesfromdirs, cfsstat.bytesfromdirs -
+		cfsprev.bytesfromdirs);
+	p += snprint(p, sizeof statbuf+statbuf-p, "%7llud %7llud bytesfromcache\n",
+		cfsstat.bytesfromcache, cfsstat.bytesfromcache -
+		cfsprev.bytesfromcache);
+	p += snprint(p, sizeof statbuf+statbuf-p, "%7llud %7llud bytestocache\n",
+		cfsstat.bytestocache, cfsstat.bytestocache -
+		cfsprev.bytestocache);
 	statlen = p - statbuf;
 	cfsprev = cfsstat;
 }

+ 16 - 25
sys/src/cmd/cfs/disk.c

@@ -14,12 +14,12 @@ int	icformat(Disk*, ulong);
 int
 dinit(Disk *d, int f, int psize)
 {
-	Dir	*dir;
-	char	buf[1024];
-	Dalloc	*ba;
-	uvlong	length;
 	ulong	i;
+	uvlong	length;
+	char	buf[1024];
 	Bbuf	*b;
+	Dalloc	*ba;
+	Dir	*dir;
 
 	/*
 	 *  get disk size
@@ -33,8 +33,8 @@ dinit(Disk *d, int f, int psize)
 	free(dir);
 
 	/*
-	 *  read first physical block to get logical block size, number of inodes,
-	 *  and number of allocation blocks
+	 *  read first physical block to get logical block size, # of inodes,
+	 *  and # of allocation blocks
 	 */
 	if(seek(f, 0, 0) < 0){
 		perror("dinit: seek");
@@ -91,9 +91,7 @@ dinit(Disk *d, int f, int psize)
 			fprint(2, "dinit: bad name in alloc block %uld\n", i);
 			return -1;
 		}
-
 	}
-
 	return 0;
 }
 
@@ -104,10 +102,10 @@ int
 dformat(Disk *d, int f, char *name, ulong bsize, ulong psize)
 {
 	int	i;
-	Dir	*dir;
 	uvlong	length;
 	Bbuf	*b;
 	Dalloc	*ba;
+	Dir	*dir;
 	Dptr	dptr;
 
 	fprint(2, "formatting disk\n");
@@ -169,12 +167,11 @@ dformat(Disk *d, int f, char *name, ulong bsize, ulong psize)
 static ulong
 _balloc(Dalloc *ba, ulong max)
 {
-	ulong *p;
-	ulong *e;
+	int len;	/* number of valid words */
 	ulong i;	/* bit position in long */
 	ulong m;	/* 1<<i */
 	ulong v;	/* old value of long */
-	int len;	/* number of valid words */
+	ulong *p, *e;
 
 	/*
 	 *  find a word with a 0 bit
@@ -190,7 +187,7 @@ _balloc(Dalloc *ba, ulong max)
 	 *  find the first 0 bit
 	 */
 	v = *p;
-	for(m = 1, i = 0; i<BtoUL; i++, m<<=1)
+	for(m = 1, i = 0; i < BtoUL; i++, m <<= 1)
 		if((m|v) != v)
 			break;
 
@@ -216,11 +213,9 @@ _balloc(Dalloc *ba, ulong max)
 ulong
 dalloc(Disk *d, Dptr *p)
 {
-	ulong	bno;
+	ulong	bno, max, rv;
 	Bbuf	*b;
 	Dalloc	*ba;
-	ulong	rv;
-	ulong	max;
 
 	max = d->nb;
 	for(bno = 0; bno < d->nab; bno++){
@@ -250,8 +245,7 @@ ulong
 dpalloc(Disk *d, Dptr *p)
 {
 	Bbuf *b;
-	Dptr *sp;
-	Dptr *ep;
+	Dptr *sp, *ep;
 
 	if(dalloc(d, p) == Notabno)
 		return Notabno;
@@ -285,11 +279,10 @@ dpalloc(Disk *d, Dptr *p)
 int
 _bfree(Disk *d, ulong i)
 {
+	ulong bno, m;
 	ulong *p;
-	ulong m;
 	Bbuf *b;
 	Dalloc *ba;
-	ulong bno;
 
 	/*
 	 *  get correct allocation block
@@ -320,10 +313,9 @@ _bfree(Disk *d, ulong i)
 int
 dfree(Disk *d, Dptr *dp)
 {
-	Dptr *sp;
-	Dptr *ep;
-	Bbuf *b;
 	ulong bno;
+	Dptr *sp, *ep;
+	Bbuf *b;
 
 	bno = dp->bno;
 	dp->bno = Notabno;
@@ -349,7 +341,7 @@ dfree(Disk *d, Dptr *dp)
 	/*
 	 *  then all the pages it points to
 	 *
-	 *	DANGER: this algorithm may fail is their are more
+	 *	DANGER: this algorithm may fail if there are more
 	 *		allocation blocks than block buffers
 	 */
 	b = bcread(d, bno);
@@ -359,6 +351,5 @@ dfree(Disk *d, Dptr *dp)
 	for(ep = sp + d->p2b; sp < ep; sp++)
 		if(dfree(d, sp) < 0)
 			return -1;
-
 	return 0;
 }

+ 2 - 2
sys/src/cmd/cfs/disk.h

@@ -6,8 +6,8 @@ typedef struct Disk	Disk;
 struct Disk
 {
 	Bcache;
-	int	nb;	/* number of blocks */
-	int	nab;	/* number of allocation blocks */
+	ulong	nb;	/* number of blocks */
+	ulong	nab;	/* number of allocation blocks */
 	int	b2b;	/* allocation bits to a block */
 	int	p2b;	/* Dptr's per page */
 	char	name[KNAMELEN];

+ 11 - 18
sys/src/cmd/cfs/file.c

@@ -51,12 +51,12 @@ fmerge(Dptr *p, char *to, char *from, int start, int len)
 int
 fbwrite(Icache *ic, Ibuf *b, char *a, ulong off, int len)
 {
+	int wrinode;
+	ulong fbno;
 	Bbuf *dbb;	/* data block */
 	Bbuf *ibb;	/* indirect block */
 	Dptr *p;
 	Dptr t;
-	ulong fbno;
-	int wrinode;
 
 	fbno = off / ic->bsize;
 	p = &b->inode.ptr;
@@ -144,13 +144,11 @@ dowrite:
 	 *  correct order
 	 */
 	bcmark(ic, dbb);
-	if(ibb){
+	if(ibb)
 		bcmark(ic, ibb);
-	}
-	if(wrinode){
+	if(wrinode)
 		if(iwrite(ic, b) < 0)
 			return -1;
-	}
 	return len;
 }
 
@@ -181,12 +179,10 @@ fwrite(Icache *ic, Ibuf *b, char *a, ulong off, long n)
 Dptr *
 fpget(Icache *ic, Ibuf *b, ulong off)
 {
-	Bbuf *ibb;	/* indirect block */
 	ulong fbno;
 	long doff;
-	Dptr *p;
-	Dptr *p0;
-	Dptr *pf;
+	Bbuf *ibb;	/* indirect block */
+	Dptr *p, *p0, *pf;
 
 	fbno = off / ic->bsize;
 	p = &b->inode.ptr;
@@ -232,12 +228,12 @@ fpget(Icache *ic, Ibuf *b, ulong off)
 		if(doff<pf->end)
 			return pf;
 	}
-	for(p = pf+1 ;p < p0 + ic->p2b; p++){
+	for(p = pf+1; p < p0 + ic->p2b; p++){
 		fbno++;
 		if(p->fbno==fbno && p->bno!=Notabno && p->start<p->end)
 			return p;
 	}
-	for(p = p0 ;p < pf; p++){
+	for(p = p0; p < pf; p++){
 		fbno++;
 		if(p->fbno==fbno && p->bno!=Notabno && p->start<p->end)
 			return p;
@@ -259,12 +255,10 @@ fpget(Icache *ic, Ibuf *b, ulong off)
 long
 fread(Icache *ic, Ibuf *b, char *a, ulong off, long n)
 {
-	int len;
+	int len, start;
+	long sofar, gap;
 	Dptr *p;
 	Bbuf *bb;
-	long sofar;
-	long gap;
-	int start;
 
 	for(sofar = 0; sofar < n; sofar += len, off += len){
 		/*
@@ -283,12 +277,11 @@ fread(Icache *ic, Ibuf *b, char *a, ulong off, long n)
 		 *  if there's a gap, return the size of the gap
 		 */
 		gap = (ic->bsize*p->fbno + p->start) - off;
-		if(gap>0){
+		if(gap>0)
 			if(sofar == 0)
 				return -gap;
 			else
 				return sofar;
-		}
 
 		/*
 		 *  return what we have

+ 10 - 15
sys/src/cmd/cfs/inode.c

@@ -105,12 +105,10 @@ iinit(Icache *ic, int f, int psize)
 int
 iformat(Icache *ic, int f, ulong nino, char *name, int bsize, int psize)
 {
+	int nib;
+	ulong bno, i2b, i;
 	Bbuf *bb;
 	Dinode *bi;
-	ulong bno;
-	ulong i;
-	ulong i2b;
-	int nib;
 
 	/*
 	 *  first format disk allocation
@@ -190,7 +188,7 @@ iget(Icache *ic, Qid qid)
 	/*
 	 *  find map entry with same qid.path
 	 */
-	for(m = ic->map, me = &ic->map[ic->nino]; m < me; m++){
+	for(m = ic->map, me = &ic->map[ic->nino]; m < me; m++)
 		if(m->inuse && m->qid.path==qid.path){
 			if(m->qid.vers != qid.vers){
 				/*
@@ -203,7 +201,6 @@ iget(Icache *ic, Qid qid)
 			}
 			break;
 		}
-	}
 
 	/*
  	 *  if an already existing inode, just get it
@@ -217,19 +214,19 @@ iget(Icache *ic, Qid qid)
 	 */
 	m = (Imap*)ic->mlru.lnext;
 	if(m->inuse){
-		DPRINT(2, "superceding file %llud.%ld by %llud.%ld\n", m->qid.path,
-			m->qid.vers, qid.path, qid.vers);
+		DPRINT(2, "superceding file %llud.%ld by %llud.%ld\n",
+			m->qid.path, m->qid.vers, qid.path, qid.vers);
 		if(iremove(ic, m - ic->map) < 0)
 			return 0;
 	}
 
-	if(statson){
+	if(statson)
 		cfsstat.ninsert++;
-	}
 	/*
 	 *  init inode and write to disk
 	 */
-	DPRINT(2, "new file %llud.%ld ino %ld\n", qid.path, qid.vers, m - ic->map);
+	DPRINT(2, "new file %llud.%ld ino %ld\n",
+		qid.path, qid.vers, m - ic->map);
 	b = ialloc(ic, m - ic->map);
 	b->inode.inuse = m->inuse = 1;
 	b->inode.qid = qid;
@@ -327,9 +324,8 @@ iupdate(Icache *ic, ulong ino, Qid qid)
 	Imap *m;
 	Dptr d;
 
-	if(statson){
+	if(statson)
 		cfsstat.nupdate++;
-	}
 	b = iread(ic, ino);
 	if(b == 0)
 		return -1;
@@ -365,9 +361,8 @@ iremove(Icache *ic, ulong ino)
 	Ibuf *b;
 	Imap *m;
 
-	if(statson){
+	if(statson)
 		cfsstat.ndelete++;
-	}
 	m = &ic->map[ino];
 
 	/*

+ 10 - 10
sys/src/cmd/cfs/stats.h

@@ -5,22 +5,22 @@ struct Cfsmsg {
 };
 
 struct Cfsstat {
-	struct Cfsmsg cm[128];	/* client messages */
-	struct Cfsmsg sm[128];	/* server messages */
+	struct Cfsmsg cm[128];		/* client messages */
+	struct Cfsmsg sm[128];		/* server messages */
 
 	ulong ndirread;			/* # of directory read ops */
-	ulong ndelegateread;	/* # of read ops delegated */
+	ulong ndelegateread;		/* # of read ops delegated */
 	ulong ninsert;			/* # of cache insert ops */
 	ulong ndelete;			/* # of cache delete ops */
 	ulong nupdate;			/* # of cache update ops */
 
-	ulong bytesread;		/* # of bytes read by client */
-	ulong byteswritten;		/* # of bytes written by client */
-	ulong bytesfromserver;	/* # of bytes read from server */
-	ulong bytesfromdirs;	/* # of directory bytes read from server */
-	ulong bytesfromcache;	/* # of bytes read from cache */
-	ulong bytestocache;		/* # of bytes written to cache */
+	uvlong bytesread;		/* # of bytes read by client */
+	uvlong byteswritten;		/* # of bytes written by client */
+	uvlong bytesfromserver;		/* # of bytes read from server */
+	uvlong bytesfromdirs;		/* # of directory bytes read from server */
+	uvlong bytesfromcache;		/* # of bytes read from cache */
+	uvlong bytestocache;		/* # of bytes written to cache */
 };
 
 extern struct Cfsstat cfsstat, cfsprev;
-extern int statson;
+extern int statson;

+ 4 - 3
sys/src/libmach/executable.c

@@ -205,7 +205,7 @@ ExecTable exectab[] =
 		sizeof(Ehdr),
 		nil,
 		elfdotout },
-	{ E_MAGIC,			/* Arm 5.out */
+	{ E_MAGIC,			/* Arm 5.out and boot image */
 		"arm plan 9 executable",
 		"arm plan 9 dlm",
 		FARM,
@@ -378,9 +378,10 @@ commonboot(Fhdr *fp)
 		fp->dataddr = _round(fp->txtaddr+fp->txtsz, mach->pgsize);
 		break;
 	case FARM:
-		fp->txtaddr = mach->kbase+0x8010;
+		fp->type = FARMB;
+		fp->txtaddr = (u32int)fp->entry;
 		fp->name = "ARM plan 9 boot image";
-		fp->dataddr = fp->txtaddr+fp->txtsz;
+		fp->dataddr = _round(fp->txtaddr+fp->txtsz, mach->pgsize);
 		return;
 	case FALPHA:
 		fp->type = FALPHAB;

+ 1 - 1
sys/src/libmach/setmach.c

@@ -96,7 +96,7 @@ Machtab	machines[] =
 		&i386mach,	},
 	{	"arm",				/*ARM*/
 		FARM,
-		FNONE,
+		FARMB,
 		AARM,
 		&marm,
 		&armmach,	},