Browse Source

Plan 9 from Bell Labs 2004-12-21

David du Colombier 17 years ago
parent
commit
033845f875

+ 44 - 15
dist/replica/_plan9.db

@@ -458,8 +458,8 @@
 386/bin/upas/unspam - 775 sys sys 1064598367 38
 386/bin/upas/vf - 775 sys sys 1102171775 92588
 386/bin/usb - 20000000775 sys sys 1019538890 0
-386/bin/usb/usbaudio - 775 sys sys 1102171775 185327
-386/bin/usb/usbd - 775 sys sys 1102171776 129710
+386/bin/usb/usbaudio - 775 sys sys 1103515801 185428
+386/bin/usb/usbd - 775 sys sys 1103515801 129811
 386/bin/usb/usbmouse - 775 sys sys 1102171776 140210
 386/bin/usb/usbprinter - 775 sys sys 1089408719 222
 386/bin/vac - 775 sys sys 1102171777 169357
@@ -3448,7 +3448,7 @@ sys/include/frame.h - 664 sys sys 1014929063 2666
 sys/include/geometry.h - 664 sys sys 1014929063 2632
 sys/include/html.h - 664 sys sys 1091904420 15220
 sys/include/httpd.h - 664 sys sys 1091904418 5771
-sys/include/ip.h - 664 sys sys 1089299185 2958
+sys/include/ip.h - 664 sys sys 1103554773 2989
 sys/include/keyboard.h - 664 sys sys 1079577798 815
 sys/include/libc.h - 664 sys sys 1102093062 19516
 sys/include/libsec.h - 664 sys sys 1084318867 9264
@@ -4876,7 +4876,7 @@ sys/man/2/hypot - 664 sys sys 944959693 302
 sys/man/2/intmap - 664 sys sys 1015091523 2622
 sys/man/2/ioproc - 664 sys sys 1030549010 3068
 sys/man/2/iounit - 664 sys sys 1015091523 1001
-sys/man/2/ip - 664 sys sys 1089213089 7136
+sys/man/2/ip - 664 sys sys 1103554773 7276
 sys/man/2/isalpharune - 664 sys sys 1015091523 1059
 sys/man/2/keyboard - 664 sys sys 950892860 2065
 sys/man/2/lock - 664 sys sys 1048643958 4692
@@ -4959,7 +4959,7 @@ sys/man/3/ether - 664 sys sys 984709635 2563
 sys/man/3/floppy - 664 sys sys 954378905 881
 sys/man/3/fs - 664 sys sys 1055701106 2706
 sys/man/3/i82365 - 664 sys sys 954378906 884
-sys/man/3/ip - 664 sys sys 1019858396 21625
+sys/man/3/ip - 664 sys sys 1103554774 21677
 sys/man/3/kbmap - 644 sys sys 1079463778 1331
 sys/man/3/kprof - 664 sys sys 1018029972 1377
 sys/man/3/loopback - 664 sys sys 964662153 1995
@@ -5274,7 +5274,7 @@ sys/src/9/boot/sac.c - 664 sys sys 1015012530 802
 sys/src/9/boot/settime.c - 664 sys sys 1036813626 2473
 sys/src/9/boot/testboot.c - 664 sys sys 1039763734 496
 sys/src/9/ip - 20000000775 sys sys 1015278450 0
-sys/src/9/ip/arp.c - 664 sys sys 1078928097 10687
+sys/src/9/ip/arp.c - 664 sys sys 1103554772 11345
 sys/src/9/ip/chandial.c - 664 sys sys 1099020048 2295
 sys/src/9/ip/devip.c - 664 sys sys 1084331653 24164
 sys/src/9/ip/eipconvtest.c - 664 sys sys 1022588098 3135
@@ -6784,7 +6784,7 @@ sys/src/cmd/acid/print.c - 664 sys sys 984756705 6840
 sys/src/cmd/acid/proc.c - 664 sys sys 1014924908 4513
 sys/src/cmd/acid/util.c - 664 sys sys 944960738 4297
 sys/src/cmd/acme - 20000000775 sys sys 969511023 0
-sys/src/cmd/acme/acme.c - 664 sys sys 1101910760 19489
+sys/src/cmd/acme/acme.c - 664 sys sys 1103565436 19635
 sys/src/cmd/acme/addr.c - 664 sys sys 1018553456 4787
 sys/src/cmd/acme/buff.c - 664 sys sys 1014926092 5573
 sys/src/cmd/acme/cols.c - 664 sys sys 1079102914 11126
@@ -6801,7 +6801,7 @@ sys/src/cmd/acme/fsys.c - 664 sys sys 1079102915 12799
 sys/src/cmd/acme/look.c - 664 sys sys 1077376257 14213
 sys/src/cmd/acme/mkfile - 664 sys sys 1058463682 543
 sys/src/cmd/acme/regx.c - 664 sys sys 1014926094 16057
-sys/src/cmd/acme/rows.c - 664 sys sys 1101910761 14683
+sys/src/cmd/acme/rows.c - 664 sys sys 1103565437 14702
 sys/src/cmd/acme/scrl.c - 664 sys sys 1014926095 3072
 sys/src/cmd/acme/text.c - 664 sys sys 1099500744 27642
 sys/src/cmd/acme/time.c - 664 sys sys 1014926095 1783
@@ -9429,7 +9429,7 @@ sys/src/cmd/ip/ftpfs/file.c - 664 sys sys 1014925642 4208
 sys/src/cmd/ip/ftpfs/ftpfs.c - 664 sys sys 1093452873 13584
 sys/src/cmd/ip/ftpfs/ftpfs.h - 664 sys sys 1091904423 2353
 sys/src/cmd/ip/ftpfs/mkfile - 664 sys sys 1048312050 173
-sys/src/cmd/ip/ftpfs/proto.c - 664 sys sys 1089920400 29348
+sys/src/cmd/ip/ftpfs/proto.c - 664 sys sys 1103565527 29470
 sys/src/cmd/ip/glob.c - 664 sys sys 1101155057 3290
 sys/src/cmd/ip/glob.h - 664 sys sys 1101155058 308
 sys/src/cmd/ip/gping.c - 664 sys sys 1015013112 20476
