Browse Source

Plan 9 from Bell Labs 2005-02-21

David du Colombier 19 years ago
parent
commit
50dcd7684a

+ 47 - 12
dist/replica/_plan9.db

@@ -456,7 +456,7 @@
 386/bin/upas/runq - 775 sys sys 1104122074 113086
 386/bin/upas/scanmail - 775 sys sys 1104122075 128749
 386/bin/upas/send - 775 sys sys 1104122075 191536
-386/bin/upas/smtp - 775 sys sys 1105161519 273654
+386/bin/upas/smtp - 775 sys sys 1108913524 274131
 386/bin/upas/smtpd - 775 sys sys 1108268391 329286
 386/bin/upas/spam - 775 sys sys 1064598366 36
 386/bin/upas/testscan - 775 sys sys 1104122077 83668
@@ -9569,11 +9569,11 @@ sys/src/cmd/jpg/gif.c - 664 sys sys 1045505400 8844
 sys/src/cmd/jpg/ico.c - 664 sys sys 1072107030 8799
 sys/src/cmd/jpg/imagefile.h - 664 sys sys 988225303 2246
 sys/src/cmd/jpg/jpegdump.c - 664 sys sys 1018802871 7161
-sys/src/cmd/jpg/jpg.c - 664 sys sys 1108852825 7394
+sys/src/cmd/jpg/jpg.c - 664 sys sys 1108938203 7411
 sys/src/cmd/jpg/mkfile - 664 sys sys 1079970080 1056
 sys/src/cmd/jpg/multichan.c - 664 sys sys 1039753047 825
 sys/src/cmd/jpg/onechan.c - 664 sys sys 1039753044 3732
-sys/src/cmd/jpg/png.c - 664 sys sys 1108853800 4818
+sys/src/cmd/jpg/png.c - 664 sys sys 1108939730 4834
 sys/src/cmd/jpg/ppm.c - 664 sys sys 1108852826 4204
 sys/src/cmd/jpg/readbmp.c - 664 sys sys 1105455271 13691
 sys/src/cmd/jpg/readgif.c - 664 sys sys 1014926433 10306
@@ -9587,7 +9587,7 @@ sys/src/cmd/jpg/togif.c - 664 sys sys 944961292 2828
 sys/src/cmd/jpg/toico.c - 664 sys sys 1072107030 5638
 sys/src/cmd/jpg/topng.c - 664 sys sys 988225303 1116
 sys/src/cmd/jpg/toppm.c - 664 sys sys 944961292 1571
-sys/src/cmd/jpg/torgbv.c - 664 sys sys 1067719080 6443
+sys/src/cmd/jpg/torgbv.c - 664 sys sys 1108938204 7118
 sys/src/cmd/jpg/totruecolor.c - 664 sys sys 1014926434 3407
 sys/src/cmd/jpg/writegif.c - 664 sys sys 1014926434 10727
 sys/src/cmd/jpg/writepng.c - 664 sys sys 1108851604 4556
@@ -10269,23 +10269,23 @@ sys/src/cmd/sam/address.c - 664 sys sys 944961628 3985
 sys/src/cmd/sam/buff.c - 664 sys sys 1014926937 5161
 sys/src/cmd/sam/cmd.c - 664 sys sys 944961628 10461
 sys/src/cmd/sam/disk.c - 664 sys sys 1014926938 1988
-sys/src/cmd/sam/error.c - 664 sys sys 1017166329 2228
+sys/src/cmd/sam/error.c - 664 sys sys 1108939612 2222
 sys/src/cmd/sam/errors.h - 664 sys sys 944961628 695
 sys/src/cmd/sam/file.c - 664 sys sys 1045505553 11030
 sys/src/cmd/sam/io.c - 664 sys sys 1017166329 4414
 sys/src/cmd/sam/list.c - 664 sys sys 944961628 858
 sys/src/cmd/sam/mesg.c - 664 sys sys 1063854937 14046
 sys/src/cmd/sam/mesg.h - 664 sys sys 1014926938 3773
-sys/src/cmd/sam/mkfile - 664 sys sys 944961628 498
+sys/src/cmd/sam/mkfile - 664 sys sys 1108939611 559
 sys/src/cmd/sam/moveto.c - 664 sys sys 944961628 2698
 sys/src/cmd/sam/multi.c - 664 sys sys 944961628 1846
 sys/src/cmd/sam/parse.h - 664 sys sys 944961629 1910
-sys/src/cmd/sam/plan9.c - 664 sys sys 1014926938 2803
+sys/src/cmd/sam/plan9.c - 664 sys sys 1108939612 2860
 sys/src/cmd/sam/rasp.c - 664 sys sys 950104640 5618
 sys/src/cmd/sam/regexp.c - 664 sys sys 944961629 15390
 sys/src/cmd/sam/sam.c - 664 sys sys 1017166330 12190
-sys/src/cmd/sam/sam.h - 664 sys sys 1017166330 9582
-sys/src/cmd/sam/shell.c - 664 sys sys 988225302 3112
+sys/src/cmd/sam/sam.h - 664 sys sys 1108939611 9584
+sys/src/cmd/sam/shell.c - 664 sys sys 1108939613 3149
 sys/src/cmd/sam/string.c - 664 sys sys 944961629 2766
 sys/src/cmd/sam/sys.c - 664 sys sys 1014926939 745
 sys/src/cmd/sam/util.c - 664 sys sys 944961629 766
@@ -10932,8 +10932,8 @@ sys/src/cmd/upas/send/translate.c - 664 sys sys 944961322 804
 sys/src/cmd/upas/send/tryit - 664 sys sys 944961322 584
 sys/src/cmd/upas/smtp - 20000000775 sys sys 988250017 0
 sys/src/cmd/upas/smtp/greylist.c - 664 sys sys 1091126808 6470
