Plan 9 from Bell Labs 2006-01-08

dist/replica/_plan9.db

@@ -22,22 +22,22 @@
 386/bin/acid - 775 sys sys 1136346850 400912
 386/bin/acme - 775 sys sys 1136087521 429186
 386/bin/ape - 20000000775 sys sys 1016944144 0
-386/bin/ape/basename - 775 sys sys 1134151323 132870
+386/bin/ape/basename - 775 sys sys 1136656314 132873
 386/bin/ape/cc - 775 sys sys 1135570769 70399
-386/bin/ape/diff - 775 sys sys 1134151324 349765
-386/bin/ape/diff3 - 775 sys sys 1134151324 188253
-386/bin/ape/dirname - 775 sys sys 1134151325 132649
-386/bin/ape/expr - 775 sys sys 1134151325 142291
-386/bin/ape/kill - 775 sys sys 1134151325 138220
-386/bin/ape/make - 775 sys sys 1134151326 209112
-386/bin/ape/patch - 775 sys sys 1134151326 302556
+386/bin/ape/diff - 775 sys sys 1136656316 349768
+386/bin/ape/diff3 - 775 sys sys 1136656317 188256
+386/bin/ape/dirname - 775 sys sys 1136656318 132652
+386/bin/ape/expr - 775 sys sys 1136656319 142294
+386/bin/ape/kill - 775 sys sys 1136656321 138223
+386/bin/ape/make - 775 sys sys 1136656322 209115
+386/bin/ape/patch - 775 sys sys 1136656324 302559
 386/bin/ape/psh - 775 sys sys 1042220689 34
-386/bin/ape/sed - 775 sys sys 1134151327 158322
-386/bin/ape/sh - 775 sys sys 1134151328 477234
+386/bin/ape/sed - 775 sys sys 1136656324 158325
+386/bin/ape/sh - 775 sys sys 1136656327 477237
 386/bin/ape/stty - 775 sys sys 1130384232 41057
 386/bin/ape/tar - 775 sys sys 1135570769 61941
-386/bin/ape/uname - 775 sys sys 1134151328 132699
-386/bin/aquarela - 775 sys sys 1135914849 331831
+386/bin/ape/uname - 775 sys sys 1136656327 132702
+386/bin/aquarela - 775 sys sys 1136656329 331912
 386/bin/ar - 775 sys sys 1135570769 111942
 386/bin/archfs - 775 sys sys 1135570769 146849
 386/bin/ascii - 775 sys sys 1135570770 64641
@@ -109,8 +109,8 @@
 386/bin/aux/lines - 775 sys sys 1135570784 60473
 386/bin/aux/listen - 775 sys sys 1135570785 108006
 386/bin/aux/listen1 - 775 sys sys 1135570785 94483
-386/bin/aux/lpdaemon - 775 sys sys 1134151329 168283
-386/bin/aux/lpdsend - 775 sys sys 1134151329 155121
+386/bin/aux/lpdaemon - 775 sys sys 1136656330 168286
+386/bin/aux/lpdsend - 775 sys sys 1136656330 155124
 386/bin/aux/lpsend - 775 sys sys 1130384251 52558
 386/bin/aux/mapd - 775 sys sys 1135570785 190784
 386/bin/aux/mkflashfs - 775 sys sys 1135570785 67345
@@ -155,7 +155,7 @@
 386/bin/aux/write - 775 sys sys 1085077011 4188
 386/bin/aux/zerotrunc - 775 sys sys 1108268388 3891
 386/bin/awd - 775 sys sys 1135570793 58734
-386/bin/awk - 775 sys sys 1134237845 321783
+386/bin/awk - 775 sys sys 1136656332 321786
 386/bin/basename - 775 sys sys 1130384262 37902
 386/bin/bc - 775 sys sys 1135570793 81760
 386/bin/bind - 775 sys sys 1135570793 59562
@@ -177,7 +177,7 @@
 386/bin/cfs - 775 sys sys 1135570797 128025
 386/bin/chgrp - 775 sys sys 1135570798 59279
 386/bin/chmod - 775 sys sys 1135570798 62275
-386/bin/cifscmd - 775 sys sys 1135914850 342709
+386/bin/cifscmd - 775 sys sys 1136656333 342747
 386/bin/cleanname - 775 sys sys 1135570798 58298
 386/bin/clock - 775 sys sys 1135570798 158281
 386/bin/cmp - 775 sys sys 1130384270 40583