@@ -11302,7 +11302,7 @@ sys/src/games/sokoban/route.c - 664 sys sys 1102439103 3684
 sys/src/games/sokoban/sokoban.c - 664 sys sys 1102439104 5540
 sys/src/games/sokoban/sokoban.h - 664 sys sys 1102439105 1876
 sys/src/lib9p - 20000000775 sys sys 1015023311 0
-sys/src/lib9p/_post.c - 664 sys sys 1044836326 1641
+sys/src/lib9p/_post.c - 664 sys sys 1103565871 1642
 sys/src/lib9p/dirread.c - 664 sys sys 1015023310 641
 sys/src/lib9p/fid.c - 664 sys sys 1089299187 1066
 sys/src/lib9p/file.c - 664 sys sys 1086896814 5585
@@ -11311,12 +11311,12 @@ sys/src/lib9p/intmap.c - 664 sys sys 1016833881 2255
 sys/src/lib9p/mem.c - 664 sys sys 1015023310 765
 sys/src/lib9p/mkfile - 664 sys sys 1035389775 371
 sys/src/lib9p/parse.c - 664 sys sys 1032324435 2050
-sys/src/lib9p/post.c - 664 sys sys 1044429937 364
+sys/src/lib9p/post.c - 664 sys sys 1103565871 356
 sys/src/lib9p/post.h - 664 sys sys 1029850260 201
 sys/src/lib9p/ramfs.c - 664 sys sys 1030450927 2534
 sys/src/lib9p/req.c - 664 sys sys 1089299187 1652
 sys/src/lib9p/srv.c - 664 sys sys 1050583820 16705
-sys/src/lib9p/tpost.c - 664 sys sys 1044429939 324
+sys/src/lib9p/tpost.c - 664 sys sys 1103565872 316
 sys/src/lib9p/uid.c - 664 sys sys 1015023311 517
 sys/src/lib9p/util.c - 664 sys sys 1017679319 465
 sys/src/libString - 20000000775 sys sys 984754301 0
@@ -11952,7 +11952,7 @@ sys/src/libip - 20000000775 sys sys 1016901402 0
 sys/src/libip/bo.c - 664 sys sys 1089213099 811
 sys/src/libip/classmask.c - 664 sys sys 944961726 622
 sys/src/libip/eipfmt.c - 664 sys sys 1014927942 2194
-sys/src/libip/equivip.c - 664 sys sys 944961726 146
+sys/src/libip/equivip.c - 664 sys sys 1103554773 285
 sys/src/libip/ip.h - 664 sys sys 944961727 1438
 sys/src/libip/ipaux.c - 664 sys sys 985038059 1515
 sys/src/libip/mkfile - 664 sys sys 1065576347 320
@@ -12395,5 +12395,34 @@ usr/glenda/lib/profile - 664 glenda glenda 1021580005 847
 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/usb/usbaudio - 775 sys sys 1103515801 185428
-386/bin/usb/usbd - 775 sys sys 1103515801 129811
+386/9loaddebug - 775 sys sys 1103602426 299841
+386/9pc - 775 sys sys 1103602433 1833348
+386/9pccpu - 775 sys sys 1103602438 1488341
+386/9pcdisk - 775 sys sys 1103602445 2038738
+386/9pcf - 775 sys sys 1103602452 2371797
+386/bin/acme - 775 sys sys 1103602411 427241
+386/bin/archfs - 775 sys sys 1103602412 140744
+386/bin/cdfs - 775 sys sys 1103602415 161053
+386/bin/nntpfs - 775 sys sys 1103602419 160863
+386/bin/snapfs - 775 sys sys 1103602421 338429
+386/bin/webcookies - 775 sys sys 1103602422 161470
+386/bin/wikifs - 775 sys sys 1103602424 201134
+386/bin/ftpfs - 775 sys sys 1103602416 154362
+386/bin/rdbfs - 775 sys sys 1103602419 168361
+386/bin/webfs - 775 sys sys 1103602423 349695
+386/bin/auth/factotum - 775 sys sys 1103602412 313832
+386/bin/aux/apm - 775 sys sys 1103602413 174060
+386/bin/aux/disksim - 775 sys sys 1103602413 144313
+386/bin/aux/flashfs - 775 sys sys 1103602414 160251
+386/bin/aux/olefs - 775 sys sys 1103602414 143224
+386/bin/aux/stub - 775 sys sys 1103602414 135027
+386/bin/execnet - 775 sys sys 1103602415 171861
+386/bin/ext2srv - 775 sys sys 1103602416 173859
+386/bin/mntgen - 775 sys sys 1103602417 135427
+386/bin/nfs - 775 sys sys 1103602418 315354
+386/bin/sshnet - 775 sys sys 1103602422 282682
+386/lib/lib9p.a - 664 sys sys 1103602453 79300
+386/lib/libip.a - 664 sys sys 1103602453 35602
+386/lib/libndb.a - 664 sys sys 1103602454 60666
+386/lib/libsunrpc.a - 664 sys sys 1103602455 355994
+acme/bin/386/win - 775 sys sys 1103602453 178910

+ 42 - 42
dist/replica/plan9.db

@@ -1,15 +1,15 @@
 386 - 20000000775 sys sys 1010957353 0
 386/9load - 775 sys sys 1100269948 208708
-386/9loaddebug - 775 sys sys 1102998038 299841
+386/9loaddebug - 775 sys sys 1103602426 299841
 386/9loadlite - 775 sys sys 1100269949 132260
 386/9loadlitedebug - 775 sys sys 1102998039 194712
-386/9pc - 775 sys sys 1102825222 1832889
+386/9pc - 775 sys sys 1103602433 1833348
 386/9pc.gz - 664 sys sys 1077049336 635727
-386/9pccpu - 775 sys sys 1102825226 1487882
+386/9pccpu - 775 sys sys 1103602438 1488341
 386/9pccpu.gz - 664 sys sys 1077049387 519909
-386/9pcdisk - 775 sys sys 1102825230 2038279
+386/9pcdisk - 775 sys sys 1103602445 2038738
 386/9pcdisk.gz - 664 sys sys 1040006345 703136