-sys/src/cmd/upas/smtp/mkfile - 664 sys sys 1108828019 746
-sys/src/cmd/upas/smtp/mxdial.c - 664 sys sys 1105114609 6024
+sys/src/cmd/upas/smtp/mkfile - 664 sys sys 1108910002 801
+sys/src/cmd/upas/smtp/mxdial.c - 664 sys sys 1108875334 6251
 sys/src/cmd/upas/smtp/rfc822.y - 664 sys sys 1064589606 13417
 sys/src/cmd/upas/smtp/rmtdns.c - 664 sys sys 1015013150 1069
 sys/src/cmd/upas/smtp/smtp.c - 664 sys sys 1108827987 20071
@@ -11738,7 +11738,7 @@ sys/src/libc/port/charstod.c - 664 sys sys 1014927395 1641
 sys/src/libc/port/cistrcmp.c - 664 sys sys 1014927395 323
 sys/src/libc/port/cistrncmp.c - 664 sys sys 1019240175 366
 sys/src/libc/port/cistrstr.c - 664 sys sys 1014927395 357
-sys/src/libc/port/cleanname.c - 664 sys sys 1014927395 1199
+sys/src/libc/port/cleanname.c - 664 sys sys 1108937861 1537
 sys/src/libc/port/crypt.c - 664 sys sys 1014927396 1045
 sys/src/libc/port/ctype.c - 664 sys sys 1014927396 834
 sys/src/libc/port/encodefmt.c - 664 sys sys 1071289162 1100
@@ -12471,3 +12471,38 @@ 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/acid - 775 sys sys 1108960003 355983
+386/bin/acme - 775 sys sys 1108960004 428209
+386/bin/cleanname - 775 sys sys 1108960005 58304
+386/bin/db - 775 sys sys 1108960006 302393
+386/bin/png - 775 sys sys 1108960012 164172
+386/bin/snap - 775 sys sys 1108960014 269837
+386/bin/snapfs - 775 sys sys 1108960015 338691
+386/bin/vncs - 775 sys sys 1108960018 471461
+386/bin/gif - 775 sys sys 1108960006 158063
+386/bin/jpg - 775 sys sys 1108960009 174528
+386/bin/kprof - 775 sys sys 1108960009 99723
+386/bin/ktrace - 775 sys sys 1108960009 113674
+386/bin/ls - 775 sys sys 1108960010 82464
+386/bin/mk - 775 sys sys 1108960010 144090
+386/bin/nm - 775 sys sys 1108960010 115737
+386/bin/page - 775 sys sys 1108960011 231866
+386/bin/plumber - 775 sys sys 1108960011 169863
+386/bin/ppm - 775 sys sys 1108960012 149347
+386/bin/prof - 775 sys sys 1108960012 104466
+386/bin/rio - 775 sys sys 1108960013 308970
+386/bin/sam - 775 sys sys 1108960013 158001
+386/bin/bmp - 775 sys sys 1108960005 157595
+386/bin/ip/ftpd - 775 sys sys 1108960006 169202
+386/bin/ip/httpd/httpd - 775 sys sys 1108960007 290886
+386/bin/ip/httpd/webls - 775 sys sys 1108960008 130898
+386/bin/ip/imap4d - 775 sys sys 1108960008 236497
+386/bin/tar - 775 sys sys 1108960015 95396
+386/bin/togif - 775 sys sys 1108960015 189521
+386/bin/tprof - 775 sys sys 1108960016 255319
+386/bin/upas/pop3 - 775 sys sys 1108960017 260349
+386/bin/yacc - 775 sys sys 1108960018 102005
+386/bin/yuv - 775 sys sys 1108960019 149884
+386/lib/libc.a - 664 sys sys 1108960020 502516
+acme/bin/386/News - 775 sys sys 1108960019 128813
+acme/bin/386/Wiki - 775 sys sys 1108960019 126913

+ 47 - 47
dist/replica/plan9.db

@@ -19,8 +19,8 @@
 386/bin/8l - 775 sys sys 1107835553 115728
 386/bin/9660srv - 775 sys sys 1108354539 103973
 386/bin/aan - 775 sys sys 1108354539 130710
-386/bin/acid - 775 sys sys 1108008331 355831
-386/bin/acme - 775 sys sys 1108354541 428057
+386/bin/acid - 775 sys sys 1108960003 355983
+386/bin/acme - 775 sys sys 1108960004 428209
 386/bin/ape - 20000000775 sys sys 1016944144 0
 386/bin/ape/basename - 775 sys sys 1087442501 132681
 386/bin/ape/cc - 775 sys sys 1104121958 70291
@@ -165,7 +165,7 @@
 386/bin/bitsy/params - 775 sys sys 1104121990 58776
 386/bin/bitsy/pencal - 775 sys sys 1104121991 117190
 386/bin/bitsy/prompter - 775 sys sys 1106799172 285651
-386/bin/bmp - 775 sys sys 1108872009 157219
+386/bin/bmp - 775 sys sys 1108960005 157595
 386/bin/bunzip2 - 775 sys sys 1104121992 97499
 386/bin/bzip2 - 775 sys sys 1104121992 114034
 386/bin/cal - 775 sys sys 1104121993 67886
@@ -176,7 +176,7 @@
 386/bin/cfs - 775 sys sys 1108354549 128067
 386/bin/chgrp - 775 sys sys 1104121994 59285
 386/bin/chmod - 775 sys sys 1104121995 62281
-386/bin/cleanname - 775 sys sys 1104121995 58152
+386/bin/cleanname - 775 sys sys 1108960005 58304
 386/bin/clock - 775 sys sys 1106799172 157159
 386/bin/cmp - 775 sys sys 1104121995 40565
 386/bin/colors - 775 sys sys 1106799173 149453
@@ -187,7 +187,7 @@
 386/bin/cpu - 775 sys sys 1108354550 137694
 386/bin/crop - 775 sys sys 1104121998 115763
 386/bin/date - 775 sys sys 1104121998 43261
-386/bin/db - 775 sys sys 1108008332 302241
+386/bin/db - 775 sys sys 1108960006 302393
 386/bin/dc - 775 sys sys 1104121999 99028
 386/bin/dd - 775 sys sys 1104121999 45347
 386/bin/deroff - 775 sys sys 1104122000 74244