@@ -219,13 +219,13 @@
 386/bin/du - 775 sys sys 1135570806 73708
 386/bin/echo - 775 sys sys 1135570806 57349
 386/bin/ed - 775 sys sys 1135570807 93021
-386/bin/eqn - 775 sys sys 1134151330 243031
+386/bin/eqn - 775 sys sys 1136656335 243034
 386/bin/execnet - 775 sys sys 1135570807 177748
 386/bin/exportfs - 775 sys sys 1135570807 162237
 386/bin/ext2srv - 775 sys sys 1135570808 179710
 386/bin/faces - 775 sys sys 1135570808 193982
 386/bin/factor - 775 sys sys 1135570809 61456
-386/bin/fcp - 775 sys sys 1135570809 82182
+386/bin/fcp - 775 sys sys 1136656336 82190
 386/bin/file - 775 sys sys 1135570809 120978
 386/bin/fmt - 775 sys sys 1135570809 65332
 386/bin/fortune - 775 sys sys 1135570810 67113
@@ -260,10 +260,10 @@
 386/bin/games/sudoku - 775 sys sys 1117249746 171666
 386/bin/getmap - 775 sys sys 1135570813 65176
 386/bin/gif - 775 sys sys 1135570813 158129
-386/bin/grap - 775 sys sys 1134151331 280493
+386/bin/grap - 775 sys sys 1136656337 280496
 386/bin/graph - 775 sys sys 1135570814 127323
 386/bin/grep - 775 sys sys 1136397208 79070
-386/bin/gs - 775 sys sys 1134151357 11125169
+386/bin/gs - 775 sys sys 1136656396 11125172
 386/bin/gunzip - 775 sys sys 1135570814 80271
 386/bin/gview - 775 sys sys 1136397208 238587
 386/bin/gzip - 775 sys sys 1135570815 84749
@@ -528,7 +528,7 @@
 386/lib - 20000000775 sys sys 1016826328 0
 386/lib/ape - 20000000775 sys sys 944969312 0
 386/lib/ape/lib9.a - 664 sys sys 1135531447 6906
-386/lib/ape/libap.a - 664 sys sys 1134151363 809462
+386/lib/ape/libap.a - 664 sys sys 1136656401 809476
 386/lib/ape/libbsd.a - 664 sys sys 1122001336 179308
 386/lib/ape/libdraw.a - 664 sys sys 1135570857 574562
 386/lib/ape/libfmt.a - 664 sys sys 1122001337 147204
@@ -8607,7 +8607,7 @@ sys/src/ape/lib/ap/plan9/ctime.c - 664 sys sys 1014921983 4916
 sys/src/ape/lib/ap/plan9/cuserid.c - 664 sys sys 1014921983 343
 sys/src/ape/lib/ap/plan9/dir.h - 664 sys sys 1048644334 2092
 sys/src/ape/lib/ap/plan9/dirread.c - 664 sys sys 1014921986 1659
-sys/src/ape/lib/ap/plan9/dirstat.c - 664 sys sys 1014921986 1698
+sys/src/ape/lib/ap/plan9/dirstat.c - 664 sys sys 1136651853 1723
 sys/src/ape/lib/ap/plan9/dirtostat.c - 664 sys sys 1048644334 1081
 sys/src/ape/lib/ap/plan9/dup.c - 664 sys sys 1014921984 339
 sys/src/ape/lib/ap/plan9/execl.c - 664 sys sys 1014921984 138
@@ -9315,7 +9315,7 @@ sys/src/cmd/aquarela/COPYRIGHT - 664 sys sys 1135892145 43
 sys/src/cmd/aquarela/addname.c - 664 sys sys 1135892108 1281
 sys/src/cmd/aquarela/alarm.c - 664 sys sys 1135892108 2194
 sys/src/cmd/aquarela/alloc.c - 664 sys sys 1135892108 245
-sys/src/cmd/aquarela/aquarela.c - 664 sys sys 1135892108 6986
+sys/src/cmd/aquarela/aquarela.c - 664 sys sys 1136651999 7027
 sys/src/cmd/aquarela/cifscmd.c - 664 sys sys 1135892108 4430
 sys/src/cmd/aquarela/client.c - 664 sys sys 1135892108 2724
 sys/src/cmd/aquarela/dump.c - 664 sys sys 1135892108 2864
