Plan 9 from Bell Labs 2007-06-28

dist/replica/_plan9.db

@@ -331,7 +331,7 @@
 386/bin/ls - 775 sys sys 1178568291 81002
 386/bin/mc - 775 sys sys 1179372098 134354
 386/bin/md5sum - 775 sys sys 1168402334 61498
-386/bin/mk - 775 sys sys 1181507268 143420
+386/bin/mk - 775 sys sys 1182973447 143318
 386/bin/mkdir - 775 sys sys 1168402334 61205
 386/bin/mkpaqfs - 775 sys sys 1178568292 93268
 386/bin/mntgen - 775 sys sys 1179372098 144046
@@ -379,7 +379,7 @@
 386/bin/ps - 775 sys sys 1168402346 68812
 386/bin/pwd - 775 sys sys 1148500685 36932
 386/bin/ramfs - 775 sys sys 1178568298 88610
-386/bin/rc - 775 sys sys 1174933356 144261
+386/bin/rc - 775 sys sys 1182914526 145398
 386/bin/rdbfs - 775 sys sys 1179548031 173192
 386/bin/read - 775 sys sys 1168402347 58283
 386/bin/replica - 20000000775 sys sys 1018321168 0
@@ -7622,7 +7622,7 @@ sys/man/2/stringsize - 664 sys sys 952627482 1409
 sys/man/2/subfont - 664 sys sys 956345937 5140
 sys/man/2/symbol - 664 sys sys 950892874 9423
 sys/man/2/thread - 664 sys sys 1181168564 11712
-sys/man/2/time - 664 sys sys 1015091527 739
+sys/man/2/time - 664 sys sys 1182980757 736
 sys/man/2/tmpfile - 664 sys sys 1048637161 1157
 sys/man/2/wait - 664 sys sys 1163004064 2525
 sys/man/2/window - 664 sys sys 950593499 5522
@@ -12780,32 +12780,32 @@ sys/src/cmd/mc.c - 664 sys sys 1082924484 5520
 sys/src/cmd/md5sum.c - 664 sys sys 1014926238 1009
 sys/src/cmd/mk - 20000000775 sys sys 1056337347 0
 sys/src/cmd/mk/acid - 664 sys sys 1055698806 10395
-sys/src/cmd/mk/arc.c - 664 sys sys 1131289508 826
-sys/src/cmd/mk/archive.c - 664 sys sys 1131289509 3071
+sys/src/cmd/mk/arc.c - 664 sys sys 1131129236 826
+sys/src/cmd/mk/archive.c - 664 sys sys 1131129659 3071
 sys/src/cmd/mk/bufblock.c - 664 sys sys 944961024 1338
-sys/src/cmd/mk/env.c - 664 sys sys 1182892953 2307
-sys/src/cmd/mk/file.c - 664 sys sys 1131289509 1299
+sys/src/cmd/mk/env.c - 664 sys sys 1182892801 2307
+sys/src/cmd/mk/file.c - 664 sys sys 1131129253 1299
 sys/src/cmd/mk/fns.h - 664 sys sys 1055698809 2199
-sys/src/cmd/mk/graph.c - 664 sys sys 1131289509 5822
+sys/src/cmd/mk/graph.c - 664 sys sys 1131128904 5822
 sys/src/cmd/mk/job.c - 664 sys sys 944961025 692
-sys/src/cmd/mk/lex.c - 664 sys sys 1143759343 2304
-sys/src/cmd/mk/main.c - 664 sys sys 1123094366 4790
+sys/src/cmd/mk/lex.c - 664 sys sys 1143749754 2304
+sys/src/cmd/mk/main.c - 664 sys sys 1122474474 4790
 sys/src/cmd/mk/match.c - 664 sys sys 1014926073 856
-sys/src/cmd/mk/mk.c - 664 sys sys 1182894020 5360
-sys/src/cmd/mk/mk.h - 664 sys sys 1131289508 3765
+sys/src/cmd/mk/mk.c - 664 sys sys 1182916137 5359
+sys/src/cmd/mk/mk.h - 664 sys sys 1131128809 3765
 sys/src/cmd/mk/mkconv - 775 sys sys 944961025 555
 sys/src/cmd/mk/mkfile - 664 sys sys 1055698812 376
 sys/src/cmd/mk/parse.c - 664 sys sys 944961025 5310
-sys/src/cmd/mk/plan9.c - 664 sys sys 1182905824 6968
+sys/src/cmd/mk/plan9.c - 664 sys sys 1182916397 6967
 sys/src/cmd/mk/rc.c - 664 sys sys 944961025 3206
-sys/src/cmd/mk/recipe.c - 664 sys sys 1182894011 2557
-sys/src/cmd/mk/rule.c - 664 sys sys 1131289510 1946
-sys/src/cmd/mk/run.c - 664 sys sys 1182895178 5085
-sys/src/cmd/mk/shprint.c - 664 sys sys 1182892889 1531
-sys/src/cmd/mk/symtab.c - 664 sys sys 1131289510 1581
-sys/src/cmd/mk/var.c - 664 sys sys 1131289510 530
-sys/src/cmd/mk/varsub.c - 664 sys sys 1174930010 4297
-sys/src/cmd/mk/word.c - 664 sys sys 1174930010 2709
+sys/src/cmd/mk/recipe.c - 664 sys sys 1182916343 2528
+sys/src/cmd/mk/rule.c - 664 sys sys 1131129128 1946
+sys/src/cmd/mk/run.c - 664 sys sys 1182916224 5066
+sys/src/cmd/mk/shprint.c - 664 sys sys 1182916066 1523
+sys/src/cmd/mk/symtab.c - 664 sys sys 1131129280 1581
+sys/src/cmd/mk/var.c - 664 sys sys 1131129305 530
+sys/src/cmd/mk/varsub.c - 664 sys sys 1174929797 4297
+sys/src/cmd/mk/word.c - 664 sys sys 1174929845 2709
 sys/src/cmd/mkdir.c - 664 sys sys 1082593106 1026
 sys/src/cmd/mkfile - 664 sys sys 1178487482 2603
 sys/src/cmd/mklib - 664 sys sys 1101213349 618
@@ -13260,34 +13260,34 @@ sys/src/cmd/ratfs/mkfile - 664 sys sys 1016943965 142
 sys/src/cmd/ratfs/proto.c - 664 sys sys 1016943965 8528
 sys/src/cmd/ratfs/ratfs.h - 664 sys sys 1016943965 2743
 sys/src/cmd/rc - 20000000775 sys sys 1071884773 0
-sys/src/cmd/rc/code.c - 664 sys sys 1182906211 8218
+sys/src/cmd/rc/code.c - 664 sys sys 1182898057 8218
 sys/src/cmd/rc/compiling.on.unix - 664 sys sys 1071884773 37638
-sys/src/cmd/rc/exec.c - 664 sys sys 1182906270 16611
-sys/src/cmd/rc/exec.h - 664 sys sys 1182906260 2824
+sys/src/cmd/rc/exec.c - 664 sys sys 1182917722 16579
+sys/src/cmd/rc/exec.h - 664 sys sys 1174851874 2828
 sys/src/cmd/rc/fmtquote.c - 664 sys sys 1055698768 3609
-sys/src/cmd/rc/fns.h - 664 sys sys 1182906276 1490
-sys/src/cmd/rc/getflags.c - 664 sys sys 1182890772 3863
-sys/src/cmd/rc/getflags.h - 664 sys sys 1182890781 133
-sys/src/cmd/rc/glob.c - 664 sys sys 1182906303 4710
-sys/src/cmd/rc/havefork.c - 664 sys sys 1182890728 3751
-sys/src/cmd/rc/haventfork.c - 664 sys sys 1182890808 3149
-sys/src/cmd/rc/here.c - 664 sys sys 1182906323 2575
-sys/src/cmd/rc/io.c - 664 sys sys 1182906364 3856
-sys/src/cmd/rc/io.h - 664 sys sys 1182906342 523
-sys/src/cmd/rc/lex.c - 664 sys sys 1174915672 6203
+sys/src/cmd/rc/fns.h - 664 sys sys 1182899939 1490
+sys/src/cmd/rc/getflags.c - 664 sys sys 1182917999 3743
+sys/src/cmd/rc/getflags.h - 664 sys sys 1182886902 133
+sys/src/cmd/rc/glob.c - 664 sys sys 1182918194 4669
+sys/src/cmd/rc/havefork.c - 664 sys sys 1182918331 3751
+sys/src/cmd/rc/haventfork.c - 664 sys sys 1182918434 3141
+sys/src/cmd/rc/here.c - 664 sys sys 1182918533 2510
+sys/src/cmd/rc/io.c - 664 sys sys 1182918677 3793
+sys/src/cmd/rc/io.h - 664 sys sys 1182905845 523
+sys/src/cmd/rc/lex.c - 664 sys sys 1174851509 6203
 sys/src/cmd/rc/mkfile - 664 sys sys 1182890797 825
