Plan 9 from Bell Labs 2005-01-20

dist/replica/_plan9.db

@@ -43,21 +43,21 @@
 386/bin/ascii - 775 sys sys 1104121959 64668
 386/bin/astro - 775 sys sys 1104121959 138803
 386/bin/auth - 20000000775 sys sys 1016920815 0
-386/bin/auth/aescbc - 775 sys sys 1104121960 133228
+386/bin/auth/aescbc - 775 sys sys 1106107674 133292
 386/bin/auth/asn12rsa - 775 sys sys 1104121960 119644
 386/bin/auth/authsrv - 775 sys sys 1104121961 165463
 386/bin/auth/changeuser - 775 sys sys 1104121961 97026
-386/bin/auth/convkeys - 775 sys sys 1104121961 87223
-386/bin/auth/convkeys2 - 775 sys sys 1104121962 87274
+386/bin/auth/convkeys - 775 sys sys 1106107674 87287
+386/bin/auth/convkeys2 - 775 sys sys 1106107674 87338
 386/bin/auth/cron - 775 sys sys 1104121962 142890
 386/bin/auth/debug - 775 sys sys 1104121962 101064
 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 1104121963 313934
+386/bin/auth/factotum - 775 sys sys 1106107675 313998
 386/bin/auth/fgui - 775 sys sys 1104121964 217793
 386/bin/auth/guard.srv - 775 sys sys 1104121964 142850
 386/bin/auth/iam - 775 sys sys 1085076981 50791
-386/bin/auth/keyfs - 775 sys sys 1104121965 115287
+386/bin/auth/keyfs - 775 sys sys 1106107675 115351
 386/bin/auth/login - 775 sys sys 1104121965 103362
 386/bin/auth/newns - 775 sys sys 1104121965 87950
 386/bin/auth/none - 775 sys sys 1104121966 87699
@@ -71,13 +71,13 @@
 386/bin/auth/rsafill - 775 sys sys 1104121968 143416
 386/bin/auth/rsagen - 775 sys sys 1104121969 153041
 386/bin/auth/secretpem - 775 sys sys 1045537944 118526
-386/bin/auth/secstore - 775 sys sys 1104206870 189563
+386/bin/auth/secstore - 775 sys sys 1106107676 189627
 386/bin/auth/secstored - 775 sys sys 1104121970 196626
 386/bin/auth/secuser - 775 sys sys 1104121971 152299
 386/bin/auth/status - 775 sys sys 1020319060 738
 386/bin/auth/uniq - 775 sys sys 1104121971 63052
 386/bin/auth/warning - 775 sys sys 1104121971 99559
-386/bin/auth/wrkey - 775 sys sys 1104121971 74992
+386/bin/auth/wrkey - 775 sys sys 1106107676 75056
 386/bin/aux - 20000000775 sys sys 1016920817 0
 386/bin/aux/9pcon - 775 sys sys 1104121972 94925
 386/bin/aux/LOCK - 775 sys sys 1104121972 59908
@@ -195,13 +195,13 @@
 386/bin/dial/expect - 775 sys sys 1104122000 60081
 386/bin/dial/pass - 775 sys sys 1104122001 38814
 386/bin/dict - 775 sys sys 1104122001 187459
-386/bin/diff - 775 sys sys 1104122002 83750
+386/bin/diff - 775 sys sys 1106107676 84031
 386/bin/disk - 20000000775 sys sys 984788664 0
 386/bin/disk/dump9660 - 775 sys sys 1104122002 152246
 386/bin/disk/exsort - 775 sys sys 1104122002 60210
 386/bin/disk/fdisk - 775 sys sys 1104122003 103794
 386/bin/disk/format - 775 sys sys 1104122003 89534
-386/bin/disk/kfs - 775 sys sys 1104122004 248706
+386/bin/disk/kfs - 775 sys sys 1106107677 248770
 386/bin/disk/kfscmd - 775 sys sys 1104122004 38222
 386/bin/disk/ksync - 775 sys sys 1020319074 302
 386/bin/disk/mbr - 775 sys sys 1104122004 73689
@@ -528,7 +528,7 @@
 386/lib/lib9p.a - 664 sys sys 1105161535 79300
 386/lib/libString.a - 664 sys sys 1105161535 22184
 386/lib/libauth.a - 664 sys sys 1105161535 56134
-386/lib/libauthsrv.a - 664 sys sys 1105161535 33522
+386/lib/libauthsrv.a - 664 sys sys 1106107677 33778
 386/lib/libbin.a - 664 sys sys 1105161535 2534
 386/lib/libbio.a - 664 sys sys 1105161535 26078
 386/lib/libc.a - 664 sys sys 1105161536 500976
@@ -614,7 +614,7 @@ 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 1106096766 126761
+acme/bin/386/Wiki - 775 sys sys 1106107677 126761
 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
@@ -3039,7 +3039,7 @@ rc/bin/patch - 20000000775 sys sys 1067803227 0
 rc/bin/patch/applied - 775 sys sys 1081204295 110
 rc/bin/patch/apply - 775 sys sys 1089299188 1276
 rc/bin/patch/create - 775 sys sys 1104988374 1160
-rc/bin/patch/diff - 775 sys sys 1067804404 466
+rc/bin/patch/diff - 775 sys sys 1106151131 466
 rc/bin/patch/list - 775 sys sys 1081204287 644
 rc/bin/patch/move - 775 sys sys 1104430337 565
 rc/bin/patch/note - 664 sys sys 1089299189 655
@@ -3908,7 +3908,7 @@ sys/lib/kbmap/de - 664 sys sys 1100894012 6265
 sys/lib/kbmap/ee - 644 sys sys 1080222237 429
 sys/lib/kbmap/es - 664 sys sys 1079535430 1360
 sys/lib/kbmap/fi - 664 sys sys 1079617317 369