@@ -9365,7 +9365,7 @@ sys/src/cmd/aquarela/smbdat.h - 664 sys sys 1135892113 6649
 sys/src/cmd/aquarela/smbdircache.c - 664 sys sys 1135892113 631
 sys/src/cmd/aquarela/smbfile.c - 664 sys sys 1135892113 438
 sys/src/cmd/aquarela/smbfns.h - 664 sys sys 1135892113 12190
-sys/src/cmd/aquarela/smbglobals.c - 664 sys sys 1135892113 1096
+sys/src/cmd/aquarela/smbglobals.c - 664 sys sys 1136651999 1141
 sys/src/cmd/aquarela/smbidmap.c - 664 sys sys 1135892113 2178
 sys/src/cmd/aquarela/smblisten.c - 664 sys sys 1135892113 2592
 sys/src/cmd/aquarela/smblog.c - 664 sys sys 1135892113 1841
@@ -10120,7 +10120,7 @@ sys/src/cmd/fax/receive.c - 664 sys sys 944960990 1097
 sys/src/cmd/fax/receiverc - 775 sys sys 944960990 581
 sys/src/cmd/fax/send.c - 664 sys sys 944960990 923
 sys/src/cmd/fax/subr.c - 664 sys sys 1015090401 1245
-sys/src/cmd/fcp.c - 664 sys sys 1131110045 3791
+sys/src/cmd/fcp.c - 664 sys sys 1136651872 3799
 sys/src/cmd/file.c - 664 sys sys 1125313891 23512
 sys/src/cmd/fmt.c - 664 sys sys 1070032009 4088
 sys/src/cmd/fortune.c - 664 sys sys 1072729222 1779
@@ -12398,7 +12398,7 @@ sys/src/cmd/pic/blockgen.c - 664 sys sys 944961042 5209
 sys/src/cmd/pic/boxgen.c - 664 sys sys 944961042 2309
 sys/src/cmd/pic/circgen.c - 664 sys sys 944961042 2678
 sys/src/cmd/pic/for.c - 664 sys sys 944961042 1949
-sys/src/cmd/pic/input.c - 664 sys sys 944961043 11539
+sys/src/cmd/pic/input.c - 664 sys sys 1136651708 11556
 sys/src/cmd/pic/linegen.c - 664 sys sys 944961042 5392
 sys/src/cmd/pic/main.c - 664 sys sys 944961042 6705
 sys/src/cmd/pic/makefile - 664 sys sys 944961042 964

dist/replica/plan9.db

@@ -22,22 +22,22 @@
 386/bin/acid - 775 sys sys 1136346850 400912
 386/bin/acme - 775 sys sys 1136087521 429186
 386/bin/ape - 20000000775 sys sys 1016944144 0
-386/bin/ape/basename - 775 sys sys 1134151323 132870
+386/bin/ape/basename - 775 sys sys 1136656314 132873
 386/bin/ape/cc - 775 sys sys 1135570769 70399
-386/bin/ape/diff - 775 sys sys 1134151324 349765
-386/bin/ape/diff3 - 775 sys sys 1134151324 188253
-386/bin/ape/dirname - 775 sys sys 1134151325 132649
-386/bin/ape/expr - 775 sys sys 1134151325 142291
-386/bin/ape/kill - 775 sys sys 1134151325 138220
-386/bin/ape/make - 775 sys sys 1134151326 209112
-386/bin/ape/patch - 775 sys sys 1134151326 302556
+386/bin/ape/diff - 775 sys sys 1136656316 349768
+386/bin/ape/diff3 - 775 sys sys 1136656317 188256
+386/bin/ape/dirname - 775 sys sys 1136656318 132652
+386/bin/ape/expr - 775 sys sys 1136656319 142294
+386/bin/ape/kill - 775 sys sys 1136656321 138223
+386/bin/ape/make - 775 sys sys 1136656322 209115
+386/bin/ape/patch - 775 sys sys 1136656324 302559
 386/bin/ape/psh - 775 sys sys 1042220689 34
-386/bin/ape/sed - 775 sys sys 1134151327 158322
-386/bin/ape/sh - 775 sys sys 1134151328 477234
+386/bin/ape/sed - 775 sys sys 1136656324 158325
+386/bin/ape/sh - 775 sys sys 1136656327 477237
 386/bin/ape/stty - 775 sys sys 1130384232 41057
 386/bin/ape/tar - 775 sys sys 1135570769 61941