-386/9pcf - 775 sys sys 1102825235 2371314
+386/9pcf - 775 sys sys 1103602452 2371797
 386/9pcf.gz - 664 sys sys 1077049490 872650
 386/9pxeload - 775 sys sys 1100269949 208708
 386/_9pcdisk.gz - 664 sys sys 1039764191 695837
@@ -20,7 +20,7 @@
 386/bin/9660srv - 775 sys sys 1102171648 103938
 386/bin/aan - 775 sys sys 1102171649 130675
 386/bin/acid - 775 sys sys 1102171650 355721
-386/bin/acme - 775 sys sys 1102171651 427083
+386/bin/acme - 775 sys sys 1103602411 427241
 386/bin/ape - 20000000775 sys sys 1016944144 0
 386/bin/ape/basename - 775 sys sys 1087442501 132681
 386/bin/ape/cc - 775 sys sys 1102171651 70256
@@ -39,7 +39,7 @@
 386/bin/ape/uname - 775 sys sys 1087442505 132510
 386/bin/aquarela - 775 sys sys 1064598027 319170
 386/bin/ar - 775 sys sys 1102171652 107403
-386/bin/archfs - 775 sys sys 1102171652 140744
+386/bin/archfs - 775 sys sys 1103602412 140744
 386/bin/ascii - 775 sys sys 1102171653 64633
 386/bin/astro - 775 sys sys 1085076975 138775
 386/bin/auth - 20000000775 sys sys 1016920815 0
@@ -53,7 +53,7 @@
 386/bin/auth/debug - 775 sys sys 1102171656 101029
 386/bin/auth/disable - 775 sys sys 1020319057 146
 386/bin/auth/enable - 775 sys sys 1020319057 134
-386/bin/auth/factotum - 775 sys sys 1102393465 313832
+386/bin/auth/factotum - 775 sys sys 1103602412 313832
 386/bin/auth/fgui - 775 sys sys 1102171657 217758
 386/bin/auth/guard.srv - 775 sys sys 1102171658 142815
 386/bin/auth/iam - 775 sys sys 1085076981 50791
@@ -85,7 +85,7 @@
 386/bin/aux/accupoint - 775 sys sys 1085076988 40013
 386/bin/aux/acidleak - 775 sys sys 1102171665 69382
 386/bin/aux/antiword - 775 sys sys 1070288096 511478
-386/bin/aux/apm - 775 sys sys 1102171665 174060
+386/bin/aux/apm - 775 sys sys 1103602413 174060
 386/bin/aux/astarld - 775 sys sys 1102171666 64657
 386/bin/aux/cddb - 775 sys sys 1102171666 71959
 386/bin/aux/clog - 775 sys sys 1102171666 66415
@@ -94,11 +94,11 @@
 386/bin/aux/cropmarks - 775 sys sys 1020319062 1808
 386/bin/aux/data2s - 775 sys sys 1102171667 60502
 386/bin/aux/depend - 775 sys sys 1102171667 145483
-386/bin/aux/disksim - 775 sys sys 1102171668 144313
+386/bin/aux/disksim - 775 sys sys 1103602413 144313
 386/bin/aux/download - 775 sys sys 1087442506 176016
 386/bin/aux/faxreceive - 775 sys sys 1102171668 83901
 386/bin/aux/faxsend - 775 sys sys 1102171668 89413
-386/bin/aux/flashfs - 775 sys sys 1102171669 160251
+386/bin/aux/flashfs - 775 sys sys 1103602414 160251
 386/bin/aux/g3p9bit - 775 sys sys 1102171669 67243
 386/bin/aux/getflags - 775 sys sys 1085076993 43818
 386/bin/aux/grabit - 775 sys sys 1020319063 1244
@@ -120,7 +120,7 @@
 386/bin/aux/na - 775 sys sys 1102171672 154600
 386/bin/aux/nfsmount - 775 sys sys 1102171673 234057
 386/bin/aux/nfsserver - 775 sys sys 1102171674 185376
-386/bin/aux/olefs - 775 sys sys 1102171674 143224
+386/bin/aux/olefs - 775 sys sys 1103602414 143224
 386/bin/aux/p9bitpost - 775 sys sys 1102171674 127939
 386/bin/aux/pcmcia - 775 sys sys 1099800610 46870
 386/bin/aux/pcnfsd - 775 sys sys 1102171675 129304
@@ -137,7 +137,7 @@
 386/bin/aux/sprog - 775 sys sys 1102171677 79314
 386/bin/aux/ssh_genkey - 775 sys sys 1045537957 194629
 386/bin/aux/sshserve - 775 sys sys 1102171678 251446
-386/bin/aux/stub - 775 sys sys 1102171678 135027
+386/bin/aux/stub - 775 sys sys 1103602414 135027
 386/bin/aux/tcpostio - 775 sys sys 1094040084 200808
 386/bin/aux/text2post - 775 sys sys 1102171679 78301
 386/bin/aux/timesync - 775 sys sys 1102171679 127180
@@ -169,7 +169,7 @@
 386/bin/calendar - 775 sys sys 1102171686 79300
 386/bin/cat - 775 sys sys 1085077018 37419
 386/bin/cb - 775 sys sys 1102171686 77484
-386/bin/cdfs - 775 sys sys 1102171687 161053
+386/bin/cdfs - 775 sys sys 1103602415 161053
 386/bin/cfs - 775 sys sys 1102171687 128032
 386/bin/chgrp - 775 sys sys 1102171687 59250
 386/bin/chmod - 775 sys sys 1102171687 62246
@@ -215,9 +215,9 @@
 386/bin/echo - 775 sys sys 1102171697 57320
 386/bin/ed - 775 sys sys 1102171698 92999
 386/bin/eqn - 775 sys sys 1087442511 242933
-386/bin/execnet - 775 sys sys 1102171698 171861
+386/bin/execnet - 775 sys sys 1103602415 171861
 386/bin/exportfs - 775 sys sys 1102171699 161113