@@ -251,7 +251,7 @@
 386/bin/games/playlistfs - 775 sys sys 1105589129 148484
 386/bin/games/sokoban - 775 sys sys 1096341940 157093
 386/bin/getmap - 775 sys sys 1104122014 65180
-386/bin/gif - 775 sys sys 1104122015 157687
+386/bin/gif - 775 sys sys 1108960006 158063
 386/bin/grap - 775 sys sys 1094040086 280301
 386/bin/graph - 775 sys sys 1104122016 129263
 386/bin/grep - 775 sys sys 1104122016 79051
@@ -274,20 +274,20 @@
 386/bin/ip/dhcpclient - 775 sys sys 1104122021 94096
 386/bin/ip/dhcpd - 775 sys sys 1104122021 149132
 386/bin/ip/dhcpleases - 775 sys sys 1104122021 86215
-386/bin/ip/ftpd - 775 sys sys 1108268389 169050
+386/bin/ip/ftpd - 775 sys sys 1108960006 169202
 386/bin/ip/gizzard - 775 sys sys 1081480408 101521
 386/bin/ip/gping - 775 sys sys 1106799176 182010
 386/bin/ip/hogports - 775 sys sys 1104122022 42883
 386/bin/ip/httpd - 20000000775 sys sys 1016920846 0
-386/bin/ip/httpd/httpd - 775 sys sys 1108268389 290734
+386/bin/ip/httpd/httpd - 775 sys sys 1108960007 290886
 386/bin/ip/httpd/imagemap - 775 sys sys 1104122023 114785
 386/bin/ip/httpd/man2html - 775 sys sys 1104122024 123072
 386/bin/ip/httpd/netlib_find - 775 sys sys 1104122024 115630
 386/bin/ip/httpd/netlib_history - 775 sys sys 1104122024 114417
 386/bin/ip/httpd/save - 775 sys sys 1104122025 131081
-386/bin/ip/httpd/webls - 775 sys sys 1104122025 130746
+386/bin/ip/httpd/webls - 775 sys sys 1108960008 130898
 386/bin/ip/httpd/wikipost - 775 sys sys 1104122026 112655
-386/bin/ip/imap4d - 775 sys sys 1104122026 236345
+386/bin/ip/imap4d - 775 sys sys 1108960008 236497
 386/bin/ip/ipconfig - 775 sys sys 1104122027 137736
 386/bin/ip/ping - 775 sys sys 1104122027 77010
 386/bin/ip/ppp - 775 sys sys 1104122027 218631
@@ -303,18 +303,18 @@
 386/bin/ip/traceroute - 775 sys sys 1104122030 73497
 386/bin/ip/udpecho - 775 sys sys 1104122030 43159
 386/bin/join - 775 sys sys 1104122031 116241
-386/bin/jpg - 775 sys sys 1108872010 174146
+386/bin/jpg - 775 sys sys 1108960009 174528
 386/bin/kbmap - 775 sys sys 1106799176 142498
-386/bin/kprof - 775 sys sys 1108008333 99571
-386/bin/ktrace - 775 sys sys 1108008334 113522
+386/bin/kprof - 775 sys sys 1108960009 99723
+386/bin/ktrace - 775 sys sys 1108960009 113674
 386/bin/lens - 775 sys sys 1104122032 124095
 386/bin/lex - 775 sys sys 1104122033 98664
 386/bin/lnfs - 775 sys sys 1108354557 99449
 386/bin/look - 775 sys sys 1104122033 65550
-386/bin/ls - 775 sys sys 1104122033 82312
+386/bin/ls - 775 sys sys 1108960010 82464
 386/bin/mc - 775 sys sys 1106799177 132811
 386/bin/md5sum - 775 sys sys 1104122034 61265
-386/bin/mk - 775 sys sys 1108281595 143938
+386/bin/mk - 775 sys sys 1108960010 144090
 386/bin/mkdir - 775 sys sys 1104122035 60964
 386/bin/mkpaqfs - 775 sys sys 1104122035 94509
 386/bin/mkstate - 775 sys sys 1104122035 63519
@@ -339,11 +339,11 @@
 386/bin/netstat - 775 sys sys 1104122040 84385
 386/bin/news - 775 sys sys 1104122041 71653
 386/bin/nfs - 775 sys sys 1108354559 315389
-386/bin/nm - 775 sys sys 1108008334 115585
+386/bin/nm - 775 sys sys 1108960010 115737
 386/bin/nntpfs - 775 sys sys 1108354560 160898
 386/bin/ns - 775 sys sys 1104122042 65260
 386/bin/p - 775 sys sys 1108268390 64990
-386/bin/page - 775 sys sys 1106799177 231714
+386/bin/page - 775 sys sys 1108960011 231866
 386/bin/paqfs - 775 sys sys 1108354560 107558
 386/bin/passwd - 775 sys sys 1104122044 83747
 386/bin/pbd - 775 sys sys 1085077087 4661
@@ -352,12 +352,12 @@
 386/bin/pipefile - 775 sys sys 1104122044 39396
 386/bin/plot - 775 sys sys 1106799178 221135
 386/bin/plumb - 775 sys sys 1104122045 66969
-386/bin/plumber - 775 sys sys 1108354560 169711
-386/bin/png - 775 sys sys 1108872011 163787
-386/bin/ppm - 775 sys sys 1108872012 148971
+386/bin/plumber - 775 sys sys 1108960011 169863
+386/bin/png - 775 sys sys 1108960012 164172
+386/bin/ppm - 775 sys sys 1108960012 149347
 386/bin/pr - 775 sys sys 1104122046 77408
 386/bin/primes - 775 sys sys 1104122046 38793
-386/bin/prof - 775 sys sys 1108008334 104314
+386/bin/prof - 775 sys sys 1108960012 104466
 386/bin/proof - 775 sys sys 1106799178 177605
 386/bin/ps - 775 sys sys 1104122047 65805
 386/bin/pwd - 775 sys sys 1104122047 36897