-386/bin/ape/uname - 775 sys sys 1134151328 132699
-386/bin/aquarela - 775 sys sys 1135914849 331831
+386/bin/ape/uname - 775 sys sys 1136656327 132702
+386/bin/aquarela - 775 sys sys 1136656329 331912
 386/bin/ar - 775 sys sys 1135570769 111942
 386/bin/archfs - 775 sys sys 1135570769 146849
 386/bin/ascii - 775 sys sys 1135570770 64641
@@ -109,8 +109,8 @@
 386/bin/aux/lines - 775 sys sys 1135570784 60473
 386/bin/aux/listen - 775 sys sys 1135570785 108006
 386/bin/aux/listen1 - 775 sys sys 1135570785 94483
-386/bin/aux/lpdaemon - 775 sys sys 1134151329 168283
-386/bin/aux/lpdsend - 775 sys sys 1134151329 155121
+386/bin/aux/lpdaemon - 775 sys sys 1136656330 168286
+386/bin/aux/lpdsend - 775 sys sys 1136656330 155124
 386/bin/aux/lpsend - 775 sys sys 1130384251 52558
 386/bin/aux/mapd - 775 sys sys 1135570785 190784
 386/bin/aux/mkflashfs - 775 sys sys 1135570785 67345
@@ -155,7 +155,7 @@
 386/bin/aux/write - 775 sys sys 1085077011 4188
 386/bin/aux/zerotrunc - 775 sys sys 1108268388 3891
 386/bin/awd - 775 sys sys 1135570793 58734
-386/bin/awk - 775 sys sys 1134237845 321783
+386/bin/awk - 775 sys sys 1136656332 321786
 386/bin/basename - 775 sys sys 1130384262 37902
 386/bin/bc - 775 sys sys 1135570793 81760
 386/bin/bind - 775 sys sys 1135570793 59562
@@ -177,7 +177,7 @@
 386/bin/cfs - 775 sys sys 1135570797 128025
 386/bin/chgrp - 775 sys sys 1135570798 59279
 386/bin/chmod - 775 sys sys 1135570798 62275
-386/bin/cifscmd - 775 sys sys 1135914850 342709
+386/bin/cifscmd - 775 sys sys 1136656333 342747
 386/bin/cleanname - 775 sys sys 1135570798 58298
 386/bin/clock - 775 sys sys 1135570798 158281
 386/bin/cmp - 775 sys sys 1130384270 40583
@@ -219,13 +219,13 @@
 386/bin/du - 775 sys sys 1135570806 73708
 386/bin/echo - 775 sys sys 1135570806 57349
 386/bin/ed - 775 sys sys 1135570807 93021
-386/bin/eqn - 775 sys sys 1134151330 243031
+386/bin/eqn - 775 sys sys 1136656335 243034
 386/bin/execnet - 775 sys sys 1135570807 177748
 386/bin/exportfs - 775 sys sys 1135570807 162237
 386/bin/ext2srv - 775 sys sys 1135570808 179710
 386/bin/faces - 775 sys sys 1135570808 193982
 386/bin/factor - 775 sys sys 1135570809 61456
-386/bin/fcp - 775 sys sys 1135570809 82182
+386/bin/fcp - 775 sys sys 1136656336 82190
 386/bin/file - 775 sys sys 1135570809 120978
 386/bin/fmt - 775 sys sys 1135570809 65332
 386/bin/fortune - 775 sys sys 1135570810 67113
@@ -260,10 +260,10 @@
 386/bin/games/sudoku - 775 sys sys 1117249746 171666
 386/bin/getmap - 775 sys sys 1135570813 65176
 386/bin/gif - 775 sys sys 1135570813 158129
-386/bin/grap - 775 sys sys 1134151331 280493
+386/bin/grap - 775 sys sys 1136656337 280496
 386/bin/graph - 775 sys sys 1135570814 127323
 386/bin/grep - 775 sys sys 1136397208 79070
-386/bin/gs - 775 sys sys 1134151357 11125169
+386/bin/gs - 775 sys sys 1136656396 11125172
 386/bin/gunzip - 775 sys sys 1135570814 80271
 386/bin/gview - 775 sys sys 1136397208 238587
 386/bin/gzip - 775 sys sys 1135570815 84749