-sys/src/cmd/rc/pcmd.c - 664 sys sys 1100894086 2681
-sys/src/cmd/rc/pfnc.c - 664 sys sys 1100894087 1320
-sys/src/cmd/rc/plan9.c - 664 sys sys 1182906491 10154
-sys/src/cmd/rc/rc.h - 664 sys sys 1182906172 3326
-sys/src/cmd/rc/simple.c - 664 sys sys 1182890831 9219
-sys/src/cmd/rc/subr.c - 664 sys sys 1182906242 1210
+sys/src/cmd/rc/pcmd.c - 664 sys sys 1100894077 2681
+sys/src/cmd/rc/pfnc.c - 664 sys sys 1100894077 1320
+sys/src/cmd/rc/plan9.c - 664 sys sys 1182918888 10084
+sys/src/cmd/rc/rc.h - 664 sys sys 1182898644 3326
+sys/src/cmd/rc/simple.c - 664 sys sys 1182919012 9205
+sys/src/cmd/rc/subr.c - 664 sys sys 1182919084 1200
 sys/src/cmd/rc/syn.y - 664 sys sys 944961083 3128
-sys/src/cmd/rc/trap.c - 664 sys sys 1174915673 878
-sys/src/cmd/rc/tree.c - 664 sys sys 1182906201 2081
-sys/src/cmd/rc/unix.c - 664 sys sys 1182906186 8708
+sys/src/cmd/rc/trap.c - 664 sys sys 1174851077 878
+sys/src/cmd/rc/tree.c - 664 sys sys 1182898340 2081
+sys/src/cmd/rc/unix.c - 664 sys sys 1182898521 8708
 sys/src/cmd/rc/var.c - 664 sys sys 1055698781 1298
-sys/src/cmd/rc/win32.c - 664 sys sys 1182906181 8691
+sys/src/cmd/rc/win32.c - 664 sys sys 1182898536 8691
 sys/src/cmd/rdbfs.c - 664 sys sys 1142342219 7633
 sys/src/cmd/read.c - 664 sys sys 1022047660 1278
 sys/src/cmd/replica - 20000000775 sys sys 1053210813 0
@@ -15844,5 +15844,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/mk - 775 sys sys 1182914525 143314
-386/bin/rc - 775 sys sys 1182914526 145398
+386/bin/rc - 775 sys sys 1183001109 145286

dist/replica/plan9.db

@@ -331,7 +331,7 @@
 386/bin/ls - 775 sys sys 1178568291 81002
 386/bin/mc - 775 sys sys 1179372098 134354
 386/bin/md5sum - 775 sys sys 1168402334 61498
-386/bin/mk - 775 sys sys 1182914525 143314
+386/bin/mk - 775 sys sys 1182973447 143318
 386/bin/mkdir - 775 sys sys 1168402334 61205
 386/bin/mkpaqfs - 775 sys sys 1178568292 93268
 386/bin/mntgen - 775 sys sys 1179372098 144046
@@ -379,7 +379,7 @@
 386/bin/ps - 775 sys sys 1168402346 68812
 386/bin/pwd - 775 sys sys 1148500685 36932
 386/bin/ramfs - 775 sys sys 1178568298 88610
-386/bin/rc - 775 sys sys 1182914526 145398
+386/bin/rc - 775 sys sys 1183001109 145286
 386/bin/rdbfs - 775 sys sys 1179548031 173192
 386/bin/read - 775 sys sys 1168402347 58283
 386/bin/replica - 20000000775 sys sys 1018321168 0
@@ -7622,7 +7622,7 @@ sys/man/2/stringsize - 664 sys sys 952627482 1409
 sys/man/2/subfont - 664 sys sys 956345937 5140
 sys/man/2/symbol - 664 sys sys 950892874 9423
 sys/man/2/thread - 664 sys sys 1181168564 11712
-sys/man/2/time - 664 sys sys 1015091527 739
+sys/man/2/time - 664 sys sys 1182980757 736
 sys/man/2/tmpfile - 664 sys sys 1048637161 1157
 sys/man/2/wait - 664 sys sys 1163004064 2525
 sys/man/2/window - 664 sys sys 950593499 5522
@@ -12780,32 +12780,32 @@ sys/src/cmd/mc.c - 664 sys sys 1082924484 5520
 sys/src/cmd/md5sum.c - 664 sys sys 1014926238 1009
 sys/src/cmd/mk - 20000000775 sys sys 1056337347 0
 sys/src/cmd/mk/acid - 664 sys sys 1055698806 10395
-sys/src/cmd/mk/arc.c - 664 sys sys 1131289508 826
-sys/src/cmd/mk/archive.c - 664 sys sys 1131289509 3071
+sys/src/cmd/mk/arc.c - 664 sys sys 1131129236 826
+sys/src/cmd/mk/archive.c - 664 sys sys 1131129659 3071
 sys/src/cmd/mk/bufblock.c - 664 sys sys 944961024 1338
-sys/src/cmd/mk/env.c - 664 sys sys 1182892953 2307
-sys/src/cmd/mk/file.c - 664 sys sys 1131289509 1299
+sys/src/cmd/mk/env.c - 664 sys sys 1182892801 2307
+sys/src/cmd/mk/file.c - 664 sys sys 1131129253 1299
 sys/src/cmd/mk/fns.h - 664 sys sys 1055698809 2199
-sys/src/cmd/mk/graph.c - 664 sys sys 1131289509 5822
+sys/src/cmd/mk/graph.c - 664 sys sys 1131128904 5822
 sys/src/cmd/mk/job.c - 664 sys sys 944961025 692
-sys/src/cmd/mk/lex.c - 664 sys sys 1143759343 2304
-sys/src/cmd/mk/main.c - 664 sys sys 1123094366 4790
+sys/src/cmd/mk/lex.c - 664 sys sys 1143749754 2304
+sys/src/cmd/mk/main.c - 664 sys sys 1122474474 4790
 sys/src/cmd/mk/match.c - 664 sys sys 1014926073 856
-sys/src/cmd/mk/mk.c - 664 sys sys 1182894020 5360
-sys/src/cmd/mk/mk.h - 664 sys sys 1131289508 3765
+sys/src/cmd/mk/mk.c - 664 sys sys 1182916137 5359
+sys/src/cmd/mk/mk.h - 664 sys sys 1131128809 3765
 sys/src/cmd/mk/mkconv - 775 sys sys 944961025 555
 sys/src/cmd/mk/mkfile - 664 sys sys 1055698812 376
 sys/src/cmd/mk/parse.c - 664 sys sys 944961025 5310
-sys/src/cmd/mk/plan9.c - 664 sys sys 1182905824 6968
+sys/src/cmd/mk/plan9.c - 664 sys sys 1182916397 6967
 sys/src/cmd/mk/rc.c - 664 sys sys 944961025 3206
-sys/src/cmd/mk/recipe.c - 664 sys sys 1182894011 2557
-sys/src/cmd/mk/rule.c - 664 sys sys 1131289510 1946
-sys/src/cmd/mk/run.c - 664 sys sys 1182895178 5085
-sys/src/cmd/mk/shprint.c - 664 sys sys 1182892889 1531
-sys/src/cmd/mk/symtab.c - 664 sys sys 1131289510 1581
-sys/src/cmd/mk/var.c - 664 sys sys 1131289510 530
-sys/src/cmd/mk/varsub.c - 664 sys sys 1174930010 4297
-sys/src/cmd/mk/word.c - 664 sys sys 1174930010 2709
+sys/src/cmd/mk/recipe.c - 664 sys sys 1182916343 2528
+sys/src/cmd/mk/rule.c - 664 sys sys 1131129128 1946
+sys/src/cmd/mk/run.c - 664 sys sys 1182916224 5066
+sys/src/cmd/mk/shprint.c - 664 sys sys 1182916066 1523
+sys/src/cmd/mk/symtab.c - 664 sys sys 1131129280 1581
+sys/src/cmd/mk/var.c - 664 sys sys 1131129305 530
+sys/src/cmd/mk/varsub.c - 664 sys sys 1174929797 4297
+sys/src/cmd/mk/word.c - 664 sys sys 1174929845 2709
 sys/src/cmd/mkdir.c - 664 sys sys 1082593106 1026
 sys/src/cmd/mkfile - 664 sys sys 1178487482 2603
 sys/src/cmd/mklib - 664 sys sys 1101213349 618
@@ -13260,34 +13260,34 @@ sys/src/cmd/ratfs/mkfile - 664 sys sys 1016943965 142
 sys/src/cmd/ratfs/proto.c - 664 sys sys 1016943965 8528
 sys/src/cmd/ratfs/ratfs.h - 664 sys sys 1016943965 2743
 sys/src/cmd/rc - 20000000775 sys sys 1071884773 0
-sys/src/cmd/rc/code.c - 664 sys sys 1182906211 8218
+sys/src/cmd/rc/code.c - 664 sys sys 1182898057 8218
 sys/src/cmd/rc/compiling.on.unix - 664 sys sys 1071884773 37638