@@ -376,10 +376,10 @@
 386/bin/replica/setupdirs - 775 sys sys 1020319083 44
 386/bin/replica/updatedb - 775 sys sys 1104122050 95895
 386/bin/resample - 775 sys sys 1104122050 120495
-386/bin/rio - 775 sys sys 1108354561 308818
+386/bin/rio - 775 sys sys 1108960013 308970
 386/bin/rm - 775 sys sys 1104122051 61333
 386/bin/rx - 775 sys sys 1104122051 82055
-386/bin/sam - 775 sys sys 1104122052 157541
+386/bin/sam - 775 sys sys 1108960013 158001
 386/bin/scat - 775 sys sys 1106799180 283256
 386/bin/scp - 775 sys sys 1104122053 151911
 386/bin/scuzz - 775 sys sys 1104122053 111613
@@ -388,8 +388,8 @@
 386/bin/sha1sum - 775 sys sys 1104122054 61133
 386/bin/size - 775 sys sys 1108008334 74340
 386/bin/sleep - 775 sys sys 1085077097 3413
-386/bin/snap - 775 sys sys 1108008335 269685
-386/bin/snapfs - 775 sys sys 1108354562 338539
+386/bin/snap - 775 sys sys 1108960014 269837
+386/bin/snapfs - 775 sys sys 1108960015 338691
 386/bin/sniffer - 775 sys sys 1038443185 99028
 386/bin/snoopy - 775 sys sys 1108354563 157546
 386/bin/sort - 775 sys sys 1104122056 82285
@@ -407,7 +407,7 @@
 386/bin/swap - 775 sys sys 1104122060 62094
 386/bin/syscall - 775 sys sys 1104122060 73536
 386/bin/tail - 775 sys sys 1104122060 65938
-386/bin/tar - 775 sys sys 1108008336 95244
+386/bin/tar - 775 sys sys 1108960015 95396
 386/bin/tbl - 775 sys sys 1104122061 113124
 386/bin/tcs - 775 sys sys 1104122062 256588
 386/bin/tee - 775 sys sys 1104122062 38428
@@ -417,12 +417,12 @@
 386/bin/time - 775 sys sys 1104122063 61386
 386/bin/tlsclient - 775 sys sys 1104122063 197754
 386/bin/tlssrv - 775 sys sys 1104122064 198001
-386/bin/togif - 775 sys sys 1104122064 189145
+386/bin/togif - 775 sys sys 1108960015 189521
 386/bin/toico - 775 sys sys 1104122065 123524
 386/bin/topng - 775 sys sys 1108872012 138083
 386/bin/toppm - 775 sys sys 1104122065 164905
 386/bin/touch - 775 sys sys 1104122066 63763
-386/bin/tprof - 775 sys sys 1108008337 255167
+386/bin/tprof - 775 sys sys 1108960016 255319
 386/bin/tr - 775 sys sys 1104122066 61851
 386/bin/trace - 775 sys sys 1106799181 180728
 386/bin/troff - 775 sys sys 1094040114 357714
@@ -450,13 +450,13 @@
 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 1104122073 156258
-386/bin/upas/pop3 - 775 sys sys 1104122073 260197
+386/bin/upas/pop3 - 775 sys sys 1108960017 260349
 386/bin/upas/qer - 775 sys sys 1104122073 99840
 386/bin/upas/ratfs - 775 sys sys 1108354565 111342
 386/bin/upas/runq - 775 sys sys 1104122074 113086
 386/bin/upas/scanmail - 775 sys sys 1104122075 128749
 386/bin/upas/send - 775 sys sys 1104122075 191536
-386/bin/upas/smtp - 775 sys sys 1105161519 273654
+386/bin/upas/smtp - 775 sys sys 1108913524 274131
 386/bin/upas/smtpd - 775 sys sys 1108268391 329286
 386/bin/upas/spam - 775 sys sys 1064598366 36
 386/bin/upas/testscan - 775 sys sys 1104122077 83668
@@ -490,7 +490,7 @@
 386/bin/venti/verifyarena - 775 sys sys 1104122086 104270
 386/bin/venti/wrarena - 775 sys sys 1104122086 176179
 386/bin/venti/write - 775 sys sys 1104122087 102499
-386/bin/vncs - 775 sys sys 1108354567 471309
+386/bin/vncs - 775 sys sys 1108960018 471461
 386/bin/vncv - 775 sys sys 1104122089 518584
 386/bin/vt - 775 sys sys 1106799182 172859
 386/bin/vtdump - 775 sys sys 1104122090 159451
@@ -503,8 +503,8 @@
 386/bin/xd - 775 sys sys 1104122093 64039
 386/bin/xmr - 775 sys sys 1104122093 40157
 386/bin/xms - 775 sys sys 1104122093 40735
-386/bin/yacc - 775 sys sys 1104122094 101853
-386/bin/yuv - 775 sys sys 1108872012 149508
+386/bin/yacc - 775 sys sys 1108960018 102005
+386/bin/yuv - 775 sys sys 1108960019 149884
 386/bin/zip - 775 sys sys 1104122094 89990
 386/include - 20000000775 sys sys 953243048 0
 386/include/ape - 20000000775 sys sys 944946041 0
@@ -534,7 +534,7 @@
 386/lib/libauthsrv.a - 664 sys sys 1108268394 33778
 386/lib/libbin.a - 664 sys sys 1108268394 2534
 386/lib/libbio.a - 664 sys sys 1108268394 26078
-386/lib/libc.a - 664 sys sys 1108354571 502104
+386/lib/libc.a - 664 sys sys 1108960020 502516
 386/lib/libcomplete.a - 664 sys sys 1108268395 6370
 386/lib/libcontrol.a - 664 sys sys 1108699738 274922
 386/lib/libdisk.a - 664 sys sys 1108268396 42234
@@ -616,8 +616,8 @@ acme/acid/mips - 20000000775 sys sys 1015011246 0
 acme/acid/sparc - 20000000775 sys sys 1015011246 0
 acme/bin - 20000000775 sys sys 1017457907 0
 acme/bin/386 - 20000000775 sys sys 1015011570 0