@@ -528,7 +528,7 @@
 386/lib - 20000000775 sys sys 1016826328 0
 386/lib/ape - 20000000775 sys sys 944969312 0
 386/lib/ape/lib9.a - 664 sys sys 1135531447 6906
-386/lib/ape/libap.a - 664 sys sys 1134151363 809462
+386/lib/ape/libap.a - 664 sys sys 1136656401 809476
 386/lib/ape/libbsd.a - 664 sys sys 1122001336 179308
 386/lib/ape/libdraw.a - 664 sys sys 1135570857 574562
 386/lib/ape/libfmt.a - 664 sys sys 1122001337 147204
@@ -8607,7 +8607,7 @@ sys/src/ape/lib/ap/plan9/ctime.c - 664 sys sys 1014921983 4916
 sys/src/ape/lib/ap/plan9/cuserid.c - 664 sys sys 1014921983 343
 sys/src/ape/lib/ap/plan9/dir.h - 664 sys sys 1048644334 2092
 sys/src/ape/lib/ap/plan9/dirread.c - 664 sys sys 1014921986 1659
-sys/src/ape/lib/ap/plan9/dirstat.c - 664 sys sys 1014921986 1698
+sys/src/ape/lib/ap/plan9/dirstat.c - 664 sys sys 1136651853 1723
 sys/src/ape/lib/ap/plan9/dirtostat.c - 664 sys sys 1048644334 1081
 sys/src/ape/lib/ap/plan9/dup.c - 664 sys sys 1014921984 339
 sys/src/ape/lib/ap/plan9/execl.c - 664 sys sys 1014921984 138
@@ -9315,7 +9315,7 @@ sys/src/cmd/aquarela/COPYRIGHT - 664 sys sys 1135892145 43
 sys/src/cmd/aquarela/addname.c - 664 sys sys 1135892108 1281
 sys/src/cmd/aquarela/alarm.c - 664 sys sys 1135892108 2194
 sys/src/cmd/aquarela/alloc.c - 664 sys sys 1135892108 245
-sys/src/cmd/aquarela/aquarela.c - 664 sys sys 1135892108 6986
+sys/src/cmd/aquarela/aquarela.c - 664 sys sys 1136651999 7027
 sys/src/cmd/aquarela/cifscmd.c - 664 sys sys 1135892108 4430
 sys/src/cmd/aquarela/client.c - 664 sys sys 1135892108 2724
 sys/src/cmd/aquarela/dump.c - 664 sys sys 1135892108 2864
@@ -9365,7 +9365,7 @@ sys/src/cmd/aquarela/smbdat.h - 664 sys sys 1135892113 6649
 sys/src/cmd/aquarela/smbdircache.c - 664 sys sys 1135892113 631
 sys/src/cmd/aquarela/smbfile.c - 664 sys sys 1135892113 438
 sys/src/cmd/aquarela/smbfns.h - 664 sys sys 1135892113 12190
-sys/src/cmd/aquarela/smbglobals.c - 664 sys sys 1135892113 1096
+sys/src/cmd/aquarela/smbglobals.c - 664 sys sys 1136651999 1141
 sys/src/cmd/aquarela/smbidmap.c - 664 sys sys 1135892113 2178
 sys/src/cmd/aquarela/smblisten.c - 664 sys sys 1135892113 2592
 sys/src/cmd/aquarela/smblog.c - 664 sys sys 1135892113 1841
@@ -10120,7 +10120,7 @@ sys/src/cmd/fax/receive.c - 664 sys sys 944960990 1097
 sys/src/cmd/fax/receiverc - 775 sys sys 944960990 581
 sys/src/cmd/fax/send.c - 664 sys sys 944960990 923
 sys/src/cmd/fax/subr.c - 664 sys sys 1015090401 1245
-sys/src/cmd/fcp.c - 664 sys sys 1131110045 3791
+sys/src/cmd/fcp.c - 664 sys sys 1136651872 3799
 sys/src/cmd/file.c - 664 sys sys 1125313891 23512
 sys/src/cmd/fmt.c - 664 sys sys 1070032009 4088
 sys/src/cmd/fortune.c - 664 sys sys 1072729222 1779
@@ -12398,7 +12398,7 @@ sys/src/cmd/pic/blockgen.c - 664 sys sys 944961042 5209
 sys/src/cmd/pic/boxgen.c - 664 sys sys 944961042 2309
 sys/src/cmd/pic/circgen.c - 664 sys sys 944961042 2678
 sys/src/cmd/pic/for.c - 664 sys sys 944961042 1949