-386/bin/ext2srv - 775 sys sys 1102171699 173859
+386/bin/ext2srv - 775 sys sys 1103602416 173859
 386/bin/faces - 775 sys sys 1102171700 192542
 386/bin/factor - 775 sys sys 1102171700 61440
 386/bin/file - 775 sys sys 1102171700 112323
@@ -239,7 +239,7 @@
 386/bin/fs/v10fs - 775 sys sys 1102171705 94272
 386/bin/fs/v6fs - 775 sys sys 1102171706 94190
 386/bin/fs/zipfs - 775 sys sys 1102171706 108787
-386/bin/ftpfs - 775 sys sys 1102171706 148390
+386/bin/ftpfs - 775 sys sys 1103602416 154362
 386/bin/games - 20000000775 sys sys 1096298711 0
 386/bin/games/juggle - 775 sys sys 1096341940 123161
 386/bin/games/mahjongg - 775 sys sys 1096341940 161454
@@ -312,7 +312,7 @@
 386/bin/mkdir - 775 sys sys 1102171729 60929
 386/bin/mkpaqfs - 775 sys sys 1102171729 94474
 386/bin/mkstate - 775 sys sys 1102171729 63484
-386/bin/mntgen - 775 sys sys 1102171730 135427
+386/bin/mntgen - 775 sys sys 1103602417 135427
 386/bin/mount - 775 sys sys 1102171730 72976
 386/bin/ms2html - 775 sys sys 1102171730 103550
 386/bin/mtime - 775 sys sys 1102171730 59104
@@ -332,9 +332,9 @@
 386/bin/netkey - 775 sys sys 1102171735 72272
 386/bin/netstat - 775 sys sys 1102171736 84350
 386/bin/news - 775 sys sys 1102171736 71618
-386/bin/nfs - 775 sys sys 1102171737 315354
+386/bin/nfs - 775 sys sys 1103602418 315354
 386/bin/nm - 775 sys sys 1102171737 115475
-386/bin/nntpfs - 775 sys sys 1102171738 160863
+386/bin/nntpfs - 775 sys sys 1103602419 160863
 386/bin/ns - 775 sys sys 1102171738 65225
 386/bin/p - 775 sys sys 1102171738 64947
 386/bin/page - 775 sys sys 1102171739 231685
@@ -357,7 +357,7 @@
 386/bin/pwd - 775 sys sys 1085077091 36869
 386/bin/ramfs - 775 sys sys 1102171744 88538
 386/bin/rc - 775 sys sys 1102171744 143180
-386/bin/rdbfs - 775 sys sys 1102171745 168361
+386/bin/rdbfs - 775 sys sys 1103602419 168361
 386/bin/read - 775 sys sys 1102171745 58011
 386/bin/replica - 20000000775 sys sys 1018321168 0
 386/bin/replica/applychanges - 775 sys sys 1102171745 98527
@@ -383,7 +383,7 @@
 386/bin/size - 775 sys sys 1102171751 74440
 386/bin/sleep - 775 sys sys 1085077097 3413
 386/bin/snap - 775 sys sys 1102171752 269575
-386/bin/snapfs - 775 sys sys 1102171752 338429
+386/bin/snapfs - 775 sys sys 1103602421 338429
 386/bin/sniffer - 775 sys sys 1038443185 99028
 386/bin/snoopy - 775 sys sys 1102171753 157511
 386/bin/sort - 775 sys sys 1102171753 82250
@@ -393,7 +393,7 @@
 386/bin/srvfs - 775 sys sys 1100579339 39567
 386/bin/srvold9p - 775 sys sys 1102171754 130158
 386/bin/ssh - 775 sys sys 1102171755 210982
-386/bin/sshnet - 775 sys sys 1102171755 282682
+386/bin/sshnet - 775 sys sys 1103602422 282682
 386/bin/stats - 775 sys sys 1102171756 189953
 386/bin/strings - 775 sys sys 1102171756 62089
 386/bin/strip - 775 sys sys 1102171756 61946
@@ -488,10 +488,10 @@
 386/bin/vt - 775 sys sys 1102171788 172830
 386/bin/vtdump - 775 sys sys 1102171789 159416
 386/bin/wc - 775 sys sys 1085077129 41133
-386/bin/webcookies - 775 sys sys 1102171789 161470
-386/bin/webfs - 775 sys sys 1102171790 349695
+386/bin/webcookies - 775 sys sys 1103602422 161470
+386/bin/webfs - 775 sys sys 1103602423 349695
 386/bin/webfsget - 775 sys sys 1085077130 39115
-386/bin/wikifs - 775 sys sys 1102171791 201134
+386/bin/wikifs - 775 sys sys 1103602424 201134
 386/bin/winwatch - 775 sys sys 1102171791 143347
 386/bin/xd - 775 sys sys 1102171791 64004
 386/bin/xmr - 775 sys sys 1085077131 40129
@@ -521,7 +521,7 @@
 386/lib/ape/libregexp.a - 664 sys sys 1089402372 47670
 386/lib/ape/libutf.a - 664 sys sys 1089402372 81266
 386/lib/ape/libv.a - 664 sys sys 1089402372 19668
-386/lib/lib9p.a - 664 sys sys 1102171816 79300
+386/lib/lib9p.a - 664 sys sys 1103602453 79300
 386/lib/libString.a - 664 sys sys 1102171816 22184
 386/lib/libauth.a - 664 sys sys 1102171817 56134
 386/lib/libauthsrv.a - 664 sys sys 1102171817 33522
@@ -537,19 +537,19 @@
 386/lib/libgeometry.a - 664 sys sys 1102171821 50470
 386/lib/libhtml.a - 664 sys sys 1102171822 219972
 386/lib/libhttpd.a - 664 sys sys 1102171822 99488
-386/lib/libip.a - 664 sys sys 1102171822 35268
+386/lib/libip.a - 664 sys sys 1103602453 35602
 386/lib/libl.a - 664 sys sys 1102171822 5384
 386/lib/libmach.a - 664 sys sys 1102171824 652274
 386/lib/libmemdraw.a - 664 sys sys 1102171825 283188
 386/lib/libmemlayer.a - 664 sys sys 1102171825 47360
 386/lib/libmp.a - 664 sys sys 1102171825 79532