-acme/bin/386/News - 775 sys sys 1104122115 128661
-acme/bin/386/Wiki - 775 sys sys 1106107677 126761
+acme/bin/386/News - 775 sys sys 1108960019 128813
+acme/bin/386/Wiki - 775 sys sys 1108960019 126913
 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 1104122115 38959
@@ -9569,11 +9569,11 @@ sys/src/cmd/jpg/gif.c - 664 sys sys 1045505400 8844
 sys/src/cmd/jpg/ico.c - 664 sys sys 1072107030 8799
 sys/src/cmd/jpg/imagefile.h - 664 sys sys 988225303 2246
 sys/src/cmd/jpg/jpegdump.c - 664 sys sys 1018802871 7161
-sys/src/cmd/jpg/jpg.c - 664 sys sys 1108852825 7394
+sys/src/cmd/jpg/jpg.c - 664 sys sys 1108938203 7411
 sys/src/cmd/jpg/mkfile - 664 sys sys 1079970080 1056
 sys/src/cmd/jpg/multichan.c - 664 sys sys 1039753047 825
 sys/src/cmd/jpg/onechan.c - 664 sys sys 1039753044 3732
-sys/src/cmd/jpg/png.c - 664 sys sys 1108853800 4818
+sys/src/cmd/jpg/png.c - 664 sys sys 1108939730 4834
 sys/src/cmd/jpg/ppm.c - 664 sys sys 1108852826 4204
 sys/src/cmd/jpg/readbmp.c - 664 sys sys 1105455271 13691
 sys/src/cmd/jpg/readgif.c - 664 sys sys 1014926433 10306
@@ -9587,7 +9587,7 @@ sys/src/cmd/jpg/togif.c - 664 sys sys 944961292 2828
 sys/src/cmd/jpg/toico.c - 664 sys sys 1072107030 5638
 sys/src/cmd/jpg/topng.c - 664 sys sys 988225303 1116
 sys/src/cmd/jpg/toppm.c - 664 sys sys 944961292 1571
-sys/src/cmd/jpg/torgbv.c - 664 sys sys 1067719080 6443
+sys/src/cmd/jpg/torgbv.c - 664 sys sys 1108938204 7118
 sys/src/cmd/jpg/totruecolor.c - 664 sys sys 1014926434 3407
 sys/src/cmd/jpg/writegif.c - 664 sys sys 1014926434 10727
 sys/src/cmd/jpg/writepng.c - 664 sys sys 1108851604 4556
@@ -10269,23 +10269,23 @@ sys/src/cmd/sam/address.c - 664 sys sys 944961628 3985
 sys/src/cmd/sam/buff.c - 664 sys sys 1014926937 5161
 sys/src/cmd/sam/cmd.c - 664 sys sys 944961628 10461
 sys/src/cmd/sam/disk.c - 664 sys sys 1014926938 1988
-sys/src/cmd/sam/error.c - 664 sys sys 1017166329 2228
+sys/src/cmd/sam/error.c - 664 sys sys 1108939612 2222
 sys/src/cmd/sam/errors.h - 664 sys sys 944961628 695
 sys/src/cmd/sam/file.c - 664 sys sys 1045505553 11030
 sys/src/cmd/sam/io.c - 664 sys sys 1017166329 4414
 sys/src/cmd/sam/list.c - 664 sys sys 944961628 858
 sys/src/cmd/sam/mesg.c - 664 sys sys 1063854937 14046
 sys/src/cmd/sam/mesg.h - 664 sys sys 1014926938 3773
-sys/src/cmd/sam/mkfile - 664 sys sys 944961628 498
+sys/src/cmd/sam/mkfile - 664 sys sys 1108939611 559
 sys/src/cmd/sam/moveto.c - 664 sys sys 944961628 2698
 sys/src/cmd/sam/multi.c - 664 sys sys 944961628 1846
 sys/src/cmd/sam/parse.h - 664 sys sys 944961629 1910
-sys/src/cmd/sam/plan9.c - 664 sys sys 1014926938 2803
+sys/src/cmd/sam/plan9.c - 664 sys sys 1108939612 2860
 sys/src/cmd/sam/rasp.c - 664 sys sys 950104640 5618
 sys/src/cmd/sam/regexp.c - 664 sys sys 944961629 15390
 sys/src/cmd/sam/sam.c - 664 sys sys 1017166330 12190
-sys/src/cmd/sam/sam.h - 664 sys sys 1017166330 9582
-sys/src/cmd/sam/shell.c - 664 sys sys 988225302 3112
+sys/src/cmd/sam/sam.h - 664 sys sys 1108939611 9584
+sys/src/cmd/sam/shell.c - 664 sys sys 1108939613 3149
 sys/src/cmd/sam/string.c - 664 sys sys 944961629 2766
 sys/src/cmd/sam/sys.c - 664 sys sys 1014926939 745
 sys/src/cmd/sam/util.c - 664 sys sys 944961629 766
@@ -10932,8 +10932,8 @@ sys/src/cmd/upas/send/translate.c - 664 sys sys 944961322 804
 sys/src/cmd/upas/send/tryit - 664 sys sys 944961322 584
 sys/src/cmd/upas/smtp - 20000000775 sys sys 988250017 0
 sys/src/cmd/upas/smtp/greylist.c - 664 sys sys 1091126808 6470
-sys/src/cmd/upas/smtp/mkfile - 664 sys sys 1108828019 746
-sys/src/cmd/upas/smtp/mxdial.c - 664 sys sys 1105114609 6024
+sys/src/cmd/upas/smtp/mkfile - 664 sys sys 1108910002 801
+sys/src/cmd/upas/smtp/mxdial.c - 664 sys sys 1108875334 6251
 sys/src/cmd/upas/smtp/rfc822.y - 664 sys sys 1064589606 13417
 sys/src/cmd/upas/smtp/rmtdns.c - 664 sys sys 1015013150 1069
 sys/src/cmd/upas/smtp/smtp.c - 664 sys sys 1108827987 20071