-sys/src/cmd/rc/exec.c - 664 sys sys 1182906270 16611
-sys/src/cmd/rc/exec.h - 664 sys sys 1182906260 2824
+sys/src/cmd/rc/exec.c - 664 sys sys 1182917722 16579
+sys/src/cmd/rc/exec.h - 664 sys sys 1174851874 2828
 sys/src/cmd/rc/fmtquote.c - 664 sys sys 1055698768 3609
-sys/src/cmd/rc/fns.h - 664 sys sys 1182906276 1490
-sys/src/cmd/rc/getflags.c - 664 sys sys 1182890772 3863
-sys/src/cmd/rc/getflags.h - 664 sys sys 1182890781 133
-sys/src/cmd/rc/glob.c - 664 sys sys 1182906303 4710
-sys/src/cmd/rc/havefork.c - 664 sys sys 1182890728 3751
-sys/src/cmd/rc/haventfork.c - 664 sys sys 1182890808 3149
-sys/src/cmd/rc/here.c - 664 sys sys 1182906323 2575
-sys/src/cmd/rc/io.c - 664 sys sys 1182906364 3856
-sys/src/cmd/rc/io.h - 664 sys sys 1182906342 523
-sys/src/cmd/rc/lex.c - 664 sys sys 1174915672 6203
+sys/src/cmd/rc/fns.h - 664 sys sys 1182899939 1490
+sys/src/cmd/rc/getflags.c - 664 sys sys 1182917999 3743
+sys/src/cmd/rc/getflags.h - 664 sys sys 1182886902 133
+sys/src/cmd/rc/glob.c - 664 sys sys 1182918194 4669
+sys/src/cmd/rc/havefork.c - 664 sys sys 1182918331 3751
+sys/src/cmd/rc/haventfork.c - 664 sys sys 1182918434 3141
+sys/src/cmd/rc/here.c - 664 sys sys 1182918533 2510
+sys/src/cmd/rc/io.c - 664 sys sys 1182918677 3793
+sys/src/cmd/rc/io.h - 664 sys sys 1182905845 523
+sys/src/cmd/rc/lex.c - 664 sys sys 1174851509 6203
 sys/src/cmd/rc/mkfile - 664 sys sys 1182890797 825
-sys/src/cmd/rc/pcmd.c - 664 sys sys 1100894086 2681
-sys/src/cmd/rc/pfnc.c - 664 sys sys 1100894087 1320
-sys/src/cmd/rc/plan9.c - 664 sys sys 1182906491 10154
-sys/src/cmd/rc/rc.h - 664 sys sys 1182906172 3326
-sys/src/cmd/rc/simple.c - 664 sys sys 1182890831 9219
-sys/src/cmd/rc/subr.c - 664 sys sys 1182906242 1210
+sys/src/cmd/rc/pcmd.c - 664 sys sys 1100894077 2681
+sys/src/cmd/rc/pfnc.c - 664 sys sys 1100894077 1320
+sys/src/cmd/rc/plan9.c - 664 sys sys 1182918888 10084
+sys/src/cmd/rc/rc.h - 664 sys sys 1182898644 3326
+sys/src/cmd/rc/simple.c - 664 sys sys 1182919012 9205
+sys/src/cmd/rc/subr.c - 664 sys sys 1182919084 1200
 sys/src/cmd/rc/syn.y - 664 sys sys 944961083 3128
-sys/src/cmd/rc/trap.c - 664 sys sys 1174915673 878
-sys/src/cmd/rc/tree.c - 664 sys sys 1182906201 2081
-sys/src/cmd/rc/unix.c - 664 sys sys 1182906186 8708
+sys/src/cmd/rc/trap.c - 664 sys sys 1174851077 878
+sys/src/cmd/rc/tree.c - 664 sys sys 1182898340 2081
+sys/src/cmd/rc/unix.c - 664 sys sys 1182898521 8708
 sys/src/cmd/rc/var.c - 664 sys sys 1055698781 1298
-sys/src/cmd/rc/win32.c - 664 sys sys 1182906181 8691
+sys/src/cmd/rc/win32.c - 664 sys sys 1182898536 8691
 sys/src/cmd/rdbfs.c - 664 sys sys 1142342219 7633
 sys/src/cmd/read.c - 664 sys sys 1022047660 1278
 sys/src/cmd/replica - 20000000775 sys sys 1053210813 0

dist/replica/plan9.log

@@ -49331,3 +49331,47 @@
 1182909624 0 c sys/man/1/con - 664 sys sys 1182908614 4447
 1182915022 0 c 386/bin/mk - 775 sys sys 1182914525 143314
 1182915022 1 c 386/bin/rc - 775 sys sys 1182914526 145398
+1182918623 0 c sys/src/cmd/mk/arc.c - 664 sys sys 1131129236 826
+1182918623 1 c sys/src/cmd/mk/archive.c - 664 sys sys 1131129659 3071
+1182918623 2 c sys/src/cmd/mk/env.c - 664 sys sys 1182892801 2307
+1182918623 3 c sys/src/cmd/mk/file.c - 664 sys sys 1131129253 1299
+1182918623 4 c sys/src/cmd/mk/graph.c - 664 sys sys 1131128904 5822
+1182918623 5 c sys/src/cmd/mk/lex.c - 664 sys sys 1143749754 2304
+1182918623 6 c sys/src/cmd/mk/main.c - 664 sys sys 1122474474 4790
+1182918623 7 c sys/src/cmd/mk/mk.c - 664 sys sys 1182916137 5359
+1182918623 8 c sys/src/cmd/mk/mk.h - 664 sys sys 1131128809 3765
+1182918623 9 c sys/src/cmd/mk/plan9.c - 664 sys sys 1182916397 6967
+1182918623 10 c sys/src/cmd/mk/recipe.c - 664 sys sys 1182916343 2528
+1182918623 11 c sys/src/cmd/mk/rule.c - 664 sys sys 1131129128 1946
+1182918623 12 c sys/src/cmd/mk/run.c - 664 sys sys 1182916224 5066
+1182918623 13 c sys/src/cmd/mk/shprint.c - 664 sys sys 1182916066 1523
+1182918623 14 c sys/src/cmd/mk/symtab.c - 664 sys sys 1131129280 1581
+1182918623 15 c sys/src/cmd/mk/var.c - 664 sys sys 1131129305 530
+1182918623 16 c sys/src/cmd/mk/varsub.c - 664 sys sys 1174929797 4297
+1182918623 17 c sys/src/cmd/mk/word.c - 664 sys sys 1174929845 2709
+1182920423 0 c sys/src/cmd/rc/code.c - 664 sys sys 1182898057 8218
+1182920423 1 c sys/src/cmd/rc/exec.c - 664 sys sys 1182917722 16579
+1182920423 2 c sys/src/cmd/rc/exec.h - 664 sys sys 1174851874 2828
+1182920423 3 c sys/src/cmd/rc/fns.h - 664 sys sys 1182899939 1490
+1182920423 4 c sys/src/cmd/rc/getflags.c - 664 sys sys 1182917999 3743
+1182920423 5 c sys/src/cmd/rc/getflags.h - 664 sys sys 1182886902 133
+1182920423 6 c sys/src/cmd/rc/glob.c - 664 sys sys 1182918194 4669
+1182920423 7 c sys/src/cmd/rc/havefork.c - 664 sys sys 1182918331 3751
+1182920423 8 c sys/src/cmd/rc/haventfork.c - 664 sys sys 1182918434 3141
+1182920423 9 c sys/src/cmd/rc/here.c - 664 sys sys 1182918533 2510
+1182920423 10 c sys/src/cmd/rc/io.c - 664 sys sys 1182918677 3793
+1182920423 11 c sys/src/cmd/rc/io.h - 664 sys sys 1182905845 523
+1182920423 12 c sys/src/cmd/rc/lex.c - 664 sys sys 1174851509 6203
+1182920423 13 c sys/src/cmd/rc/pcmd.c - 664 sys sys 1100894077 2681
+1182920423 14 c sys/src/cmd/rc/pfnc.c - 664 sys sys 1100894077 1320
+1182920423 15 c sys/src/cmd/rc/plan9.c - 664 sys sys 1182918888 10084
+1182920423 16 c sys/src/cmd/rc/rc.h - 664 sys sys 1182898644 3326
+1182920423 17 c sys/src/cmd/rc/simple.c - 664 sys sys 1182919012 9205
+1182920423 18 c sys/src/cmd/rc/subr.c - 664 sys sys 1182919084 1200
+1182920423 19 c sys/src/cmd/rc/trap.c - 664 sys sys 1174851077 878
+1182920423 20 c sys/src/cmd/rc/tree.c - 664 sys sys 1182898340 2081
+1182920423 21 c sys/src/cmd/rc/unix.c - 664 sys sys 1182898521 8708
+1182920423 22 c sys/src/cmd/rc/win32.c - 664 sys sys 1182898536 8691
+1182974423 0 c 386/bin/mk - 775 sys sys 1182973447 143318
+1182981623 0 c sys/man/2/time - 664 sys sys 1182980757 736
+1183001423 0 c 386/bin/rc - 775 sys sys 1183001109 145286