-386/lib/libndb.a - 664 sys sys 1102171825 60666
+386/lib/libndb.a - 664 sys sys 1103602454 60666
 386/lib/libplumb.a - 664 sys sys 1102171825 18876
 386/lib/libregexp.a - 664 sys sys 1102171826 37464
 386/lib/libscribble.a - 664 sys sys 1102171826 107280
 386/lib/libsec.a - 664 sys sys 1102171828 643958
 386/lib/libstdio.a - 664 sys sys 1102171828 126382
-386/lib/libsunrpc.a - 664 sys sys 1102171829 355994
+386/lib/libsunrpc.a - 664 sys sys 1103602455 355994
 386/lib/libthread.a - 664 sys sys 1102171830 71162
 386/lib/libventi.a - 664 sys sys 1102171830 97708
 386/mbr - 775 sys sys 1022125974 407
@@ -615,7 +615,7 @@ acme/bin/386/acd - 775 sys sys 1032232412 137068
 acme/bin/386/adict - 775 sys sys 1015011247 99806
 acme/bin/386/mkwnew - 775 sys sys 1085077134 38931
 acme/bin/386/spout - 775 sys sys 1102171815 61582
-acme/bin/386/win - 775 sys sys 1102171815 178910
+acme/bin/386/win - 775 sys sys 1103602453 178910
 acme/bin/Battery - 775 sys sys 1017457907 451
 acme/bin/Isspam - 775 sys sys 1063951165 235
 acme/bin/Perl - 775 sys sys 1015011260 230
@@ -3448,7 +3448,7 @@ sys/include/frame.h - 664 sys sys 1014929063 2666
 sys/include/geometry.h - 664 sys sys 1014929063 2632
 sys/include/html.h - 664 sys sys 1091904420 15220
 sys/include/httpd.h - 664 sys sys 1091904418 5771
-sys/include/ip.h - 664 sys sys 1089299185 2958
+sys/include/ip.h - 664 sys sys 1103554773 2989
 sys/include/keyboard.h - 664 sys sys 1079577798 815
 sys/include/libc.h - 664 sys sys 1102093062 19516
 sys/include/libsec.h - 664 sys sys 1084318867 9264
@@ -4876,7 +4876,7 @@ sys/man/2/hypot - 664 sys sys 944959693 302
 sys/man/2/intmap - 664 sys sys 1015091523 2622
 sys/man/2/ioproc - 664 sys sys 1030549010 3068
 sys/man/2/iounit - 664 sys sys 1015091523 1001
-sys/man/2/ip - 664 sys sys 1089213089 7136
+sys/man/2/ip - 664 sys sys 1103554773 7276
 sys/man/2/isalpharune - 664 sys sys 1015091523 1059
 sys/man/2/keyboard - 664 sys sys 950892860 2065
 sys/man/2/lock - 664 sys sys 1048643958 4692
@@ -4959,7 +4959,7 @@ sys/man/3/ether - 664 sys sys 984709635 2563
 sys/man/3/floppy - 664 sys sys 954378905 881
 sys/man/3/fs - 664 sys sys 1055701106 2706
 sys/man/3/i82365 - 664 sys sys 954378906 884
-sys/man/3/ip - 664 sys sys 1019858396 21625
+sys/man/3/ip - 664 sys sys 1103554774 21677
 sys/man/3/kbmap - 644 sys sys 1079463778 1331
 sys/man/3/kprof - 664 sys sys 1018029972 1377
 sys/man/3/loopback - 664 sys sys 964662153 1995
@@ -5274,7 +5274,7 @@ sys/src/9/boot/sac.c - 664 sys sys 1015012530 802
 sys/src/9/boot/settime.c - 664 sys sys 1036813626 2473
 sys/src/9/boot/testboot.c - 664 sys sys 1039763734 496
 sys/src/9/ip - 20000000775 sys sys 1015278450 0
-sys/src/9/ip/arp.c - 664 sys sys 1078928097 10687
+sys/src/9/ip/arp.c - 664 sys sys 1103554772 11345
 sys/src/9/ip/chandial.c - 664 sys sys 1099020048 2295
 sys/src/9/ip/devip.c - 664 sys sys 1084331653 24164
 sys/src/9/ip/eipconvtest.c - 664 sys sys 1022588098 3135
@@ -6784,7 +6784,7 @@ sys/src/cmd/acid/print.c - 664 sys sys 984756705 6840
 sys/src/cmd/acid/proc.c - 664 sys sys 1014924908 4513
 sys/src/cmd/acid/util.c - 664 sys sys 944960738 4297
 sys/src/cmd/acme - 20000000775 sys sys 969511023 0
-sys/src/cmd/acme/acme.c - 664 sys sys 1101910760 19489
+sys/src/cmd/acme/acme.c - 664 sys sys 1103565436 19635
 sys/src/cmd/acme/addr.c - 664 sys sys 1018553456 4787
 sys/src/cmd/acme/buff.c - 664 sys sys 1014926092 5573
 sys/src/cmd/acme/cols.c - 664 sys sys 1079102914 11126
@@ -6801,7 +6801,7 @@ sys/src/cmd/acme/fsys.c - 664 sys sys 1079102915 12799
 sys/src/cmd/acme/look.c - 664 sys sys 1077376257 14213
 sys/src/cmd/acme/mkfile - 664 sys sys 1058463682 543
 sys/src/cmd/acme/regx.c - 664 sys sys 1014926094 16057
-sys/src/cmd/acme/rows.c - 664 sys sys 1101910761 14683
+sys/src/cmd/acme/rows.c - 664 sys sys 1103565437 14702
 sys/src/cmd/acme/scrl.c - 664 sys sys 1014926095 3072
 sys/src/cmd/acme/text.c - 664 sys sys 1099500744 27642
 sys/src/cmd/acme/time.c - 664 sys sys 1014926095 1783