-sys/src/cmd/pic/input.c - 664 sys sys 944961043 11539
+sys/src/cmd/pic/input.c - 664 sys sys 1136651708 11556
 sys/src/cmd/pic/linegen.c - 664 sys sys 944961042 5392
 sys/src/cmd/pic/main.c - 664 sys sys 944961042 6705
 sys/src/cmd/pic/makefile - 664 sys sys 944961042 964

dist/replica/plan9.log

@@ -24768,3 +24768,29 @@
 1136441444 5 c 386/9pcdisk.gz - 664 sys sys 1136441436 750976
 1136441444 6 c 386/9pcf - 775 sys sys 1136441440 2428828
 1136441444 7 c 386/9pcf.gz - 664 sys sys 1136441442 905190
+1136653251 0 c sys/src/ape/lib/ap/plan9/dirstat.c - 664 sys sys 1136651853 1723
+1136653251 1 c sys/src/cmd/aquarela/aquarela.c - 664 sys sys 1136651999 7027
+1136653251 2 c sys/src/cmd/aquarela/smbglobals.c - 664 sys sys 1136651999 1141
+1136653251 3 c sys/src/cmd/fcp.c - 664 sys sys 1136651872 3799
+1136653251 4 c sys/src/cmd/pic/input.c - 664 sys sys 1136651708 11556
+1136656852 0 c 386/bin/awk - 775 sys sys 1136656332 321786
+1136656852 1 c 386/bin/eqn - 775 sys sys 1136656335 243034
+1136656852 2 c 386/bin/grap - 775 sys sys 1136656337 280496
+1136656852 3 c 386/bin/gs - 775 sys sys 1136656396 11125172
+1136656852 4 c 386/bin/ape/basename - 775 sys sys 1136656314 132873
+1136656852 5 c 386/bin/ape/diff - 775 sys sys 1136656316 349768
+1136656852 6 c 386/bin/ape/diff3 - 775 sys sys 1136656317 188256
+1136656852 7 c 386/bin/ape/dirname - 775 sys sys 1136656318 132652
+1136656852 8 c 386/bin/ape/expr - 775 sys sys 1136656319 142294
+1136656852 9 c 386/bin/ape/kill - 775 sys sys 1136656321 138223
+1136656852 10 c 386/bin/ape/make - 775 sys sys 1136656322 209115
+1136656852 11 c 386/bin/ape/patch - 775 sys sys 1136656324 302559
+1136656852 12 c 386/bin/ape/sed - 775 sys sys 1136656324 158325
+1136656852 13 c 386/bin/ape/sh - 775 sys sys 1136656327 477237
+1136656852 14 c 386/bin/ape/uname - 775 sys sys 1136656327 132702
+1136656852 15 c 386/bin/aquarela - 775 sys sys 1136656329 331912
+1136656852 16 c 386/bin/aux/lpdaemon - 775 sys sys 1136656330 168286
+1136656852 17 c 386/bin/aux/lpdsend - 775 sys sys 1136656330 155124
+1136656852 18 c 386/bin/cifscmd - 775 sys sys 1136656333 342747
+1136656852 19 c 386/bin/fcp - 775 sys sys 1136656336 82190
+1136656852 20 c 386/lib/ape/libap.a - 664 sys sys 1136656401 809476

sys/src/ape/lib/ap/plan9/dirstat.c

@@ -18,11 +18,11 @@ _dirstat(char *name)
 
 	nd = DIRSIZE;
 	for(i=0; i<2; i++){	/* should work by the second try */
-		d = malloc(sizeof(Dir) + nd);
+		d = malloc(sizeof(Dir) + BIT16SZ +nd);
 		if(d == nil)
 			return nil;
 		buf = (uchar*)&d[1];
-		n = _STAT(name, buf, nd);
+		n = _STAT(name, buf, BIT16SZ+nd);
 		if(n < BIT16SZ){
 			free(d);
 			return nil;
@@ -32,7 +32,7 @@ _dirstat(char *name)
 			_convM2D(buf, n, d, (char*)&d[1]);
 			return d;
 		}
-		/* else sizeof(Dir)+nd is plenty */
+		/* else sizeof(Dir)+BIT16SZ+nd is plenty */
 		free(d);
 	}
 	return nil;

sys/src/cmd/aquarela/aquarela.c