@@ -11738,7 +11738,7 @@ sys/src/libc/port/charstod.c - 664 sys sys 1014927395 1641
 sys/src/libc/port/cistrcmp.c - 664 sys sys 1014927395 323
 sys/src/libc/port/cistrncmp.c - 664 sys sys 1019240175 366
 sys/src/libc/port/cistrstr.c - 664 sys sys 1014927395 357
-sys/src/libc/port/cleanname.c - 664 sys sys 1014927395 1199
+sys/src/libc/port/cleanname.c - 664 sys sys 1108937861 1537
 sys/src/libc/port/crypt.c - 664 sys sys 1014927396 1045
 sys/src/libc/port/ctype.c - 664 sys sys 1014927396 834
 sys/src/libc/port/encodefmt.c - 664 sys sys 1071289162 1100

+ 49 - 0
dist/replica/plan9.log

@@ -13708,3 +13708,52 @@
 1108872029 3 c 386/bin/ppm - 775 sys sys 1108872012 148971
 1108872029 4 c 386/bin/bmp - 775 sys sys 1108872009 157219
 1108872029 5 c 386/bin/yuv - 775 sys sys 1108872012 149508
+1108875631 0 c sys/src/cmd/upas/smtp/mkfile - 664 sys sys 1108875057 755
+1108875631 1 c sys/src/cmd/upas/smtp/mxdial.c - 664 sys sys 1108875334 6251
+1108911638 0 c sys/src/cmd/upas/smtp/mkfile - 664 sys sys 1108910002 801
+1108915239 0 c 386/bin/upas/smtp - 775 sys sys 1108913524 274131
+1108938645 0 c sys/src/cmd/jpg/jpg.c - 664 sys sys 1108938203 7411
+1108938645 1 c sys/src/cmd/jpg/png.c - 664 sys sys 1108938204 4834
+1108938645 2 c sys/src/cmd/jpg/torgbv.c - 664 sys sys 1108938204 7118
+1108938645 3 c sys/src/libc/port/cleanname.c - 664 sys sys 1108937861 1537
+1108940445 0 c sys/src/cmd/jpg/png.c - 664 sys sys 1108939730 4834
+1108940445 1 c sys/src/cmd/sam/error.c - 664 sys sys 1108939612 2222
+1108940445 2 c sys/src/cmd/sam/mkfile - 664 sys sys 1108939611 559
+1108940445 3 c sys/src/cmd/sam/plan9.c - 664 sys sys 1108939612 2860
+1108940445 4 c sys/src/cmd/sam/sam.h - 664 sys sys 1108939611 9584
+1108940445 5 c sys/src/cmd/sam/shell.c - 664 sys sys 1108939613 3149
+1108960249 0 c 386/bin/acid - 775 sys sys 1108960003 355983
+1108960249 1 c 386/bin/acme - 775 sys sys 1108960004 428209
+1108960249 2 c 386/bin/cleanname - 775 sys sys 1108960005 58304
+1108960249 3 c 386/bin/db - 775 sys sys 1108960006 302393
+1108960249 4 c 386/bin/png - 775 sys sys 1108960012 164172
+1108960249 5 c 386/bin/snap - 775 sys sys 1108960014 269837
+1108960249 6 c 386/bin/snapfs - 775 sys sys 1108960015 338691
+1108960249 7 c 386/bin/vncs - 775 sys sys 1108960018 471461
+1108960249 8 c 386/bin/gif - 775 sys sys 1108960006 158063
+1108960249 9 c 386/bin/jpg - 775 sys sys 1108960009 174528
+1108960249 10 c 386/bin/kprof - 775 sys sys 1108960009 99723
+1108960249 11 c 386/bin/ktrace - 775 sys sys 1108960009 113674
+1108960249 12 c 386/bin/ls - 775 sys sys 1108960010 82464
+1108960249 13 c 386/bin/mk - 775 sys sys 1108960010 144090
+1108960249 14 c 386/bin/nm - 775 sys sys 1108960010 115737
+1108960249 15 c 386/bin/page - 775 sys sys 1108960011 231866
+1108960249 16 c 386/bin/plumber - 775 sys sys 1108960011 169863
+1108960249 17 c 386/bin/ppm - 775 sys sys 1108960012 149347
+1108960249 18 c 386/bin/prof - 775 sys sys 1108960012 104466
+1108960249 19 c 386/bin/rio - 775 sys sys 1108960013 308970
+1108960249 20 c 386/bin/sam - 775 sys sys 1108960013 158001
+1108960249 21 c 386/bin/bmp - 775 sys sys 1108960005 157595
+1108960249 22 c 386/bin/ip/ftpd - 775 sys sys 1108960006 169202
+1108960249 23 c 386/bin/ip/httpd/httpd - 775 sys sys 1108960007 290886
+1108960249 24 c 386/bin/ip/httpd/webls - 775 sys sys 1108960008 130898
+1108960249 25 c 386/bin/ip/imap4d - 775 sys sys 1108960008 236497
+1108960249 26 c 386/bin/tar - 775 sys sys 1108960015 95396
+1108960249 27 c 386/bin/togif - 775 sys sys 1108960015 189521
+1108960249 28 c 386/bin/tprof - 775 sys sys 1108960016 255319
+1108960249 29 c 386/bin/upas/pop3 - 775 sys sys 1108960017 260349
+1108960249 30 c 386/bin/yacc - 775 sys sys 1108960018 102005
+1108960249 31 c 386/bin/yuv - 775 sys sys 1108960019 149884
+1108960249 32 c 386/lib/libc.a - 664 sys sys 1108960020 502516
+1108960249 33 c acme/bin/386/News - 775 sys sys 1108960019 128813
+1108960249 34 c acme/bin/386/Wiki - 775 sys sys 1108960019 126913

+ 9 - 7
sys/src/cmd/jpg/jpg.c

@@ -259,16 +259,18 @@ rpt:	array = Breadjpg(&b, colorspace);
 	c = nil;
 	if(jflag)
 		goto Return;