@@ -9429,7 +9429,7 @@ sys/src/cmd/ip/ftpfs/file.c - 664 sys sys 1014925642 4208
 sys/src/cmd/ip/ftpfs/ftpfs.c - 664 sys sys 1093452873 13584
 sys/src/cmd/ip/ftpfs/ftpfs.h - 664 sys sys 1091904423 2353
 sys/src/cmd/ip/ftpfs/mkfile - 664 sys sys 1048312050 173
-sys/src/cmd/ip/ftpfs/proto.c - 664 sys sys 1089920400 29348
+sys/src/cmd/ip/ftpfs/proto.c - 664 sys sys 1103565527 29470
 sys/src/cmd/ip/glob.c - 664 sys sys 1101155057 3290
 sys/src/cmd/ip/glob.h - 664 sys sys 1101155058 308
 sys/src/cmd/ip/gping.c - 664 sys sys 1015013112 20476
@@ -11302,7 +11302,7 @@ sys/src/games/sokoban/route.c - 664 sys sys 1102439103 3684
 sys/src/games/sokoban/sokoban.c - 664 sys sys 1102439104 5540
 sys/src/games/sokoban/sokoban.h - 664 sys sys 1102439105 1876
 sys/src/lib9p - 20000000775 sys sys 1015023311 0
-sys/src/lib9p/_post.c - 664 sys sys 1044836326 1641
+sys/src/lib9p/_post.c - 664 sys sys 1103565871 1642
 sys/src/lib9p/dirread.c - 664 sys sys 1015023310 641
 sys/src/lib9p/fid.c - 664 sys sys 1089299187 1066
 sys/src/lib9p/file.c - 664 sys sys 1086896814 5585
@@ -11311,12 +11311,12 @@ sys/src/lib9p/intmap.c - 664 sys sys 1016833881 2255
 sys/src/lib9p/mem.c - 664 sys sys 1015023310 765
 sys/src/lib9p/mkfile - 664 sys sys 1035389775 371
 sys/src/lib9p/parse.c - 664 sys sys 1032324435 2050
-sys/src/lib9p/post.c - 664 sys sys 1044429937 364
+sys/src/lib9p/post.c - 664 sys sys 1103565871 356
 sys/src/lib9p/post.h - 664 sys sys 1029850260 201
 sys/src/lib9p/ramfs.c - 664 sys sys 1030450927 2534
 sys/src/lib9p/req.c - 664 sys sys 1089299187 1652
 sys/src/lib9p/srv.c - 664 sys sys 1050583820 16705
-sys/src/lib9p/tpost.c - 664 sys sys 1044429939 324
+sys/src/lib9p/tpost.c - 664 sys sys 1103565872 316
 sys/src/lib9p/uid.c - 664 sys sys 1015023311 517
 sys/src/lib9p/util.c - 664 sys sys 1017679319 465
 sys/src/libString - 20000000775 sys sys 984754301 0
@@ -11952,7 +11952,7 @@ sys/src/libip - 20000000775 sys sys 1016901402 0
 sys/src/libip/bo.c - 664 sys sys 1089213099 811
 sys/src/libip/classmask.c - 664 sys sys 944961726 622
 sys/src/libip/eipfmt.c - 664 sys sys 1014927942 2194
-sys/src/libip/equivip.c - 664 sys sys 944961726 146
+sys/src/libip/equivip.c - 664 sys sys 1103554773 285
 sys/src/libip/ip.h - 664 sys sys 944961727 1438
 sys/src/libip/ipaux.c - 664 sys sys 985038059 1515
 sys/src/libip/mkfile - 664 sys sys 1065576347 320

+ 42 - 0
dist/replica/plan9.log

@@ -17616,3 +17616,45 @@
 1103391021 0 c rc/bin/replica/defs - 664 sys sys 1103390458 778
 1103517045 0 c 386/bin/usb/usbaudio - 775 sys sys 1103515801 185428
 1103517045 1 c 386/bin/usb/usbd - 775 sys sys 1103515801 129811
+1103554852 0 c sys/include/ip.h - 664 sys sys 1103554773 2989
+1103554852 1 c sys/man/2/ip - 664 sys sys 1103554773 7276
+1103554852 2 c sys/man/3/ip - 664 sys sys 1103554774 21677
+1103554852 3 c sys/src/9/ip/arp.c - 664 sys sys 1103554772 11345
+1103554852 4 c sys/src/libip/equivip.c - 664 sys sys 1103554773 285
+1103565655 0 c sys/src/cmd/acme/acme.c - 664 sys sys 1103565436 19635
+1103565655 1 c sys/src/cmd/acme/rows.c - 664 sys sys 1103565437 14702
+1103565655 2 c sys/src/cmd/ip/ftpfs/proto.c - 664 sys sys 1103565527 29470
+1103567455 0 c sys/src/lib9p/_post.c - 664 sys sys 1103565871 1642
+1103567455 1 c sys/src/lib9p/post.c - 664 sys sys 1103565871 356
+1103567455 2 c sys/src/lib9p/tpost.c - 664 sys sys 1103565872 316
+1103603462 0 c 386/9loaddebug - 775 sys sys 1103602426 299841
+1103603462 1 c 386/9pc - 775 sys sys 1103602433 1833348
+1103603462 2 c 386/9pccpu - 775 sys sys 1103602438 1488341
+1103603462 3 c 386/9pcdisk - 775 sys sys 1103602445 2038738
+1103603462 4 c 386/9pcf - 775 sys sys 1103602452 2371797
+1103603462 5 c 386/bin/acme - 775 sys sys 1103602411 427241
+1103603462 6 c 386/bin/archfs - 775 sys sys 1103602412 140744
+1103603462 7 c 386/bin/cdfs - 775 sys sys 1103602415 161053
+1103603462 8 c 386/bin/nntpfs - 775 sys sys 1103602419 160863
+1103603462 9 c 386/bin/snapfs - 775 sys sys 1103602421 338429
+1103603462 10 c 386/bin/webcookies - 775 sys sys 1103602422 161470
+1103603462 11 c 386/bin/wikifs - 775 sys sys 1103602424 201134
+1103603462 12 c 386/bin/ftpfs - 775 sys sys 1103602416 154362
+1103603462 13 c 386/bin/rdbfs - 775 sys sys 1103602419 168361
+1103603462 14 c 386/bin/webfs - 775 sys sys 1103602423 349695
+1103603462 15 c 386/bin/auth/factotum - 775 sys sys 1103602412 313832
+1103603462 16 c 386/bin/aux/apm - 775 sys sys 1103602413 174060
+1103603462 17 c 386/bin/aux/disksim - 775 sys sys 1103602413 144313
+1103603462 18 c 386/bin/aux/flashfs - 775 sys sys 1103602414 160251
+1103603462 19 c 386/bin/aux/olefs - 775 sys sys 1103602414 143224
+1103603462 20 c 386/bin/aux/stub - 775 sys sys 1103602414 135027
+1103603462 21 c 386/bin/execnet - 775 sys sys 1103602415 171861
+1103603462 22 c 386/bin/ext2srv - 775 sys sys 1103602416 173859
+1103603462 23 c 386/bin/mntgen - 775 sys sys 1103602417 135427
+1103603462 24 c 386/bin/nfs - 775 sys sys 1103602418 315354
+1103603462 25 c 386/bin/sshnet - 775 sys sys 1103602422 282682
+1103603462 26 c 386/lib/lib9p.a - 664 sys sys 1103602453 79300
+1103603462 27 c 386/lib/libip.a - 664 sys sys 1103602453 35602
+1103603462 28 c 386/lib/libndb.a - 664 sys sys 1103602454 60666
+1103603462 29 c 386/lib/libsunrpc.a - 664 sys sys 1103602455 355994
+1103603462 30 c acme/bin/386/win - 775 sys sys 1103602453 178910