@@ -176,8 +176,8 @@ cifsaccept(SmbCifsSession *s, SMBCIFSWRITEFN **writep)
 void
 usage(void)
 {
-	print("usage: aquarela [-u unicodevalue]\n");
-	threadexitsall("");
+	fprint(2, "usage: %s [-d debug-opt] [-n] [-p] [-u 1|0] [-w workgroup]\n", argv0);
+	threadexitsall("usage");
 }
 
 static void

sys/src/cmd/aquarela/smbglobals.c

@@ -36,8 +36,11 @@ smbglobalsguess(int client)
 	if (smbglobals.serverinfo.remark == nil)
 		smbglobals.serverinfo.remark = "This is a default server comment";
 	if (smbglobals.log.fd < 0)
-		if (client)
+		if (client){
 			smbglobals.log.fd = create("client.log", OWRITE|OTRUNC, 0666);
-		else
-			smbglobals.log.fd = create("aquarela.log", OWRITE|OTRUNC, 0666);
+		}
+		else{
+			if (access("/sys/log/aquarela", 2) == 0)
+				smbglobals.log.fd = open("/sys/log/aquarela", OWRITE);
+		}
 }

sys/src/cmd/fcp.c

@@ -44,7 +44,7 @@ main(int argc, char *argv[])
 	if(dirb!=nil && (dirb->mode&DMDIR))
 		todir=1;
 	if(argc>2 && !todir){
-		fprint(2, "cp: %s not a directory\n", argv[argc-1]);
+		fprint(2, "fcp: %s not a directory\n", argv[argc-1]);
 		exits("bad usage");
 	}
 	for(i=0; i<argc-1; i++)
@@ -73,7 +73,7 @@ samefile(Dir *a, char *an, char *bn)
 	if(b->qid.vers==a->qid.vers)
 	if(b->dev==a->dev)
 	if(b->type==a->type){
-		fprint(2, "cp: %s and %s are the same file\n", an, bn);
+		fprint(2, "fcp: %s and %s are the same file\n", an, bn);
 		ret = 1;
 	}
 	free(b);
@@ -98,13 +98,13 @@ copy(char *from, char *to, int todir)
 	}
 
 	if((dirb=dirstat(from))==nil){
-		fprint(2,"cp: can't stat %s: %r\n", from);
+		fprint(2,"fcp: can't stat %s: %r\n", from);
 		failed = 1;
 		return;
 	}
 	mode = dirb->mode;
 	if(mode&DMDIR){
-		fprint(2, "cp: %s is a directory\n", from);
+		fprint(2, "fcp: %s is a directory\n", from);
 		free(dirb);
 		failed = 1;
 		return;
@@ -117,14 +117,14 @@ copy(char *from, char *to, int todir)
 	mode &= 0777;
 	fdf=open(from, OREAD);
 	if(fdf<0){
-		fprint(2, "cp: can't open %s: %r\n", from);
+		fprint(2, "fcp: can't open %s: %r\n", from);
 		free(dirb);
 		failed = 1;
 		return;
 	}
 	fdt=create(to, OWRITE, mode);
 	if(fdt<0){
-		fprint(2, "cp: can't create %s: %r\n", to);
+		fprint(2, "fcp: can't create %s: %r\n", to);
 		close(fdf);
 		free(dirb);
 		failed = 1;
@@ -141,7 +141,7 @@ copy(char *from, char *to, int todir)
 		if(gflag)
 			dirt.gid = dirb->gid;
 		if(dirfwstat(fdt, &dirt) < 0)
-			fprint(2, "cp: warning: can't wstat %s: %r\n", to);
+			fprint(2, "fcp: warning: can't wstat %s: %r\n", to);
 	}			
 	free(dirb);
 	close(fdf);
@@ -169,7 +169,7 @@ copy1(int fdf, int fdt, char *from, char *to)
 		}
 	}
 	if(n == 0){
-		fprint(2, "cp: rfork: %r\n");
+		fprint(2, "fcp: rfork: %r\n");
 		failed = 1;
 		return -1;
 	}

sys/src/cmd/pic/input.c

@@ -245,7 +245,7 @@ input(void)
 		printf(" <%c>", c);
 	if (ep >= ebuf + sizeof ebuf)
 		ep = ebuf;
-	return *ep++ = c;
+	return *(unsigned char *)ep++ = c;
 }
 
 nextchar(void)