sys/man/2/time

@@ -29,9 +29,7 @@ is also set to the answer.
 .PP
 These functions work by reading
 .BR /dev/bintime ,
-opening that file when
-.I they
-are first called.
+opening that file when they are first called.
 .SH SOURCE
 .B /sys/src/libc/9sys/time.c
 .br

sys/src/cmd/mk/mk.c

@@ -224,8 +224,8 @@ outofdate(Node *node, Arc *arc, int eval)
 		} else
 			ret = sym->u.value;
 		return(ret-1);
-	} else if(strchr(arc->n->name, '(') && arc->n->time == 0)
-		return 1;			/* missing archive member */
+	} else if(strchr(arc->n->name, '(') && arc->n->time == 0)  /* missing archive member */
+		return 1;
 	else
 		/*
 		 * Treat equal times as out-of-date.

sys/src/cmd/mk/plan9.c

@@ -101,11 +101,10 @@ exportenv(Envy *e)
 			continue;
 		snprint(nam, sizeof nam, "/env/%s", e->name);
 		if (sy != 0 && !hasvalue) {	/* Remove from environment */
-			/*
-			 * we could remove it from the symbol table
-			 * too, but we're in the child copy, and it
-			 * would still remain in the parent's table.
-			 */
+				/* we could remove it from the symbol table
+				 * too, but we're in the child copy, and it
+				 * would still remain in the parent's table.
+				 */
 			remove(nam);
 			delword(e->values);
 			e->values = 0;		/* memory leak */
@@ -202,10 +201,12 @@ execsh(char *args, char *cmd, Bufblock *buf, Envy *e)
 		}
 		close(out[1]);
 		close(in[0]);
-		for(p = cmd + strlen(cmd); cmd < p; cmd += n){
-			n = write(in[1], cmd, p - cmd);
+		p = cmd+strlen(cmd);
+		while(cmd < p){
+			n = write(in[1], cmd, p-cmd);
 			if(n < 0)
 				break;
+			cmd += n;
 		}
 		close(in[1]);
 		_exits(0);
@@ -216,7 +217,7 @@ execsh(char *args, char *cmd, Bufblock *buf, Envy *e)
 		for(;;){
 			if (buf->current >= buf->end)
 				growbuf(buf);
-			n = read(out[0], buf->current, buf->end - buf->current);
+			n = read(out[0], buf->current, buf->end-buf->current);
 			if(n <= 0)
 				break;
 			buf->current += n;

sys/src/cmd/mk/recipe.c

@@ -24,11 +24,9 @@ dorecipe(Node *node)
 	if(r == 0){
 		if(!(node->flags&VIRTUAL) && !(node->flags&NORECIPE)){
 			if(getwd(cwd, sizeof cwd))
-				fprint(2, "mk: no recipe to make '%s' in directory %s\n",
-					node->name, cwd);
+				fprint(2, "mk: no recipe to make '%s' in directory %s\n", node->name, cwd);
 			else
-				fprint(2, "mk: no recipe to make '%s'\n",
-					node->name);
+				fprint(2, "mk: no recipe to make '%s'\n", node->name);
 			Exit();
 		}
 		if(strchr(node->name, '(') && node->time == 0)
@@ -39,8 +37,7 @@ dorecipe(Node *node)
 			if(!(node->flags&VIRTUAL))
 				touch(node->name);
 			else if(explain)
-				Bprint(&bout, "no touch of virtual '%s'\n",
-					node->name);
+				Bprint(&bout, "no touch of virtual '%s'\n", node->name);
 		}
 		return(did);
 	}
@@ -75,8 +72,7 @@ dorecipe(Node *node)
 			}
 			ww->next = newword(buf);
 			ww = ww->next;
-			if(n == node)
-				continue;
+			if(n == node) continue;
 			n->next = node->next;
 			node->next = n;
 		}
@@ -96,8 +92,7 @@ dorecipe(Node *node)
 					addw(&ln, a->n->name);
 					if(explain)
 						fprint(1, "%s(%ld) < %s(%ld)\n",
-							n->name, n->time,
-							a->n->name, a->n->time);
+							n->name, n->time, a->n->name, a->n->time);
 				}
 			} else {
 				if(explain)
@@ -107,9 +102,8 @@ dorecipe(Node *node)
 		}
 		MADESET(n, BEINGMADE);
 	}
-/*	print("lt=%s ln=%s lp=%s\n",wtos(head.next, ' '),wtos(ln.next, ' '),wtos(lp.next, ' ')); /**/
-	run(newjob(r, node, aa->stem, aa->match, lp.next, ln.next, head.next,
-		ahead.next));
+/*	print("lt=%s ln=%s lp=%s\n",wtos(head.next, ' '),wtos(ln.next, ' '),wtos(lp.next, ' '));/**/
+	run(newjob(r, node, aa->stem, aa->match, lp.next, ln.next, head.next, ahead.next));
 	return(1);
 }
 

sys/src/cmd/mk/run.c

@@ -2,20 +2,19 @@
 
 typedef struct Event
 {
-	int	pid;
-	Job	*job;
+	int pid;
+	Job *job;
 } Event;
 static Event *events;
 static int nevents, nrunning, nproclimit;
 
 typedef struct Process
 {
-	int	pid;
-	int	status;
+	int pid;
+	int status;
 	struct Process *b, *f;
 } Process;
 static Process *phead, *pfree;
-
 static void sched(void);
 static void pnew(int, int), pdelete(Process *);
 
@@ -70,8 +69,7 @@ sched(void)
 				if(!(n->flags&VIRTUAL))
 					touch(n->name);
 				else if(explain)
-					Bprint(&bout, "no touch of virtual '%s'\n",
-						n->name);
+					Bprint(&bout, "no touch of virtual '%s'\n", n->name);
 			}
 			n->time = time((long *)0);
 			MADESET(n, MADE);
@@ -88,8 +86,7 @@ sched(void)
 		usage();
 		nrunning++;
 		if(DEBUG(D_EXEC))
-			fprint(1, "pid for target %s = %d\n", wtos(j->t, ' '),
-				events[slot].pid);
+			fprint(1, "pid for target %s = %d\n", wtos(j->t, ' '), events[slot].pid);
 	}
 }
 
@@ -196,8 +193,7 @@ nproc(void)
 		fprint(1, "nprocs = %d\n", nproclimit);
 	if(nproclimit > nevents){
 		if(nevents)
-			events = (Event *)Realloc((char *)events,
-				nproclimit*sizeof(Event));
+			events = (Event *)Realloc((char *)events, nproclimit*sizeof(Event));
 		else
 			events = (Event *)Malloc(nproclimit*sizeof(Event));
 		while(nevents < nproclimit)
@@ -211,8 +207,7 @@ nextslot(void)
 	int i;
 
 	for(i = 0; i < nproclimit; i++)
-		if(events[i].pid <= 0)
-			return i;
+		if(events[i].pid <= 0) return i;
 	assert(/*out of slots!!*/ 0);
 	return 0;	/* cyntax */
 }
@@ -223,11 +218,10 @@ pidslot(int pid)
 	int i;
 
 	for(i = 0; i < nevents; i++)
-		if(events[i].pid == pid)
-			return i;
+		if(events[i].pid == pid) return(i);
 	if(DEBUG(D_EXEC))
 		fprint(2, "mk: wait returned unexpected process %d\n", pid);
-	return -1;
+	return(-1);
 }
 
 
@@ -288,7 +282,7 @@ usage(void)
 
 	time(&t);
 	if(tick)
-		tslot[nrunning] += t - tick;
+		tslot[nrunning] += (t-tick);
 	tick = t;
 }
 

sys/src/cmd/mk/shprint.c

@@ -17,7 +17,7 @@ shprint(char *s, Envy *env, Bufblock *buf)
 		else {
 			rinsert(buf, r);
 			s += n;
-			s = copyq(s, r, buf);	/* handle quoted strings */
+			s = copyq(s, r, buf);	/*handle quoted strings*/
 		}
 	}
 	insert(buf, 0);
@@ -44,7 +44,7 @@ vexpand(char *w, Envy *env, Bufblock *buf)
 	char *s, carry, *p, *q;
 
 	assert(/*vexpand no $*/ *w == '$');
-	p = w+1;		/* skip dollar sign */
+	p = w+1;	/* skip dollar sign */
 	if(*p == '{') {
 		p++;
 		q = utfrune(p, '}');
@@ -61,7 +61,7 @@ vexpand(char *w, Envy *env, Bufblock *buf)
 	if (s) {
 		bufcpy(buf, s, strlen(s));
 		free(s);
-	} else 			/* copy name intact*/
+	} else 		/* copy name intact*/
 		bufcpy(buf, w, q-w);
 	return(q);
 }