+ 2 - 1
sys/include/ip.h

@@ -110,7 +110,8 @@ char*	v4parsecidr(uchar*, uchar*, char*);
 int	parseether(uchar*, char*);
 int	myipaddr(uchar*, char*);
 int	myetheraddr(uchar*, char*);
-int	equivip(uchar*, uchar*);
+int	equivip4(uchar*, uchar*);
+int	equivip6(uchar*, uchar*);
 
 Ipifc*	readipifc(char*, Ipifc*, int);
 

+ 9 - 2
sys/man/2/ip

@@ -1,6 +1,6 @@
 .TH IP 2
 .SH NAME
-eipfmt, parseip, parseipmask, v4parseip, v4parsecidr, parseether, myipaddr, myetheraddr, maskip, equivip, defmask, isv4, v4tov6, v6tov4, nhgetv, nhgetl, nhgets, hnputv, hnputl, hnputs, ptclbsum, readipifc \- Internet protocol
+eipfmt, parseip, parseipmask, v4parseip, v4parsecidr, parseether, myipaddr, myetheraddr, maskip, equivip4, equivip6, defmask, isv4, v4tov6, v6tov4, nhgetv, nhgetl, nhgets, hnputv, hnputl, hnputs, ptclbsum, readipifc \- Internet protocol
 .SH SYNOPSIS
 .B #include <u.h>
 .br
@@ -36,7 +36,10 @@ int	myipaddr(uchar *ipaddr, char *net)
 void	maskip(uchar *from, uchar *mask, uchar *to)
 .PP
 .B
-int	equivip(uchar *ipaddr1, uchar *ipaddr2)
+int	equivip4(uchar *ipaddr1, uchar *ipaddr2)
+.PP
+.B
+int	equivip6(uchar *ipaddr1, uchar *ipaddr2)
 .PP
 .B
 uchar*	defmask(uchar *ipaddr)
@@ -197,6 +200,10 @@ to by the third.
 .I Equivip
 returns non-zero if the IP addresses pointed to by its two
 arguments are equal.
+.I Equivip4
+operates on v4 addresses,
+.I equivip6
+operates on v6 addresses.
 .PP
 .I Defmask
 returns the standard class A, B, or C mask for

+ 3 - 0
sys/man/3/ip

@@ -268,6 +268,9 @@ Remove all entries.
 .BI add\  "type IP-addr Media-addr"
 Add an entry or replace an existing one for the
 same IP address.
+.TP
+.BI del\  "IP-addr"
+Delete an individual entry.
 .PP
 ARP entries do not time out.  The ARP table is a
 cache with an LRU replacement policy.  The IP stack

+ 37 - 1
sys/src/9/ip/arp.c

@@ -404,7 +404,7 @@ arpwrite(Fs *fs, char *s, int len)
 	Route *r;
 	Arp *arp;
 	Block *bp;
-	Arpent *a;
+	Arpent *a, *fl, **l;
 	Medium *m;
 	char *f[4], buf[256];
 	uchar ip[IPaddrlen], mac[MAClen];
@@ -469,6 +469,42 @@ arpwrite(Fs *fs, char *s, int len)
 			error(Ebadarp);
 
 		m->ares(fs, V6, ip, mac, n, 0);
+	} else if(strcmp(f[0], "del") == 0){
+		if(n != 2)
+			error(Ebadarg);
+
+		parseip(ip, f[1]);
+		qlock(arp);
+
+		l = &arp->hash[haship(ip)];
+		for(a = *l; a; a = a->hash){
+			if(memcmp(ip, a->ip, sizeof(a->ip)) == 0){
+				*l = a->hash;
+				break;
+			}
+			l = &a->hash;
+		}
+	
+		if(a){
+			/* take out of re-transmit chain */
+			l = &arp->rxmt;
+			for(fl = *l; fl; fl = fl->nextrxt){
+				if(fl == a){
+					*l = a->nextrxt;
+					break;
+				}
+				l = &fl->nextrxt;
+			}
+
+			a->nextrxt = nil;
+			a->hash = nil;
+			a->hold = nil;
+			a->last = nil;
+			a->ifc = nil;
+			memset(a->ip, 0, sizeof(a->ip));
+			memset(a->mac, 0, sizeof(a->mac));
+		}
+		qunlock(arp);
 	} else
 		error(Ebadarp);
 

+ 16 - 12
sys/src/cmd/acme/acme.c

@@ -35,11 +35,7 @@ enum{
 };
 Rune	snarfrune[NSnarf+1];
 