-sys/lib/kbmap/jp - 664 sys sys 1088002290 317
+sys/lib/kbmap/jp - 664 sys sys 1106107712 317
 sys/lib/kbmap/uk - 664 sys sys 1079473812 55
 sys/lib/kbmap/us - 664 sys sys 1082221421 6248
 sys/lib/lex - 20000000775 sys sys 945136651 0
@@ -7367,7 +7367,7 @@ sys/src/cmd/diff/diff.h - 664 sys sys 1014925333 769
 sys/src/cmd/diff/diffdir.c - 664 sys sys 1014925333 1791
 sys/src/cmd/diff/diffio.c - 664 sys sys 1106063669 5272
 sys/src/cmd/diff/diffreg.c - 664 sys sys 1014925334 8825
-sys/src/cmd/diff/main.c - 664 sys sys 1099755545 4312
+sys/src/cmd/diff/main.c - 664 sys sys 1106151067 4325
 sys/src/cmd/diff/mkfile - 664 sys sys 944960882 141
 sys/src/cmd/disk - 20000000775 sys sys 1018468546 0
 sys/src/cmd/disk/9660 - 20000000775 sys sys 1017681443 0
@@ -12457,15 +12457,4 @@ 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/diff - 775 sys sys 1106107676 84031
-386/bin/auth/aescbc - 775 sys sys 1106107674 133292
-386/bin/auth/convkeys - 775 sys sys 1106107674 87287
-386/bin/auth/convkeys2 - 775 sys sys 1106107674 87338
-386/bin/auth/factotum - 775 sys sys 1106107675 313998
-386/bin/auth/keyfs - 775 sys sys 1106107675 115351
-386/bin/auth/secstore - 775 sys sys 1106107676 189627
-386/bin/auth/wrkey - 775 sys sys 1106107676 75056
-386/bin/disk/kfs - 775 sys sys 1106107677 248770
-386/lib/libauthsrv.a - 664 sys sys 1106107677 33778
-acme/bin/386/Wiki - 775 sys sys 1106107677 126761
-sys/lib/kbmap/jp - 664 sys sys 1106107712 317
+386/bin/diff - 775 sys sys 1106194001 84036

dist/replica/plan9.db

@@ -195,7 +195,7 @@
 386/bin/dial/expect - 775 sys sys 1104122000 60081
 386/bin/dial/pass - 775 sys sys 1104122001 38814
 386/bin/dict - 775 sys sys 1104122001 187459
-386/bin/diff - 775 sys sys 1106107676 84031
+386/bin/diff - 775 sys sys 1106194001 84036
 386/bin/disk - 20000000775 sys sys 984788664 0
 386/bin/disk/dump9660 - 775 sys sys 1104122002 152246
 386/bin/disk/exsort - 775 sys sys 1104122002 60210
@@ -3039,7 +3039,7 @@ rc/bin/patch - 20000000775 sys sys 1067803227 0
 rc/bin/patch/applied - 775 sys sys 1081204295 110
 rc/bin/patch/apply - 775 sys sys 1089299188 1276
 rc/bin/patch/create - 775 sys sys 1104988374 1160
-rc/bin/patch/diff - 775 sys sys 1067804404 466
+rc/bin/patch/diff - 775 sys sys 1106151131 466
 rc/bin/patch/list - 775 sys sys 1081204287 644
 rc/bin/patch/move - 775 sys sys 1104430337 565
 rc/bin/patch/note - 664 sys sys 1089299189 655
@@ -7367,7 +7367,7 @@ sys/src/cmd/diff/diff.h - 664 sys sys 1014925333 769
 sys/src/cmd/diff/diffdir.c - 664 sys sys 1014925333 1791
 sys/src/cmd/diff/diffio.c - 664 sys sys 1106063669 5272
 sys/src/cmd/diff/diffreg.c - 664 sys sys 1014925334 8825
-sys/src/cmd/diff/main.c - 664 sys sys 1099755545 4312
+sys/src/cmd/diff/main.c - 664 sys sys 1106151067 4325
 sys/src/cmd/diff/mkfile - 664 sys sys 944960882 141
 sys/src/cmd/disk - 20000000775 sys sys 1018468546 0
 sys/src/cmd/disk/9660 - 20000000775 sys sys 1017681443 0

dist/replica/plan9.log

@@ -13259,3 +13259,6 @@
 1106109119 9 c 386/lib/libauthsrv.a - 664 sys sys 1106107677 33778
 1106109119 10 c acme/bin/386/Wiki - 775 sys sys 1106107677 126761
 1106109119 11 c sys/lib/kbmap/jp - 664 sys sys 1106107712 317
+1106152208 0 c rc/bin/patch/diff - 775 sys sys 1106151131 466
+1106152208 1 c sys/src/cmd/diff/main.c - 664 sys sys 1106151067 4325
+1106195417 0 c 386/bin/diff - 775 sys sys 1106194001 84036

rc/bin/patch/diff

@@ -24,6 +24,6 @@ if(! patch/okay .){
 d=/n/sources/patch/$1
 fn xxx {
 	echo $1
-	diff -n $2.orig $d/$2 | sed 's/^/	/'
+	diff -c $2.orig $d/$2 | sed 's/^/	/'
 }
 cat files | sed 's/^/xxx /' |rc

sys/src/cmd/diff/main.c

@@ -190,6 +190,7 @@ main(int argc, char *argv[])
 			case 'e':
 			case 'f':
 			case 'n':
+			case 'c':
 				mode = *p;
 				break;