@@ -69,8 +69,8 @@ vexpand(char *w, Envy *env, Bufblock *buf)
 void
 front(char *s)
 {
-	int i, j;
 	char *t, *q;
+	int i, j;
 	char *flds[512];
 
 	q = strdup(s);
@@ -82,8 +82,7 @@ front(char *s)
 	}
 	t = s;
 	for(j = 0; j < i; j++){
-		for(s = flds[j]; *s; *t++ = *s++)
-			;
+		for(s = flds[j]; *s; *t++ = *s++);
 		*t++ = ' ';
 	}
 	*t = 0;

sys/src/cmd/rc/exec.c

@@ -530,7 +530,6 @@ Xcase(void)
 	word *p;
 	char *s;
 	int ok = 0;
-
 	s = list2str(runq->argv->next->words);
 	for(p = runq->argv->words;p;p = p->next){
 		if(match(s, p->word, '\0')){
@@ -551,7 +550,6 @@ conclist(word *lp, word *rp, word *tail)
 {
 	char *buf;
 	word *v;
-
 	if(lp->next || rp->next)
 		tail = conclist(lp->next==0? lp: lp->next,
 			rp->next==0? rp: rp->next, tail);
@@ -570,7 +568,6 @@ Xconc(void)
 	word *rp = runq->argv->next->words;
 	word *vp = runq->argv->next->next->words;
 	int lc = count(lp), rc = count(rp);
-
 	if(lc!=0 || rc!=0){
 		if(lc==0 || rc==0){
 			Xerror1("null list in concatenation");
@@ -591,7 +588,6 @@ void
 Xassign(void)
 {
 	var *v;
-
 	if(count(runq->argv->words)!=1){
 		Xerror1("variable name not singleton!");
 		return;
@@ -614,7 +610,6 @@ word*
 copywords(word *a, word *tail)
 {
 	word *v = 0, **end;
-
 	for(end=&v;a;a = a->next,end=&(*end)->next)
 		*end = newword(a->word, 0);
 	*end = tail;
@@ -627,7 +622,6 @@ Xdol(void)
 	word *a, *star;
 	char *s, *t;
 	int n;
-
 	if(count(runq->argv->words)!=1){
 		Xerror1("variable name not singleton!");
 		return;
@@ -635,16 +629,14 @@ Xdol(void)
 	s = runq->argv->words->word;
 	deglob(s);
 	n = 0;
-	for(t = s; '0'<=*t && *t<='9'; t++)
-		n = n*10 + *t - '0';
+	for(t = s;'0'<=*t && *t<='9';t++) n = n*10+*t-'0';
 	a = runq->argv->next->words;
 	if(n==0 || *t)
 		a = copywords(vlook(s)->val, a);
 	else{
 		star = vlook("*")->val;
 		if(star && 1<=n && n<=count(star)){
-			while(--n)
-				star = star->next;
+			while(--n) star = star->next;
 			a = newword(star->word, a);
 		}
 	}
@@ -658,7 +650,6 @@ Xqdol(void)
 	word *a, *p;
 	char *s;
 	int n;
-
 	if(count(runq->argv->words)!=1){
 		Xerror1("variable name not singleton!");
 		return;
@@ -692,19 +683,16 @@ subwords(word *val, int len, word *sub, word *a)
 {
 	int n;
 	char *s;
-
 	if(!sub)
 		return a;
 	a = subwords(val, len, sub->next, a);
 	s = sub->word;
 	deglob(s);
 	n = 0;
-	while('0'<=*s && *s<='9')
-		n = n*10 + *s++ - '0';
+	while('0'<=*s && *s<='9') n = n*10+ *s++ -'0';
 	if(n<1 || len<n)
 		return a;
-	for(; n!=1; --n)
-		val = val->next;
+	for(;n!=1;--n) val = val->next;
 	return newword(val->word, a);
 }
 
@@ -713,7 +701,6 @@ Xsub(void)
 {
 	word *a, *v;
 	char *s;
-
 	if(count(runq->argv->next->words)!=1){
 		Xerror1("variable name not singleton!");
 		return;
@@ -774,7 +761,6 @@ void
 Xunlocal(void)
 {
 	var *v = runq->local, *hid;
-
 	if(v==0)
 		panic("Xunlocal: no locals!", 0);
 	runq->local = v->next;
@@ -789,7 +775,6 @@ void
 freewords(word *w)
 {
 	word *nw;
-
 	while(w){
 		efree(w->word);
 		nw = w->next;
@@ -804,7 +789,6 @@ Xfn(void)
 	var *v;
 	word *a;
 	int end;
-
 	end = runq->code[runq->pc].i;
 	for(a = runq->argv->words;a;a = a->next){
 		v = gvlook(a->word);

sys/src/cmd/rc/exec.h

@@ -18,64 +18,55 @@ extern void Xerror1(char*);
  * i.e. word0->word1->word2->word3->0
  */
 struct word{
-	char	*word;
-	word	*next;
+	char *word;
+	word *next;
 };
 struct list{
-	word	*words;
-	list	*next;
+	word *words;
+	list *next;
 };
-
 word *newword(char *, word *), *copywords(word *, word *);
-
 struct redir{
-	char	type;			/* what to do */
-	short	from, to;			/* what to do it to */
+	char type;			/* what to do */
+	short from, to;			/* what to do it to */
 	struct redir *next;		/* what else to do (reverse order) */
 };
-
 #define	NSTATUS	ERRMAX			/* length of status (from plan 9) */
-
 /*
  * redir types
  */
 #define	ROPEN	1			/* dup2(from, to); close(from); */
 #define	RDUP	2			/* dup2(from, to); */
 #define	RCLOSE	3			/* close(from); */
-
 struct thread{
 	union code *code;		/* code for this thread */
-	int	pc;			/* code[pc] is the next instruction */
+	int pc;				/* code[pc] is the next instruction */
 	struct list *argv;		/* argument stack */
 	struct redir *redir;		/* redirection stack */
 	struct redir *startredir;	/* redir inheritance point */
 	struct var *local;		/* list of local variables */
-	char	*cmdfile;		/* file name in Xrdcmd */
+	char *cmdfile;			/* file name in Xrdcmd */
 	struct io *cmdfd;		/* file descriptor for Xrdcmd */
-	int	iflast;			/* static `if not' checking */
-	int	eof;			/* is cmdfd at eof? */
-	int	iflag;			/* interactive? */
-	int	lineno;			/* linenumber */
-	int	pid;			/* process for Xpipewait to wait for */
-	char	status[NSTATUS];	/* status for Xpipewait */
-	tree	*treenodes;		/* tree nodes created by this process */
-	thread	*ret;			/* who continues when this finishes */
+	int iflast;			/* static `if not' checking */
+	int eof;			/* is cmdfd at eof? */
+	int iflag;			/* interactive? */
+	int lineno;			/* linenumber */
+	int pid;			/* process for Xpipewait to wait for */
+	char status[NSTATUS];		/* status for Xpipewait */
+	tree *treenodes;		/* tree nodes created by this process */
+	thread *ret;		/* who continues when this finishes */
 };
 thread *runq;
-
 code *codecopy(code*);
-
 code *codebuf;				/* compiler output */
-int ntrap;				/* # of outstanding traps */
-int trap[NSIG];				/* # of outstanding traps per type */
-
+int ntrap;				/* number of outstanding traps */
+int trap[NSIG];				/* number of outstanding traps per type */
 struct builtin{
-	char	*name;
-	void	(*fnc)(void);
+	char *name;
+	void (*fnc)(void);
 };
-
 extern struct builtin Builtin[];
-int eflagok;		/* kludge flag so that -e doesn't exit in startup */
+int eflagok;			/* kludge flag so that -e doesn't exit in startup */
 int havefork;
 
 void execcd(void), execwhatis(void), execeval(void), execexec(void);

sys/src/cmd/rc/getflags.c

@@ -1,33 +1,27 @@
 #include "rc.h"
 #include "getflags.h"
 #include "fns.h"
-
 char *flagset[] = {"<flag>"};
 char **flag[NFLAG];
 char *cmdname;
-
-static char *flagarg = "";
+static char *flagarg="";
+static void reverse(char**, char**);
+static int scanflag(int, char*);
+static void errn(char*, int);
+static void errs(char*);
+static void errc(int);
 static int reason;
-
 #define	RESET	1
 #define	FEWARGS	2
 #define	FLAGSYN	3
 #define	BADFLAG	4
-
 static int badflag;
 
-static void reverse(char**, char**);
-static int scanflag(int, char*);
-static void errn(char*, int);
-static void errs(char*);
-static void errc(int);
-
 int
 getflags(int argc, char *argv[], char *flags, int stop)
 {
 	char *s;
 	int i, j, c, count;
-
 	flagarg = flags;
 	if(cmdname==0)
 		cmdname = argv[0];
@@ -42,26 +36,22 @@ getflags(int argc, char *argv[], char *flags, int stop)
 		}
 		s = argv[i]+1;
 		while(*s){
-			c = *s++;
+			c=*s++;
 			count = scanflag(c, flags);
-			if(count == -1)
-				return -1;
-			if(flag[c]){
-				reason = RESET;
-				badflag = c;
+			if(count==-1)
 				return -1;
-			}
+			if(flag[c]){ reason = RESET; badflag = c; return -1; }
 			if(count==0){
 				flag[c] = flagset;
 				if(*s=='\0'){
-					for(j = i+1; j <= argc; j++)
+					for(j = i+1;j<=argc;j++)
 						argv[j-1] = argv[j];
 					--argc;
 				}
 			}
 			else{
 				if(*s=='\0'){
-					for(j = i+1; j <= argc; j++)
+					for(j = i+1;j<=argc;j++)
 						argv[j-1] = argv[j];
 					--argc;
 					s = argv[i];
@@ -74,10 +64,10 @@ getflags(int argc, char *argv[], char *flags, int stop)
 				reverse(argv+i, argv+argc);
 				reverse(argv+i, argv+argc-count);
 				reverse(argv+argc-count+1, argv+argc);
-				argc -= count;
+				argc-=count;
 				flag[c] = argv+argc+1;
 				flag[c][0] = s;
-				s = "";
+				s="";
 			}
 		}
 	}
@@ -88,46 +78,33 @@ static void
 reverse(char **p, char **q)
 {
 	char *t;
-
-	for(; p < q; p++, --q){
-		t = *p;
-		*p = *q;
-		*q = t;
-	}
+	for(;p<q;p++,--q){ t=*p; *p=*q; *q = t; }
 }
 
 static int
 scanflag(int c, char *f)
 {
 	int fc, count;
-
 	if(0<=c && c<NFLAG)
 		while(*f){
 			if(*f==' '){
 				f++;
 				continue;
 			}
-			fc = *f++;
+			fc=*f++;
 			if(*f==':'){
 				f++;
-				if(*f < '0' || '9' < *f){
-					reason = FLAGSYN;
-					return -1;
-				}
+				if(*f<'0' || '9'<*f){ reason = FLAGSYN; return -1; }
 				count = 0;
-				while('0' <= *f && *f <= '9')
-					count = count*10 + *f++ - '0';
+				while('0'<=*f && *f<='9') count = count*10+*f++-'0';
 			}
 			else
 				count = 0;
 			if(*f=='['){
 				do{
 					f++;
-					if(*f=='\0'){
-						reason = FLAGSYN;
-						return -1;
-					}
-				}while(*f != ']');
+					if(*f=='\0'){ reason = FLAGSYN; return -1; }
+				}while(*f!=']');
 				f++;
 			}
 			if(c==fc)
@@ -234,27 +211,21 @@ usage(char *tail)
 static void
 errn(char *s, int count)
 {
-	while(count){
-		errc(*s++);
-		--count;
-	}
+	while(count){ errc(*s++); --count; }
 }
 
 static void
 errs(char *s)
 {
-	while(*s)
-		errc(*s++);
+	while(*s) errc(*s++);
 }
-
 #define	NBUF	80
-
 static char buf[NBUF], *bufp = buf;
 
 static void
 errc(int c)
 {
-	*bufp++ = c;
+	*bufp++=c;
 	if(bufp==&buf[NBUF] || c=='\n'){
 		Write(2, buf, bufp-buf);
 		bufp = buf;

sys/src/cmd/rc/glob.c

@@ -1,10 +1,8 @@
 #include "rc.h"
 #include "exec.h"
 #include "fns.h"
-
 char *globname;
 struct word *globv;
-
 /*
  * delete all the GLOB marks from s, in place
  */
@@ -14,11 +12,10 @@ deglob(void *as)
 {
 	char *s = as;
 	char *t = s;
-	
 	do{
 		if(*t==GLOB)
 			t++;
-		*s++ = *t;
+		*s++=*t;
 	}while(*t++);
 }
 
@@ -34,15 +31,11 @@ globsort(word *left, word *right)
 	char **list;
 	word *a;
 	int n = 0;
-
-	for(a = left;a!=right;a = a->next)
-		n++;
+	for(a = left;a!=right;a = a->next) n++;
 	list = (char **)emalloc(n*sizeof(char *));
-	for(a = left,n = 0;a!=right;a = a->next,n++)
-		list[n] = a->word;
+	for(a = left,n = 0;a!=right;a = a->next,n++) list[n] = a->word;
 	qsort((void *)list, n, sizeof(void *), globcmp);
-	for(a = left,n = 0;a!=right;a = a->next,n++)
-		a->word = list[n];
+	for(a = left,n = 0;a!=right;a = a->next,n++) a->word = list[n];
 	efree((char *)list);
 }
 /*
@@ -80,20 +73,16 @@ globdir(uchar *p, uchar *namep)
 	}
 	/* read the directory and recur for any entry that matches */
 	*namep='\0';
-	if((f = Opendir(globname[0]? globname: ".")) < 0)
-		return;
-	while(*newp!='/' && *newp!='\0')
-		newp++;
+	if((f = Opendir(globname[0]?globname:"."))<0) return;
+	while(*newp!='/' && *newp!='\0') newp++;
 	while(Readdir(f, namep, *newp=='/')){
 		if(matchfn(namep, p)){
-			for(t = namep;*t;t++)
-				;
+			for(t = namep;*t;t++);
 			globdir(newp, t);
 		}
 	}
 	Closedir(f);
 }
-
 /*
  * Push all file names matched by p on the current thread's stack.
  * If there are no matches, the list consists of p.
@@ -129,10 +118,9 @@ glob(void *ap)
 int
 equtf(uchar *p, uchar *q)
 {
-	if(*p != *q)
+	if(*p!=*q)
 		return 0;
-	if(twobyte(*p))
-		return p[1]==q[1];
+	if(twobyte(*p)) return p[1]==q[1];
 	if(threebyte(*p)){
 		if(p[1]!=q[1])
 			return 0;
@@ -150,10 +138,8 @@ equtf(uchar *p, uchar *q)
 uchar*
 nextutf(uchar *p)
 {
-	if(twobyte(*p))
-		return p[1]=='\0'? p+1: p+2;
-	if(threebyte(*p))
-		return p[1]=='\0'? p+1: p[2]=='\0'? p+2: p+3;
+	if(twobyte(*p)) return p[1]=='\0'?p+1:p+2;
+	if(threebyte(*p)) return p[1]=='\0'?p+1:p[2]=='\0'?p+2:p+3;
 	return p+1;
 }
 /*

sys/src/cmd/rc/havefork.c

@@ -118,8 +118,7 @@ Xbackq(void)
 					s = wd;
 				}
 			}
-			else
-				*s++=c;
+			else *s++=c;
 		}
 		if(s!=wd){
 			*s='\0';
@@ -143,10 +142,10 @@ void
 Xpipefd(void)
 {
 	struct thread *p = runq;
-	int pc = p->pc, pid, sidefd, mainfd;
-	int pfd[2];
+	int pc = p->pc, pid;
 	char name[40];
-
+	int pfd[2];
+	int sidefd, mainfd;
 	if(pipe(pfd)<0){
 		Xerror("can't get pipe");
 		return;

sys/src/cmd/rc/haventfork.c

@@ -196,10 +196,9 @@ execforkexec(void)
 				strcat(file, "/");
 				nc++;
 			}
-			if(nc + strlen(argv[1]) < sizeof file){
+			if(nc+strlen(argv[1])<sizeof(file)){
 				strcat(file, argv[1]);
-				pid = ForkExecute(file, argv+1, mapfd(0),
-					mapfd(1), mapfd(2));
+				pid = ForkExecute(file, argv+1, mapfd(0), mapfd(1), mapfd(2));
 				if(pid >= 0){
 					free(argv);
 					return pid;

sys/src/cmd/rc/here.c

@@ -2,9 +2,7 @@
 #include "exec.h"
 #include "io.h"
 #include "fns.h"
-
 struct here *here, **ehere;
-
 int ser = 0;
 char tmp[]="/tmp/here0000.0000";
 char hex[]="0123456789abcdef";
@@ -15,17 +13,16 @@ void pstrs(io*, word*);
 void
 hexnum(char *p, int n)
 {
-	*p++ = hex[(n>>12)&0xF];
-	*p++ = hex[(n>>8)&0xF];
-	*p++ = hex[(n>>4)&0xF];
-	*p   = hex[n&0xF];
+	*p++=hex[(n>>12)&0xF];
+	*p++=hex[(n>>8)&0xF];
+	*p++=hex[(n>>4)&0xF];
+	*p = hex[n&0xF];
 }
 
 tree*
 heredoc(tree *tag)
 {
 	struct here *h = new(struct here);
-
 	if(tag->type!=WORD)
 		yyerror("Bad here tag");
 	h->next = 0;
@@ -40,7 +37,6 @@ heredoc(tree *tag)
 	h->name = strdup(tmp);
 	return token(tmp, WORD);
 }
-
 /*
  * bug: lines longer than NLINE get split -- this can cause spurious
  * missubstitution, or a misrecognized EOF marker.
@@ -50,14 +46,13 @@ heredoc(tree *tag)
 void
 readhere(void)
 {
-	int c, subst;
 	struct here *h, *nexth;
 	io *f;
 	char *s, *tag;
+	int c, subst;
 	char line[NLINE+1];
-
 	for(h = here;h;h = nexth){
-		subst = !h->tag->quoted;
+		subst=!h->tag->quoted;
 		tag = h->tag->str;
 		c = Creat(h->name);
 		if(c<0)
@@ -65,11 +60,10 @@ readhere(void)
 		f = openfd(c);
 		s = line;
 		pprompt();
-		while((c = rchr(runq->cmdfd)) != EOF){
-			if(c == '\n' || s == &line[NLINE]){
+		while((c = rchr(runq->cmdfd))!=EOF){
+			if(c=='\n' || s==&line[NLINE]){
 				*s='\0';
-				if(tag && strcmp(line, tag)==0)
-					break;
+				if(tag && strcmp(line, tag)==0) break;
 				if(subst)
 					psubst(f, (uchar *)line);
 				else
@@ -79,11 +73,9 @@ readhere(void)
 					pprompt();
 					pchr(f, c);
 				}
-				else
-					*s++=c;
+				else *s++=c;
 			}
-			else
-				*s++=c;
+			else *s++=c;
 		}
 		flush(f);
 		closeio(f);
@@ -101,7 +93,6 @@ psubst(io *f, uchar *s)
 	int savec, n;
 	uchar *t, *u;
 	word *star;
-
 	while(*s){
 		if(*s!='$'){
 			if(0xa0 <= *s && *s <= 0xf5){
@@ -120,22 +111,19 @@ psubst(io *f, uchar *s)
 			pchr(f, *s++);
 		}
 		else{
-			t = ++s;
+			t=++s;
 			if(*t=='$')
 				pchr(f, *t++);
 			else{
-				while(*t && idchr(*t))
-					t++;
-				savec = *t;
-				*t = '\0';
+				while(*t && idchr(*t)) t++;
+				savec=*t;
+				*t='\0';
 				n = 0;
-				for(u = s;*u && '0'<=*u && *u<='9';u++)
-					n = n*10 + *u-'0';
+				for(u = s;*u && '0'<=*u && *u<='9';u++) n = n*10+*u-'0';
 				if(n && *u=='\0'){
 					star = vlook("*")->val;
-					if(star && 1 <= n && n <= count(star)){
-						while(--n)
-							star = star->next;
+					if(star && 1<=n && n<=count(star)){
+						while(--n) star = star->next;
 						pstr(f, star->word);
 					}
 				}

sys/src/cmd/rc/io.c

@@ -12,11 +12,10 @@ pfmt(io *f, char *fmt, ...)
 {
 	va_list ap;
 	char err[ERRMAX];
-
 	va_start(ap, fmt);
 	pfmtnest++;
-	for(; *fmt; fmt++)
-		if(*fmt != '%')
+	for(;*fmt;fmt++)
+		if(*fmt!='%')
 			pchr(f, *fmt);
 		else switch(*++fmt){
 		case '\0':
@@ -66,8 +65,7 @@ pchr(io *b, int c)
 {
 	if(b->bufp==b->ebuf)
 		fullbuf(b, c);
-	else
-		*b->bufp++ = c;
+	else *b->bufp++=c;
 }
 
 int
@@ -82,11 +80,10 @@ void
 pquo(io *f, char *s)
 {
 	pchr(f, '\'');
-	for(; *s; s++)
+	for(;*s;s++)
 		if(*s=='\'')
 			pfmt(f, "''");
-		else
-			pchr(f, *s);
+		else pchr(f, *s);
 	pchr(f, '\'');
 }
 
@@ -94,14 +91,10 @@ void
 pwrd(io *f, char *s)
 {
 	char *t;
-
-	for(t = s; *t; t++)
-		if(!wordchr(*t))
-			break;
+	for(t = s;*t;t++) if(!wordchr(*t)) break;
 	if(t==s || *t)
 		pquo(f, s);
-	else
-		pstr(f, s);
+	else pstr(f, s);
 }
 
 void
@@ -112,11 +105,9 @@ pptr(io *f, void *v)
 
 	p = (uintptr)v;
 	if(sizeof(uintptr) == sizeof(uvlong) && p>>32)
-		for(n = 60; n >= 32; n -= 4)
-			pchr(f, "0123456789ABCDEF"[(p>>n)&0xF]);
+		for(n = 60;n>=32;n-=4) pchr(f, "0123456789ABCDEF"[(p>>n)&0xF]);
 
-	for(n = 28; n >= 0; n -= 4)
-		pchr(f, "0123456789ABCDEF"[(p>>n)&0xF]);
+	for(n = 28;n>=0;n-=4) pchr(f, "0123456789ABCDEF"[(p>>n)&0xF]);
 }
 
 void
@@ -124,15 +115,14 @@ pstr(io *f, char *s)
 {
 	if(s==0)
 		s="(null)";
-	while(*s)
-		pchr(f, *s++);
+	while(*s) pchr(f, *s++);
 }
 
 void
 pdec(io *f, int n)
 {
 	if(n<0){
-		n = -n;
+		n=-n;
 		if(n>=0){
 			pchr(f, '-');
 			pdec(f, n);
@@ -175,7 +165,7 @@ int
 fullbuf(io *f, int c)
 {
 	flush(f);
-	return *f->bufp++ = c;
+	return *f->bufp++=c;
 }
 
 void
@@ -200,7 +190,7 @@ flush(io *f)
 				dotrap();
 		}
 		f->bufp = f->buf;
-		f->ebuf = f->buf + NBUF;
+		f->ebuf = f->buf+NBUF;
 	}
 }
 
@@ -208,7 +198,6 @@ io*
 openfd(int fd)
 {
 	io *f = new(struct io);
-
 	f->fd = fd;
 	f->bufp = f->ebuf = f->buf;
 	f->strp = 0;
@@ -226,7 +215,6 @@ openstr(void)
 	memset(f->bufp, '\0', Stralloc+1);
 	return f;
 }
-
 /*
  * Open a corebuffer to read.  EOF occurs after reading len
  * characters from buf.
@@ -240,7 +228,7 @@ opencore(char *s, int len)
 
 	f->fd = -1 /*open("/dev/null", 0)*/;
 	f->bufp = f->strp = buf;
-	f->ebuf = buf + len;
+	f->ebuf = buf+len;
 	Memcpy(buf, s, len);
 	return f;
 }
@@ -248,18 +236,18 @@ opencore(char *s, int len)
 void
 rewind(io *io)
 {
-	if(io->fd == -1)
+	if(io->fd==-1)
 		io->bufp = io->strp;
 	else{
 		io->bufp = io->ebuf = io->buf;
-		Seek(io->fd, 0, 0);
+		Seek(io->fd, 0L, 0);
 	}
 }
 
 void
 closeio(io *io)
 {
-	if(io->fd >= 0)
+	if(io->fd>=0)
 		close(io->fd);
 	if(io->strp)
 		efree(io->strp);
@@ -270,9 +258,7 @@ int
 emptybuf(io *f)
 {
 	int n;
-
-	if(f->fd == -1 || (n = Read(f->fd, f->buf, NBUF)) <= 0)
-		return EOF;
+	if(f->fd==-1 || (n = Read(f->fd, f->buf, NBUF))<=0) return EOF;
 	f->bufp = f->buf;
 	f->ebuf = f->buf + n;
 	return *f->bufp++;

sys/src/cmd/rc/plan9.c

@@ -31,12 +31,10 @@ char *syssigname[] = {
 };
 char Rcmain[]="/rc/lib/rcmain";
 char Fdprefix[]="/fd/";
-
 void execfinit(void);
 void execbind(void);
 void execmount(void);
 void execnewpgrp(void);
-
 builtin Builtin[] = {
 	"cd",		execcd,
 	"whatis",	execwhatis,
@@ -57,7 +55,6 @@ execnewpgrp(void)
 {
 	int arg;
 	char *s;
-
 	switch(count(runq->argv->words)){
 	case 1:
 		arg = RFENVG|RFNAMEG|RFNOTEG;
@@ -124,8 +121,7 @@ Vinit(void)
 		for(i = 0; i<nent; i++){
 			len = ent[i].length;
 			if(len && strncmp(ent[i].name, "fn#", 3)!=0){
-				snprint(envname, sizeof envname, "/env/%s",
-					ent[i].name);
+				snprint(envname, sizeof envname, "/env/%s", ent[i].name);
 				if((f = open(envname, 0))>=0){
 					buf = emalloc(len+1);
 					n = readn(f, buf, len);
@@ -139,8 +135,7 @@ Vinit(void)
 						buf[len++]='\0';
 					s = buf+len-1;
 					for(;;){
-						while(s!=buf && s[-1]!='\0')
-							--s;
+						while(s!=buf && s[-1]!='\0') --s;
 						val = newword(s, val);
 						if(s==buf)
 							break;
@@ -157,7 +152,6 @@ Vinit(void)
 	}
 	close(dir);
 }
-
 int envdir;
 
 void
@@ -182,8 +176,7 @@ Xrdfn(void)
 			nent--;
 			len = e->length;
 			if(len && strncmp(e->name, "fn#", 3)==0){
-				snprint(envname, sizeof envname, "/env/%s",
-					e->name);
+				snprint(envname, sizeof envname, "/env/%s", e->name);
 				if((f = open(envname, 0))>=0){
 					execcmds(openfd(f));
 					return;
@@ -194,7 +187,6 @@ Xrdfn(void)
 	close(envdir);
 	Xreturn();
 }
-
 union code rdfns[4];
 
 void
@@ -243,8 +235,7 @@ Waitfor(int pid, int)
 	}
 
 	errstr(errbuf, sizeof errbuf);
-	if(strcmp(errbuf, "interrupted")==0)
-		return -1;
+	if(strcmp(errbuf, "interrupted")==0) return -1;
 	return 0;
 }
 
@@ -253,9 +244,7 @@ mkargv(word *a)
 {
 	char **argv = (char **)emalloc((count(a)+2)*sizeof(char *));
 	char **argp = argv+1;	/* leave one at front for runcoms */
-
-	for(; a; a = a->next)
-		*argp++ = a->word;
+	for(;a;a = a->next) *argp++=a->word;
 	*argp = 0;
 	return argv;
 }
@@ -267,15 +256,14 @@ addenv(var *v)
 	word *w;
 	int f;
 	io *fd;
-
 	if(v->changed){
 		v->changed = 0;
 		snprint(envname, sizeof envname, "/env/%s", v->name);
 		if((f = Creat(envname))<0)
 			pfmt(err, "rc: can't open %s: %r\n", envname);
 		else{
-			for(w = v->val; w; w = w->next)
-				write(f, w->word, strlen(w->word) + 1);
+			for(w = v->val;w;w = w->next)
+				write(f, w->word, strlen(w->word)+1L);
 			close(f);
 		}
 	}
@@ -308,9 +296,8 @@ void
 Updenv(void)
 {
 	var *v, **h;
-
-	for(h = gvar; h != &gvar[NVAR]; h++)
-		for(v = *h; v; v = v->next)
+	for(h = gvar;h!=&gvar[NVAR];h++)
+		for(v=*h;v;v = v->next)
 			addenv(v);
 	if(runq)
 		updenvlocal(runq->local);
@@ -351,9 +338,8 @@ Execute(word *args, word *path)
 	char **argv = mkargv(args);
 	char file[1024];
 	int nc;
-
 	Updenv();
-	for(; path; path = path->next){
+	for(;path;path = path->next){
 		nc = strlen(path->word);
 		if(nc < sizeof file - 1){	/* 1 for / */
 			strcpy(file, path->word);
@@ -365,22 +351,19 @@ Execute(word *args, word *path)
 				strcat(file, argv[1]);
 				exec(file, argv+1);
 			}
-			else
-				werrstr("command name too long");
+			else werrstr("command name too long");
 		}
 	}
 	rerrstr(file, sizeof file);
 	pfmt(err, "%s: %s\n", argv[1], file);
 	efree((char *)argv);
 }
-
-#define	NDIR	256		/* should be a better way */
+#define	NDIR	256		/* shoud be a better way */
 
 int
 Globsize(char *p)
 {
 	int isglob = 0, globlen = NDIR+1;
-
 	for(;*p;p++){
 		if(*p==GLOB){
 			p++;
@@ -393,7 +376,6 @@ Globsize(char *p)
 	}
 	return isglob?globlen:0;
 }
-
 #define	NFD	50
 
 struct{
@@ -407,7 +389,6 @@ Opendir(char *name)
 {
 	Dir *db;
 	int f;
-
 	f = open(name, 0);
 	if(f==-1)
 		return f;
@@ -440,7 +421,7 @@ trimdirs(Dir *d, int nd)
  * onlydirs is advisory -- it means you only
  * need to return the directories.  it's okay to
  * return files too (e.g., on unix where you can't
- * tell during the readdir), but that just makes
+ * tell during the readdir), but that just makes 
  * the globber work harder.
  */
 int
@@ -460,7 +441,7 @@ Again:
 				n = trimdirs(dir[f].dbuf, n);
 				if(n == 0)
 					goto Again;
-			}
+			}	
 			dir[f].n = n;
 		}else
 			dir[f].n = 0;
@@ -484,20 +465,15 @@ Closedir(int f)
 	}
 	close(f);
 }
-
 int interrupted = 0;
-
 void
 notifyf(void*, char *s)
 {
 	int i;
-
-	for(i = 0; syssigname[i]; i++)
-		if(strncmp(s, syssigname[i], strlen(syssigname[i])) == 0){
-			if(strncmp(s, "sys: ", 5) != 0)
-				interrupted = 1;
-			goto Out;
-		}
+	for(i = 0;syssigname[i];i++) if(strncmp(s, syssigname[i], strlen(syssigname[i]))==0){
+		if(strncmp(s, "sys: ", 5)!=0) interrupted = 1;
+		goto Out;
+	}
 	pfmt(err, "rc: note: %s\n", s);
 	noted(NDFLT);
 	return;
@@ -552,7 +528,7 @@ Executable(char *file)
 	statbuf = dirstat(file);
 	if(statbuf == nil)
 		return 0;
-	ret = ((statbuf->mode&0111) != 0 && !(statbuf->mode&DMDIR));
+	ret = ((statbuf->mode&0111)!=0 && (statbuf->mode&DMDIR)==0);
 	free(statbuf);
 	return ret;
 }
@@ -560,7 +536,7 @@ Executable(char *file)
 int
 Creat(char *file)
 {
-	return create(file, 1, 0666);
+	return create(file, 1, 0666L);
 }
 
 int
@@ -647,7 +623,7 @@ void
 delwaitpid(int pid)
 {
 	int r, w;
-
+	
 	for(r=w=0; r<nwaitpids; r++)
 		if(waitpids[r] != pid)
 			waitpids[w++] = waitpids[r];

sys/src/cmd/rc/simple.c

@@ -10,13 +10,10 @@
  * Search through the following code to see if we're just going to exit.
  */
 int
-exitnext(void)
-{
-	union code *c = &runq->code[runq->pc];
-
-	while(c->f == Xpopredir)
-		c++;
-	return c->f == Xexit;
+exitnext(void){
+	union code *c=&runq->code[runq->pc];
+	while(c->f==Xpopredir) c++;
+	return c->f==Xexit;
 }
 
 void
@@ -27,7 +24,6 @@ Xsimple(void)
 	var *v;
 	struct builtin *bp;
 	int pid;
-
 	globlist();
 	a = runq->argv->words;
 	if(a==0){
@@ -318,7 +314,6 @@ execeval(void)
 	execcmds(opencore(cmdline, len));
 	efree(cmdline);
 }
-
 union code dotcmds[14];
 
 void
@@ -434,15 +429,13 @@ execflag(void)
 }
 
 void
-execwhatis(void)	/* mildly wrong -- should fork before writing */
-{
+execwhatis(void){	/* mildly wrong -- should fork before writing */
 	word *a, *b, *path;
 	var *v;
 	struct builtin *bp;
 	char *file;
 	struct io out[1];
 	int found, sep;
-
 	a = runq->argv->words->next;
 	if(a==0){
 		Xerror1("Usage: whatis name ...");

sys/src/cmd/rc/subr.c

@@ -20,10 +20,8 @@ efree(void *p)
 /*	pfmt(err, "free %p\n", p); flush(err); /**/
 	if(p)
 		free(p);
-	else
-		pfmt(err, "free 0\n");
+	else pfmt(err, "free 0\n");
 }
-
 extern int lastword, lastdol;
 
 void
@@ -42,20 +40,18 @@ yyerror(char *m)
 	flush(err);
 	lastword = 0;
 	lastdol = 0;
-	while(lastc!='\n' && lastc!=EOF)
-		advance();
+	while(lastc!='\n' && lastc!=EOF) advance();
 	nerror++;
 	setvar("status", newword(m, (word *)0));
 }
-
 char *bp;
 
 static void
 iacvt(int n)
 {
 	if(n<0){
-		*bp++ = '-';
-		n = -n;	/* doesn't work for n==-inf */
+		*bp++='-';
+		n=-n;	/* doesn't work for n==-inf */
 	}
 	if(n/10)
 		iacvt(n/10);