-	if(!dflag && !inited){
-		if(initdraw(0, 0, 0) < 0){
-			fprint(2, "jpg: initdraw failed: %r\n");
-			return "initdraw";
+	if(!dflag){
+		if (!inited) {
+			if(initdraw(0, 0, 0) < 0){
+				fprint(2, "jpg: initdraw failed: %r\n");
+				return "initdraw";
+			}
+			if(Fflag == 0)
+				einit(Ekeyboard|Emouse);
+			inited++;
 		}
-		if(Fflag == 0)
-			einit(Ekeyboard|Emouse);
 		if(defaultcolor && screen->depth>8 && outchan==CMAP8)
 			outchan = RGB24;
-		inited++;
 	}
 	if(outchan == CMAP8)
 		c = torgbv(r, !eflag);

+ 9 - 7
sys/src/cmd/jpg/png.c

@@ -154,15 +154,17 @@ show(int fd, char *name, int outc)
 	Bterm(&b);
 
 	r = array[0];
-	if(!dflag && !inited){
-		if(initdraw(0, 0, 0) < 0){
-			fprint(2, "png: initdraw failed: %r\n");
-			return "initdraw";
+	if(!dflag){
+		if (!inited) {
+			if(initdraw(0, 0, 0) < 0){
+				fprint(2, "png: initdraw failed: %r\n");
+				return "initdraw";
+			}
+			einit(Ekeyboard|Emouse);
+			inited++;
 		}
-		einit(Ekeyboard|Emouse);
 		if(defaultcolor && screen->depth>8 && outchan==CMAP8)
 			outchan = RGB24;
-		inited++;
 	}
 	if(outchan == CMAP8)
 		c = torgbv(r, !eflag);
@@ -198,7 +200,7 @@ show(int fd, char *name, int outc)
 			return "loadimage";
 		}
 		i2 = allocimage(display, c->r, outchan, 0, 0);
-		draw(i2, i2->r, display->white, nil, ZP);
+		draw(i2, i2->r, display->black, nil, ZP);
 		draw(i2, i2->r, i, nil, i->r.min);
 		image = i2;
 		eresized(0);

+ 53 - 13
sys/src/cmd/jpg/torgbv.c

@@ -32,6 +32,7 @@ torgbv(Rawimage *i, int errdiff)
 	int j, k, rgb, x, y, er, eg, eb, col, t;
 	int r, g, b, r1, g1, b1;
 	int *ered, *egrn, *eblu, *rp, *gp, *bp;
+	int bpc;
 	uint *map3;
 	uchar *closest;
 	Rawimage *im;
@@ -173,26 +174,52 @@ torgbv(Rawimage *i, int errdiff)
 		break;
 
 	case CYCbCr:
+		bpc = 1;
+		rpic = i->chans[0];
+		gpic = i->chans[1];
+		bpic = i->chans[2];
 		closest = closestycbcr;
 		map3 = ycbcrmap;
+		if(i->nchans != 3)
+			return _remaperror("remap: RGB image has %d channels", i->nchans);
 		goto Threecolor;
 
 	case CRGB:
+		bpc = 1;
+		rpic = i->chans[0];
+		gpic = i->chans[1];
+		bpic = i->chans[2];
+		if(i->nchans != 3)
+			return _remaperror("remap: RGB image has %d channels", i->nchans);
+		goto rgbgen;
+
+	case CRGB24:
+		bpc = 3;
+		bpic = i->chans[0];
+		gpic = i->chans[0] + 1;
+		rpic = i->chans[0] + 2;
+		goto rgbgen;
+
+	case CRGBA32:
+		bpc = 4;
+		/* i->chans[0]+0 is alpha */
+		bpic = i->chans[0] + 1;
+		gpic = i->chans[0] + 2;
+		rpic = i->chans[0] + 3;
+
+	rgbgen:
 		closest = closestrgb;
 		map3 = rgbmap;
 
 	Threecolor:
-		if(i->nchans != 3)
-			return _remaperror("remap: RGB image has %d channels", i->nchans);
-		rpic = i->chans[0];
-		gpic = i->chans[1];
-		bpic = i->chans[2];
+
 		if(errdiff == 0){
-			for(j=0; j<i->chanlen; j++){
+			outp = out;
+			for(j=0; j<i->chanlen; j+=bpc){
 				r = rpic[j]>>4;
 				g = gpic[j]>>4;
 				b = bpic[j]>>4;
-				out[j] = closest[b+16*(g+16*r)];
+				*outp++ = closest[b+16*(g+16*r)];
 			}
 		}else{
 			/* modified floyd steinberg, coefficients (1 0) 3/16, (0, 1) 3/16, (1, 1) 7/16 */
@@ -204,9 +231,12 @@ torgbv(Rawimage *i, int errdiff)
 				gp = egrn;
 				bp = eblu;
 				for(x=0; x<dx; x++){
-					r = *rpic++ + *rp;
-					g = *gpic++ + *gp;
-					b = *bpic++ + *bp;
+					r = *rpic + *rp;
+					g = *gpic + *gp;
+					b = *bpic + *bp;
+					rpic += bpc;
+					gpic += bpc;
+					bpic += bpc;
 					/*
 					 * Errors can be uncorrectable if converting from YCbCr,
 					 * since we can't guarantee that an extremal value of one of
@@ -261,12 +291,21 @@ torgbv(Rawimage *i, int errdiff)
 		}
 		break;
 
+	case CYA16:
+		bpc = 2;
+		/* i->chans[0] + 0 is alpha */
+		rpic = i->chans[0] + 1;
+		goto greygen;
+
 	case CY:
+		bpc = 1;
+		rpic = i->chans[0];
 		if(i->nchans != 1)
 			return _remaperror("remap: Y image has %d chans", i->nchans);
-		rpic = i->chans[0];
+
+	greygen:
 		if(errdiff == 0){
-			for(j=0; j<i->chanlen; j++){
+			for(j=0; j<i->chanlen; j+=bpc){
 				r = rpic[j]>>4;
 				*outp++ = closestrgb[r+16*(r+16*r)];
 			}
@@ -276,7 +315,8 @@ torgbv(Rawimage *i, int errdiff)
 				er = 0;
 				rp = ered;
 				for(x=0; x<dx; x++){
-					r = *inp++ + *rp;
+					r = *rpic + *rp;
+					rpic += bpc;
 					r1 = clamp[r+CLAMPOFF];
 					col = closestrgb[r1+16*(r1+16*r1)];
 					*outp++ = col;

+ 1 - 1
sys/src/cmd/sam/error.c

@@ -63,7 +63,7 @@ static char *wmsg[]={
 	"null characters elided",
 	"can't run pwd",
 	"last char not newline",
-	"exit status not 0",
+	"exit status",
 };
 
 void

+ 7 - 0
sys/src/cmd/sam/mkfile

@@ -27,6 +27,13 @@ HFILES=sam.h\
 	mesg.h\
 
 BIN=/$objtype/bin
+
+UPDATE=\
+	mkfile\
+	parse.h\
+	$HFILES\
+	${OFILES:%.$O=%.c}\
+
 </sys/src/cmd/mkone
 
 address.$O cmd.$O parse.$O xec.$O unix.$O:	parse.h

+ 5 - 4
sys/src/cmd/sam/plan9.c

@@ -139,22 +139,23 @@ newtmp(int num)
 	return fd;
 }
 
-int
+char*
 waitfor(int pid)
 {
-	int msg;
 	Waitmsg *w;
+	static char msg[ERRMAX];
 
 	while((w = wait()) != nil){
 		if(w->pid != pid){
 			free(w);
 			continue;
 		}
-		msg = (w->msg[0] != '\0');
+		strecpy(msg, msg+sizeof msg, w->msg);
 		free(w);
 		return msg;
 	}
-	return -1;
+	rerrstr(msg, sizeof msg);
+	return msg;
 }
 
 void

+ 1 - 1
sys/src/cmd/sam/sam.h

@@ -323,7 +323,7 @@ void	trytoclose(File*);
 void	trytoquit(void);
 int	undo(int);
 void	update(void);
-int	waitfor(int);
+char	*waitfor(int);
 void	warn(Warn);
 void	warn_s(Warn, char*);
 void	warn_SS(Warn, String*, String*);

+ 5 - 4
sys/src/cmd/sam/shell.c

@@ -15,6 +15,7 @@ plan9(File *f, int type, String *s, int nest)
 	int m;
 	int pid, fd;
 	int retcode;
+	char *retmsg;
 	int pipe1[2], pipe2[2];
 
 	if(s->s[0]==0 && plan9cmd.s[0]==0)
@@ -115,15 +116,15 @@ plan9(File *f, int type, String *s, int nest)
 		bpipeok = 0;
 		closeio((Posn)-1);
 	}
-	retcode = waitfor(pid);
+	retmsg = waitfor(pid);
 	if(type=='|' || type=='<')
-		if(retcode!=0)
-			warn(Wbadstatus);
+		if(retmsg[0]!=0)
+			warn_s(Wbadstatus, retmsg);
 	if(downloaded)
 		checkerrs();
 	if(!nest)
 		dprint("!\n");
-	return retcode;
+	return retmsg[0] ? -1 : 0;
 }
 
 void

+ 8 - 2
sys/src/cmd/upas/smtp/mkfile

@@ -4,6 +4,7 @@ TARG = smtpd\
 	smtp\
 
 OFILES=
+
 LIB=../common/libcommon.a$O\
 
 HFILES=../common/common.h\
@@ -13,16 +14,21 @@ HFILES=../common/common.h\
 
 BIN=/$objtype/bin/upas
 UPDATE=\
+	greylist.c\
 	mkfile\
+	mxdial.c\
+	rfc822.y\
+	rmtdns.c\
+	smtpd.y\
+	spam.c\
 	$HFILES\
 	${OFILES:%.$O=%.c}\
-	smtpd.y\
 	${TARG:%=%.c}\
 
 </sys/src/cmd/mkmany
 CFLAGS=$CFLAGS -I../common -D'SPOOL="/mail"'
 
-$O.smtpd:	smtpd.tab.$O rmtdns.$O spam.$O rfc822.tab.$O greylist.$O mxdial.$O
+$O.smtpd:	smtpd.tab.$O rmtdns.$O spam.$O rfc822.tab.$O greylist.$O
 $O.smtp:	rfc822.tab.$O mxdial.$O
 
 smtpd.$O: 	smtpd.h

+ 14 - 3
sys/src/libc/port/cleanname.c

@@ -9,9 +9,10 @@ char*
 cleanname(char *name)
 {
 	char *p, *q, *dotdot;
-	int rooted;
+	int rooted, erasedprefix;
 
 	rooted = name[0] == '/';
+	erasedprefix = 0;
 
 	/*
 	 * invariants:
@@ -24,9 +25,11 @@ cleanname(char *name)
 	while(*p) {
 		if(p[0] == '/')	/* null element */
 			p++;
-		else if(p[0] == '.' && SEP(p[1]))
+		else if(p[0] == '.' && SEP(p[1])) {
+			if(p == name)
+				erasedprefix = 1;
 			p += 1;	/* don't count the separator in case it is nul */
-		else if(p[0] == '.' && p[1] == '.' && SEP(p[2])) {
+		} else if(p[0] == '.' && p[1] == '.' && SEP(p[2])) {
 			p += 2;
 			if(q > dotdot) {	/* can backtrack */
 				while(--q > dotdot && *q != '/')
@@ -38,6 +41,8 @@ cleanname(char *name)
 				*q++ = '.';
 				dotdot = q;
 			}
+			if(q == name)
+				erasedprefix = 1;	/* erased entire path via dotdot */
 		} else {	/* real path element */
 			if(q != name+rooted)
 				*q++ = '/';
@@ -48,5 +53,11 @@ cleanname(char *name)
 	if(q == name)	/* empty string is really ``.'' */
 		*q++ = '.';
 	*q = '\0';
+	if(erasedprefix && name[0] == '#'){	
+		/* this was not a #x device path originally - make it not one now */
+		memmove(name+2, name, strlen(name)+1);
+		name[0] = '.';
+		name[1] = '/';
+	}
 	return name;
 }