-char		*fontnames[2] =
-{
-	"/lib/font/bit/lucidasans/euro.8.font",
-	"/lib/font/bit/lucm/unicode.9.font",
-};
+char		*fontnames[2];
 
 Command *command;
 
@@ -69,6 +65,8 @@ threadmain(int argc, char *argv[])
 	ncol = -1;
 
 	loadfile = nil;
+	fontnames[0] = estrdup("/lib/font/bit/lucidasans/euro.8.font");
+	fontnames[1] = estrdup("/lib/font/bit/lucm/unicode.9.font");
 	ARGBEGIN{
 	case 'a':
 		globalautoindent = TRUE;
@@ -85,14 +83,18 @@ threadmain(int argc, char *argv[])
 			goto Usage;
 		break;
 	case 'f':
-		fontnames[0] = ARGF();
-		if(fontnames[0] == nil)
+		p = ARGF();
+		if(p == nil)
 			goto Usage;
+		free(fontnames[0]);
+		fontnames[0] = estrdup(p);
 		break;
 	case 'F':
-		fontnames[1] = ARGF();
-		if(fontnames[1] == nil)
+		p = ARGF();
+		if(p == nil)
 			goto Usage;
+		free(fontnames[1]);
+		fontnames[1] = estrdup(p);
 		break;
 	case 'l':
 		loadfile = ARGF();
@@ -789,7 +791,7 @@ rfget(int fix, int save, int setfont, char *name)
 		}
 		r = emalloc(sizeof(Reffont));
 		r->f = f;
-		fontcache = realloc(fontcache, (nfontcache+1)*sizeof(Reffont*));
+		fontcache = erealloc(fontcache, (nfontcache+1)*sizeof(Reffont*));
 		fontcache[nfontcache++] = r;
 	}
     Found:
@@ -798,8 +800,10 @@ rfget(int fix, int save, int setfont, char *name)
 		if(reffonts[fix])
 			rfclose(reffonts[fix]);
 		reffonts[fix] = r;
-		free(fontnames[fix]);
-		fontnames[fix] = name;
+		if(name != fontnames[fix]){
+			free(fontnames[fix]);
+			fontnames[fix] = estrdup(name);
+		}
 	}
 	if(setfont){
 		reffont.f = r->f;

+ 4 - 2
sys/src/cmd/acme/rows.c

@@ -465,8 +465,10 @@ rowloadfonts(char *file)
 		if(l == nil)
 			goto Return;
 		l[Blinelen(b)-1] = 0;
-		if(*l && strcmp(l, fontnames[i])!=0)
+		if(*l && strcmp(l, fontnames[i])!=0){
+			free(fontnames[i]);
 			fontnames[i] = estrdup(l);
+		}
 	}
     Return:
 	Bterm(b);
@@ -515,7 +517,7 @@ rowload(Row *row, char *file, int initing)
 			goto Rescue2;
 		l[Blinelen(b)-1] = 0;
 		if(*l && strcmp(l, fontnames[i])!=0)
-			rfget(i, TRUE, i==0 && initing, estrdup(l));
+			rfget(i, TRUE, i==0 && initing, l);
 	}
 	if(initing && row->ncol==0)
 		rowinit(row, screen->clipr);

+ 9 - 1
sys/src/cmd/ip/ftpfs/proto.c

@@ -1167,9 +1167,17 @@ port(void)
 	if(ptr)
 		*ptr = 0;
 	ptr = strchr(buf, '!')+1;
-	parseip(ipaddr, buf);
 	port = atoi(ptr);
 
+	memset(ipaddr, 0, IPaddrlen);
+	if (*net){
+		strcpy(buf, net);
+		ptr = strchr(buf +1, '/');
+		if (ptr)
+			*ptr = 0;
+		myipaddr(ipaddr, buf);
+	}
+
 	/* tell remote side */
 	sprint(buf, "PORT %d,%d,%d,%d,%d,%d", ipaddr[IPv4off+0], ipaddr[IPv4off+1],
 		ipaddr[IPv4off+2], ipaddr[IPv4off+3], port>>8, port&0xff);

+ 1 - 1
sys/src/lib9p/_post.c

@@ -33,8 +33,8 @@ _post2(void *v)
 	Srv *s;
 
 	s = v;
-	rfork(RFNOTEG);
 	if(!s->leavefdsopen){
+		rfork(RFNOTEG);
 		rendezvous((ulong)s, 0);
 		close(s->srvfd);
 	}

+ 1 - 1
sys/src/lib9p/post.c

@@ -11,7 +11,7 @@ postmountsrv(Srv *s, char *name, char *mtpt, int flag)
 	Postcrud *p;
 
 	p = _post1(s, name, mtpt, flag);
-	switch(rfork(RFPROC|RFNOTEG|RFNAMEG|RFMEM)){
+	switch(rfork(RFPROC|RFNAMEG|RFMEM)){
 	case -1:
 		sysfatal("rfork: %r");
 	case 0:

+ 1 - 1
sys/src/lib9p/tpost.c

@@ -11,7 +11,7 @@ threadpostmountsrv(Srv *s, char *name, char *mtpt, int flag)
 	Postcrud *p;
 
 	p = _post1(s, name, mtpt, flag);
-	if(procrfork(_post2, s, 32*1024, RFNAMEG|RFNOTEG) < 0)
+	if(procrfork(_post2, s, 32*1024, RFNAMEG) < 0)
 		sysfatal("procrfork: %r");
 	_post3(p);
 }

+ 13 - 1
sys/src/libip/equivip.c

@@ -1,8 +1,9 @@
 #include <u.h>
 #include <libc.h>
+#include <ip.h>
 
 int
-equivip(uchar *a, uchar *b)
+equivip4(uchar *a, uchar *b)
 {
 	int i;
 
@@ -11,3 +12,14 @@ equivip(uchar *a, uchar *b)
 			return 0;
 	return 1;
 }
+
+int
+equivip6(uchar *a, uchar *b)
+{
+	int i;
+
+	for(i = 0; i < IPaddrlen; i++)
+		if(a[i] != b[i])
+			return 0;
+	return 1;
+}