Browse Source

Plan 9 from Bell Labs 2008-06-01

David du Colombier 12 years ago
parent
commit
0a4329dae9

+ 14 - 14
dist/replica/_plan9.db

@@ -1308,7 +1308,7 @@ lib/face/48x48x2/x - 20000000775 sys sys 1020895710 0
 lib/face/48x48x2/y - 20000000775 sys sys 1020895710 0
 lib/face/48x48x2/z - 20000000775 sys sys 1020895710 0
 lib/face/48x48x4 - 20000000775 sys sys 1123100641 0
-lib/face/48x48x4/.dict - 664 sys sys 1169491565 3548
+lib/face/48x48x4/.dict - 664 sys sys 1212252650 3637
 lib/face/48x48x4/Z - 20000000775 sys sys 1020895710 0
 lib/face/48x48x4/a - 20000000775 sys sys 1056984105 0
 lib/face/48x48x4/a/adb.1 - 664 sys sys 944941890 962
@@ -7173,7 +7173,7 @@ sys/lib/tmac/tmac.pictures - 664 sys sys 944956203 4320
 sys/lib/tmac/tmac.psychrefs - 664 sys sys 944956203 608
 sys/lib/tmac/tmac.ptx - 664 sys sys 944956203 330
 sys/lib/tmac/tmac.rscover - 664 sys sys 944956203 2070
-sys/lib/tmac/tmac.s - 664 sys sys 1210784977 23053
+sys/lib/tmac/tmac.s - 664 sys sys 1212272101 23059
 sys/lib/tmac/tmac.scover - 664 sys sys 944956204 4616
 sys/lib/tmac/tmac.sdisp - 664 sys sys 944956204 864
 sys/lib/tmac/tmac.skeep - 664 sys sys 944956204 1346
@@ -7817,7 +7817,7 @@ sys/man/6/regexp - 664 sys sys 1196638945 2050
 sys/man/6/rewrite - 664 sys sys 1196638945 3235
 sys/man/6/smtpd - 664 sys sys 1196638945 8178
 sys/man/6/snap - 664 sys sys 1196638945 2402
-sys/man/6/style - 664 sys sys 1205985568 2659
+sys/man/6/style - 664 sys sys 1212274740 2813
 sys/man/6/thumbprint - 664 sys sys 1196638945 1124
 sys/man/6/users - 664 sys sys 1196638945 1392
 sys/man/6/utf - 664 sys sys 1196638945 2430
@@ -9191,7 +9191,7 @@ sys/src/boot/pc/devfloppy.c - 664 sys sys 1212010456 15657
 sys/src/boot/pc/devfloppy.h - 664 sys sys 1032409559 4081
 sys/src/boot/pc/devi82365.c - 664 sys sys 1144961189 15051
 sys/src/boot/pc/devpccard.c - 664 sys sys 1153333456 33897
-sys/src/boot/pc/devsd.c - 664 sys sys 1212010316 11567
+sys/src/boot/pc/devsd.c - 664 sys sys 1212259573 11548
 sys/src/boot/pc/dma.c - 664 sys sys 1015007949 4972
 sys/src/boot/pc/dosboot.c - 664 sys sys 1212010488 11337
 sys/src/boot/pc/dosfs.h - 664 sys sys 1032215924 1467
@@ -12733,16 +12733,16 @@ sys/src/cmd/lex/mkfile - 664 sys sys 1032060382 328
 sys/src/cmd/lex/ncform - 664 sys sys 1211224619 3973
 sys/src/cmd/lex/parser.y - 664 sys sys 1136219175 14263
 sys/src/cmd/lex/sub1.c - 664 sys sys 1138551488 10162
-sys/src/cmd/lex/sub2.c - 664 sys sys 1135921541 17089
+sys/src/cmd/lex/sub2.c - 664 sys sys 1212260386 17044
 sys/src/cmd/lnfs.c - 664 sys sys 1094156765 13332
 sys/src/cmd/look.c - 664 sys sys 944961619 5994
 sys/src/cmd/lp - 20000000775 sys sys 1039727564 0
 sys/src/cmd/lp/LOCK.c - 664 sys sys 1015090023 1066
 sys/src/cmd/lp/ipcopen.c - 664 sys sys 944961017 1607
 sys/src/cmd/lp/lp.rc - 775 sys sys 1209583969 5273
-sys/src/cmd/lp/lpdaemon.c - 664 sys sys 1032060412 10000
+sys/src/cmd/lp/lpdaemon.c - 664 sys sys 1212260740 9925
 sys/src/cmd/lp/lpdsend.c - 664 sys sys 1116770113 9583
-sys/src/cmd/lp/lpsend.c - 664 sys sys 1015090024 6180
+sys/src/cmd/lp/lpsend.c - 664 sys sys 1212261425 6138
 sys/src/cmd/lp/lpsend.rc - 775 sys sys 953344615 361
 sys/src/cmd/lp/mkfile - 664 sys sys 953344616 535
 sys/src/cmd/ls.c - 664 sys sys 1169752489 5640
@@ -13541,15 +13541,15 @@ sys/src/cmd/tbl/t.h - 664 sys sys 944961244 3987
 sys/src/cmd/tbl/t0.c - 664 sys sys 944961244 1009
 sys/src/cmd/tbl/t1.c - 664 sys sys 1138551479 1554
 sys/src/cmd/tbl/t2.c - 664 sys sys 944961244 298
-sys/src/cmd/tbl/t3.c - 664 sys sys 944961244 1836
+sys/src/cmd/tbl/t3.c - 664 sys sys 1212258964 1816
 sys/src/cmd/tbl/t4.c - 664 sys sys 944961244 8360
-sys/src/cmd/tbl/t5.c - 664 sys sys 944961244 3723
-sys/src/cmd/tbl/t6.c - 664 sys sys 1131293512 7295
+sys/src/cmd/tbl/t5.c - 664 sys sys 1212259040 3714
+sys/src/cmd/tbl/t6.c - 664 sys sys 1212259041 7286
 sys/src/cmd/tbl/t7.c - 664 sys sys 944961244 3422
 sys/src/cmd/tbl/t8.c - 664 sys sys 1131293517 9041
-sys/src/cmd/tbl/t9.c - 664 sys sys 944961244 1577
+sys/src/cmd/tbl/t9.c - 664 sys sys 1212259072 1568
 sys/src/cmd/tbl/tb.c - 664 sys sys 944961244 1732
-sys/src/cmd/tbl/tc.c - 664 sys sys 1138463701 1414
+sys/src/cmd/tbl/tc.c - 664 sys sys 1212258839 1279
 sys/src/cmd/tbl/te.c - 664 sys sys 944961244 1071
 sys/src/cmd/tbl/tf.c - 664 sys sys 944961244 1283
 sys/src/cmd/tbl/tg.c - 664 sys sys 1128819351 2164
@@ -15697,7 +15697,7 @@ sys/src/libsec/port/md4test.c - 664 sys sys 984710522 537
 sys/src/libsec/port/md5.c - 664 sys sys 1188328428 3418
 sys/src/libsec/port/md5block.c - 664 sys sys 985124885 5015
 sys/src/libsec/port/md5pickle.c - 664 sys sys 1104105067 716
-sys/src/libsec/port/mkfile - 664 sys sys 1044931345 879
+sys/src/libsec/port/mkfile - 664 sys sys 1212270780 927
 sys/src/libsec/port/nfastrand.c - 664 sys sys 1063853595 354
 sys/src/libsec/port/primetest.c - 664 sys sys 984710523 2486
 sys/src/libsec/port/prng.c - 664 sys sys 984710523 187
@@ -15711,7 +15711,7 @@ sys/src/libsec/port/rsaencrypt.c - 664 sys sys 984710524 192
 sys/src/libsec/port/rsafill.c - 664 sys sys 1045502171 1104
 sys/src/libsec/port/rsagen.c - 664 sys sys 1084318869 1462
 sys/src/libsec/port/rsaprivtopub.c - 664 sys sys 984710525 237
-sys/src/libsec/port/rsatest.c - 664 sys sys 984710525 1095
+sys/src/libsec/port/rsatest.c - 664 sys sys 1212270788 1083
 sys/src/libsec/port/sha1.c - 664 sys sys 1188328426 2446
 sys/src/libsec/port/sha1block.c - 664 sys sys 1015013580 4673
 sys/src/libsec/port/sha1pickle.c - 664 sys sys 988225292 717

+ 14 - 14
dist/replica/plan9.db

@@ -1308,7 +1308,7 @@ lib/face/48x48x2/x - 20000000775 sys sys 1020895710 0
 lib/face/48x48x2/y - 20000000775 sys sys 1020895710 0
 lib/face/48x48x2/z - 20000000775 sys sys 1020895710 0
 lib/face/48x48x4 - 20000000775 sys sys 1123100641 0
-lib/face/48x48x4/.dict - 664 sys sys 1169491565 3548
+lib/face/48x48x4/.dict - 664 sys sys 1212252650 3637
 lib/face/48x48x4/Z - 20000000775 sys sys 1020895710 0
 lib/face/48x48x4/a - 20000000775 sys sys 1056984105 0
 lib/face/48x48x4/a/adb.1 - 664 sys sys 944941890 962
@@ -7173,7 +7173,7 @@ sys/lib/tmac/tmac.pictures - 664 sys sys 944956203 4320
 sys/lib/tmac/tmac.psychrefs - 664 sys sys 944956203 608
 sys/lib/tmac/tmac.ptx - 664 sys sys 944956203 330
 sys/lib/tmac/tmac.rscover - 664 sys sys 944956203 2070
-sys/lib/tmac/tmac.s - 664 sys sys 1210784977 23053
+sys/lib/tmac/tmac.s - 664 sys sys 1212272101 23059
 sys/lib/tmac/tmac.scover - 664 sys sys 944956204 4616
 sys/lib/tmac/tmac.sdisp - 664 sys sys 944956204 864
 sys/lib/tmac/tmac.skeep - 664 sys sys 944956204 1346
@@ -7817,7 +7817,7 @@ sys/man/6/regexp - 664 sys sys 1196638945 2050
 sys/man/6/rewrite - 664 sys sys 1196638945 3235
 sys/man/6/smtpd - 664 sys sys 1196638945 8178
 sys/man/6/snap - 664 sys sys 1196638945 2402
-sys/man/6/style - 664 sys sys 1205985568 2659
+sys/man/6/style - 664 sys sys 1212274740 2813
 sys/man/6/thumbprint - 664 sys sys 1196638945 1124
 sys/man/6/users - 664 sys sys 1196638945 1392
 sys/man/6/utf - 664 sys sys 1196638945 2430
@@ -9191,7 +9191,7 @@ sys/src/boot/pc/devfloppy.c - 664 sys sys 1212010456 15657
 sys/src/boot/pc/devfloppy.h - 664 sys sys 1032409559 4081
 sys/src/boot/pc/devi82365.c - 664 sys sys 1144961189 15051
 sys/src/boot/pc/devpccard.c - 664 sys sys 1153333456 33897
-sys/src/boot/pc/devsd.c - 664 sys sys 1212010316 11567
+sys/src/boot/pc/devsd.c - 664 sys sys 1212259573 11548
 sys/src/boot/pc/dma.c - 664 sys sys 1015007949 4972
 sys/src/boot/pc/dosboot.c - 664 sys sys 1212010488 11337
 sys/src/boot/pc/dosfs.h - 664 sys sys 1032215924 1467
@@ -12733,16 +12733,16 @@ sys/src/cmd/lex/mkfile - 664 sys sys 1032060382 328
 sys/src/cmd/lex/ncform - 664 sys sys 1211224619 3973
 sys/src/cmd/lex/parser.y - 664 sys sys 1136219175 14263
 sys/src/cmd/lex/sub1.c - 664 sys sys 1138551488 10162
-sys/src/cmd/lex/sub2.c - 664 sys sys 1135921541 17089
+sys/src/cmd/lex/sub2.c - 664 sys sys 1212260386 17044
 sys/src/cmd/lnfs.c - 664 sys sys 1094156765 13332
 sys/src/cmd/look.c - 664 sys sys 944961619 5994
 sys/src/cmd/lp - 20000000775 sys sys 1039727564 0
 sys/src/cmd/lp/LOCK.c - 664 sys sys 1015090023 1066
 sys/src/cmd/lp/ipcopen.c - 664 sys sys 944961017 1607
 sys/src/cmd/lp/lp.rc - 775 sys sys 1209583969 5273
-sys/src/cmd/lp/lpdaemon.c - 664 sys sys 1032060412 10000
+sys/src/cmd/lp/lpdaemon.c - 664 sys sys 1212260740 9925
 sys/src/cmd/lp/lpdsend.c - 664 sys sys 1116770113 9583
-sys/src/cmd/lp/lpsend.c - 664 sys sys 1015090024 6180
+sys/src/cmd/lp/lpsend.c - 664 sys sys 1212261425 6138
 sys/src/cmd/lp/lpsend.rc - 775 sys sys 953344615 361
 sys/src/cmd/lp/mkfile - 664 sys sys 953344616 535
 sys/src/cmd/ls.c - 664 sys sys 1169752489 5640
@@ -13541,15 +13541,15 @@ sys/src/cmd/tbl/t.h - 664 sys sys 944961244 3987
 sys/src/cmd/tbl/t0.c - 664 sys sys 944961244 1009
 sys/src/cmd/tbl/t1.c - 664 sys sys 1138551479 1554
 sys/src/cmd/tbl/t2.c - 664 sys sys 944961244 298
-sys/src/cmd/tbl/t3.c - 664 sys sys 944961244 1836
+sys/src/cmd/tbl/t3.c - 664 sys sys 1212258964 1816
 sys/src/cmd/tbl/t4.c - 664 sys sys 944961244 8360
-sys/src/cmd/tbl/t5.c - 664 sys sys 944961244 3723
-sys/src/cmd/tbl/t6.c - 664 sys sys 1131293512 7295
+sys/src/cmd/tbl/t5.c - 664 sys sys 1212259040 3714
+sys/src/cmd/tbl/t6.c - 664 sys sys 1212259041 7286
 sys/src/cmd/tbl/t7.c - 664 sys sys 944961244 3422
 sys/src/cmd/tbl/t8.c - 664 sys sys 1131293517 9041
-sys/src/cmd/tbl/t9.c - 664 sys sys 944961244 1577
+sys/src/cmd/tbl/t9.c - 664 sys sys 1212259072 1568
 sys/src/cmd/tbl/tb.c - 664 sys sys 944961244 1732
-sys/src/cmd/tbl/tc.c - 664 sys sys 1138463701 1414
+sys/src/cmd/tbl/tc.c - 664 sys sys 1212258839 1279
 sys/src/cmd/tbl/te.c - 664 sys sys 944961244 1071
 sys/src/cmd/tbl/tf.c - 664 sys sys 944961244 1283
 sys/src/cmd/tbl/tg.c - 664 sys sys 1128819351 2164
@@ -15697,7 +15697,7 @@ sys/src/libsec/port/md4test.c - 664 sys sys 984710522 537
 sys/src/libsec/port/md5.c - 664 sys sys 1188328428 3418
 sys/src/libsec/port/md5block.c - 664 sys sys 985124885 5015
 sys/src/libsec/port/md5pickle.c - 664 sys sys 1104105067 716
-sys/src/libsec/port/mkfile - 664 sys sys 1044931345 879
+sys/src/libsec/port/mkfile - 664 sys sys 1212270780 927
 sys/src/libsec/port/nfastrand.c - 664 sys sys 1063853595 354
 sys/src/libsec/port/primetest.c - 664 sys sys 984710523 2486
 sys/src/libsec/port/prng.c - 664 sys sys 984710523 187
@@ -15711,7 +15711,7 @@ sys/src/libsec/port/rsaencrypt.c - 664 sys sys 984710524 192
 sys/src/libsec/port/rsafill.c - 664 sys sys 1045502171 1104
 sys/src/libsec/port/rsagen.c - 664 sys sys 1084318869 1462
 sys/src/libsec/port/rsaprivtopub.c - 664 sys sys 984710525 237
-sys/src/libsec/port/rsatest.c - 664 sys sys 984710525 1095
+sys/src/libsec/port/rsatest.c - 664 sys sys 1212270788 1083
 sys/src/libsec/port/sha1.c - 664 sys sys 1188328426 2446
 sys/src/libsec/port/sha1block.c - 664 sys sys 1015013580 4673
 sys/src/libsec/port/sha1pickle.c - 664 sys sys 988225292 717

+ 14 - 0
dist/replica/plan9.log

@@ -19769,3 +19769,17 @@
 1212100207 2 d sys/src/boot/pc/devbios.h - 664 sys sys 1193167027 0
 1212177605 0 c sys/man/3/audio - 664 sys sys 1212176738 2957
 1212184806 0 c sys/man/3/aoe - 664 sys sys 1212183705 6647
+1212253203 0 c lib/face/48x48x4/.dict - 664 sys sys 1212252650 3637
+1212260404 0 c sys/src/boot/pc/devsd.c - 664 sys sys 1212259573 11548
+1212260404 1 c sys/src/cmd/lex/sub2.c - 664 sys sys 1212260386 17044
+1212260404 2 c sys/src/cmd/lp/lpdaemon.c - 664 sys sys 1212260740 9925
+1212260404 3 c sys/src/cmd/tbl/t3.c - 664 sys sys 1212258964 1816
+1212260404 4 c sys/src/cmd/tbl/t5.c - 664 sys sys 1212259040 3714
+1212260404 5 c sys/src/cmd/tbl/t6.c - 664 sys sys 1212259041 7286
+1212260404 6 c sys/src/cmd/tbl/t9.c - 664 sys sys 1212259072 1568
+1212260404 7 c sys/src/cmd/tbl/tc.c - 664 sys sys 1212258839 1279
+1212262204 0 c sys/src/cmd/lp/lpsend.c - 664 sys sys 1212261425 6138
+1212271204 0 c sys/src/libsec/port/mkfile - 664 sys sys 1212270780 927
+1212271204 1 c sys/src/libsec/port/rsatest.c - 664 sys sys 1212270788 1083
+1212273004 0 c sys/lib/tmac/tmac.s - 664 sys sys 1212272101 23059
+1212274804 0 c sys/man/6/style - 664 sys sys 1212274740 2813

+ 3 - 0
lib/face/48x48x4/.dict

@@ -5,6 +5,8 @@ aes.org/unknown u/unknown.aes.org
 aladdin.com/unknown g/ghost.1
 alcatel-lucent.com/ehg e/ehg.1
 alcatel-lucent.com/jmk j/jmk.1
+alcatel-lucent.com/ram r/ram.1
+alcatel-lucent.com/sjf s/sjf.1
 alcatel-lucent.com/trickey h/howard.1
 amazon.com.uk/unkown u/book.1
 amazon.com/unkown u/book.1
@@ -73,6 +75,7 @@ bell-labs.com/ches c/ches.1
 binarydream.org/uriel u/uriel.1
 binarydream.org/uriell u/uriel.1
 cat-v.org/uriel u/uriel.1
+cheswick.com/ches c/ches.1
 closedmind.org/presotto p/presotto.1
 collyer.net/geoff g/geoff.1
 comcast.net/jbmckie j/jmk.1

+ 1 - 0
sys/lib/tmac/tmac.s

@@ -850,6 +850,7 @@ Computing Science Technical Report No. \\*(MN
 .vs \\n(VSp
 .vs \\nvu
 .ft 1
+.in 0
 .di
 .br
 .sp \\n(DVu

+ 8 - 0
sys/man/6/style

@@ -61,6 +61,14 @@ follow the standard idioms: use
 not
 .LR "0 > x" ,
 etc.
+.IP •
+don't write
+.L !strcmp
+(nor
+.LR !memcmp ,
+etc.);
+always explicitly compare the result of string comparison with zero using
+a relational operator.
 .PP
 Ultimately, the goal is to write code that fits in with the other code
 around it and the system as a whole.  If the file you are editing

+ 2 - 4
sys/src/boot/pc/devsd.c

@@ -601,11 +601,11 @@ void
 sleep(void*, int (*fn)(void*), void *v)
 {
 	int x;
+
 	x = spllo();
 	while(!fn(v))
 		;
 	splx(x);
-	return;
 }
 
 void
@@ -615,11 +615,9 @@ tsleep(void*, int (*fn)(void*), void *v, int msec)
 	ulong start;
 
 	x = spllo();
-	for(start = m->ticks; TK2MS(m->ticks - start) < msec
-		&& !fn(v); )
+	for(start = m->ticks; TK2MS(m->ticks - start) < msec && !fn(v); )
 		;
 	splx(x);
-	return;
 }
 
 void*

+ 0 - 5
sys/src/cmd/lex/sub2.c

@@ -106,7 +106,6 @@ add(int **array, int n)
 	nxtpos = temp;
 	if(nxtpos >= positions+maxpos)
 		error("Too many positions %s",(maxpos== MAXPOS?"\nTry using %p num":""));
-	return;
 }
 
 void
@@ -538,7 +537,6 @@ pstate(int s)
 		if(j%30 == 0)print("\n");
 	}
 	print("\n");
-	return;
 }
 # endif
 
@@ -655,7 +653,6 @@ acompute(int s)	/* compute action list = set of poss. actions */
 # endif
 	Bprint(&fout,"0,\n");
 	aptr++;
-	return;
 }
 
 # ifdef DEBUG
@@ -688,7 +685,6 @@ pccl(void) {
 		}
 	}
 	print("\n");
-	return;
 }
 # endif
 
@@ -706,7 +702,6 @@ mkmatch(void)
 	/* tab[i] = principal char for new ccl i */
 	for(i = 1; i<NCH; i++)
 		match[i] = tab[cindex[i]];
-	return;
 }
 
 void

+ 13 - 14
sys/src/cmd/lp/lpdaemon.c

@@ -1,15 +1,14 @@
-#include <sys/types.h>
-#include <unistd.h>
+#include <stdio.h>
 #include <stdlib.h>
-#include <sys/wait.h>
+#include <string.h>
+#include <errno.h>
 #include <fcntl.h>
-#include <stdlib.h>
-#include <stdio.h>
 #include <signal.h>
-#include <errno.h>
-#include <time.h>
-#include <string.h>
 #include <stdarg.h>
+#include <time.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/wait.h>
 
 /* for Plan 9 */
 #ifdef PLAN9
@@ -85,12 +84,11 @@ error(char *s1, ...)
 	chartime = ctime(&thetime);
 	fprintf(fp, "%.15s [%5.5d] ", &(chartime[4]), getpid());
 	va_start(ap, s1);
-	while((args[argno++] = va_arg(ap, char*)) && argno<8);
+	while((args[argno++] = va_arg(ap, char*)) && argno<8)
+		;
 	va_end(ap);
 	fprintf(fp, s1, args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7]);
-	fflush(fp);
 	fclose(fp);
-	return;
 }
 
 void
@@ -125,7 +123,8 @@ forklp(int inputfd)
 		error("exec failed\n");
 		exit(3);
 	default:
-		while(wait((int *)0) != cpid);
+		while(wait((int *)0) != cpid)
+			;
 	}
 }
 
@@ -326,8 +325,8 @@ main()
 	int i, blen, rv, saveflg, savargcnt;
 	struct jobinfo *jinfop;
 
-	signal(1, SIG_IGN);		/* SIGHUP not in lcc */
-	signal(14, alarmhandler);	/* SIGALRM not in lcc */
+	signal(SIGHUP, SIG_IGN);
+	signal(SIGALRM, alarmhandler);
 	cp = argvstr;
 	/* setup argv[0] for exec */
 	argvals[argcnt++] = cp;

+ 7 - 16
sys/src/cmd/lp/lpsend.c

@@ -67,10 +67,10 @@ error(int level, char *s1, ...)
 		fprint(stderr, "%.15s ", &(chartime[4]));
 	}
 	va_start(ap, s1);
-	while(args[argno++] = va_arg(ap, char*));
+	while(args[argno++] = va_arg(ap, char*))
+		;
 	va_end(ap);
 	fprint(stderr, s1, *args);
-	return;
 }
 
 int
@@ -95,8 +95,7 @@ error(int level, char *s1, ...)
 		chartime = ctime(&thetime);
 		fprintf(stderr, "%.15s ", &(chartime[4]));
 	}
-	fprintf(stderr, s1, (&s1+1));
-	return;
+	fprintf(stderr, s1, &s1 + 1);
 }
 
 void
@@ -186,27 +185,19 @@ tempfile(void)
 
 	sprint(tmpf, "/tmp/lp%d.%d", getpid(), tindx++);
 	if((tmpfd=create(tmpf,
-
 #ifdef plan9
-
-						ORDWR|OTRUNC,
-
+		ORDWR|OTRUNC,
 #endif
-
-												0666)) < 0) {
+	    0666)) < 0) {
 		error(0, "cannot create temp file %s\n", tmpf);
 		exits("cannot create temp file");
 	}
 	close(tmpfd);
 	if((tmpfd=open(tmpf, ORDWR
-
 #ifdef plan9
-
-						|ORCLOSE|OTRUNC
-
+		|ORCLOSE|OTRUNC
 #endif
-
-									)) < 0) {
+	    )) < 0) {
 		error(0, "cannot open temp file %s\n", tmpf);
 		exits("cannot open temp file");
 	}

+ 3 - 7
sys/src/cmd/tbl/t3.c

@@ -1,5 +1,6 @@
 /* t3.c: interpret commands affecting whole table */
 # include "t.h"
+
 struct optstr {
 	char	*optnam; 
 	int	*optadd;
@@ -24,8 +25,8 @@ struct optstr {
 	"LINESIZE", &linsize,
 	"delim", &delim1,
 	"DELIM", &delim1,
-	0, 0};
-
+	0, 0
+};
 
 void
 getcomm(void)
@@ -84,10 +85,8 @@ getcomm(void)
 	}
 	cp++;
 	backrest(cp);
-	return;
 }
 
-
 void
 backrest(char *cp)
 {
@@ -98,7 +97,4 @@ backrest(char *cp)
 	un1getc('\n');
 	while (s > cp)
 		un1getc(*--s);
-	return;
 }
-
-

+ 0 - 1
sys/src/cmd/tbl/t5.c

@@ -97,7 +97,6 @@ gettbl(void)
 	permute();
 	if (textflg) 
 		untext();
-	return;
 }
 
 

+ 0 - 1
sys/src/cmd/tbl/t6.c

@@ -193,7 +193,6 @@ maktab(void)			/* define the tab stops of the table */
 		Bprint(&tabout, ".nr TW +((%d*\\n(%d)/2)\n", tsep, TMP);
 	Bprint(&tabout,
 	    ".if t .if (\\n(TW+\\n(.o)>7.65i .tm Table at line %d file %s is too wide - \\n(TW units\n", iline - 1, ifile);
-	return;
 }
 
 

+ 0 - 1
sys/src/cmd/tbl/t9.c

@@ -18,7 +18,6 @@ yetmore(void)
 	while (gets1(cstore = cspace, MAXCHS) && domore(cstore))
 		;
 	last = cstore;
-	return;
 }
 
 

+ 13 - 21
sys/src/cmd/tbl/tc.c

@@ -1,6 +1,9 @@
 /* tc.c: find character not in table to delimit fields */
 # include "t.h"
 
+# define COMMON "\002\003\005\006\007!%&#/?,:;<=>@`^~_{}+-*" \
+	"ABCDEFGHIJKMNOPQRSTUVWXZabcdefgjkoqrstwxyz"
+
 void
 choochar(void)
 {
@@ -12,9 +15,7 @@ choochar(void)
 		had[icol] = 0;
 	F1 = F2 = 0;
 	for (ilin = 0; ilin < nlin; ilin++) {
-		if (instead[ilin]) 
-			continue;
-		if (fullbot[ilin]) 
+		if (instead[ilin] || fullbot[ilin])
 			continue;
 		for (icol = 0; icol < ncol; icol++) {
 			k = ctype(ilin, icol);
@@ -22,24 +23,18 @@ choochar(void)
 				continue;
 			s = table[ilin][icol].col;
 			if (point(s))
- 				while (*s) {
- 					if((unsigned char)*s < 128)
- 						had[(unsigned char)*s] = 1;
- 					s++;
- 				}
+				for (; *s; s++)
+					if((unsigned char)*s < 128)
+						had[(unsigned char)*s] = 1;
 			s = table[ilin][icol].rcol;
 			if (point(s))
- 				while (*s) {
- 					if((unsigned char)*s < 128)
- 						had[(unsigned char)*s] = 1;
- 					s++;
- 				}
+				for (; *s; s++)
+					if((unsigned char)*s < 128)
+						had[(unsigned char)*s] = 1;
 		}
 	}
 				/* choose first funny character */
-	for (
-	    s = "\002\003\005\006\007!%&#/?,:;<=>@`^~_{}+-*ABCDEFGHIJKMNOPQRSTUVWXYZabcdefgjkoqrstwxyz"; 
-	    *s; s++) {
+	for (s = COMMON "Y"; *s; s++) {
 		if (had[*s] == 0) {
 			F1 = *s;
 			had[F1] = 1;
@@ -47,9 +42,7 @@ choochar(void)
 		}
 	}
 				/* choose second funny character */
-	for (
-	    s = "\002\003\005\006\007:_~^`@;,<=>#%&!/?{}+-*ABCDEFGHIJKMNOPQRSTUVWXZabcdefgjkoqrstuwxyz"; 
-	    *s; s++) {
+	for (s = COMMON "u"; *s; s++) {
 		if (had[*s] == 0) {
 			F2 = *s;
 			break;
@@ -57,13 +50,12 @@ choochar(void)
 	}
 	if (F1 == 0 || F2 == 0)
 		error("couldn't find characters to use for delimiters");
-	return;
 }
 
 int
 point(char *ss)
 {
-	int s = (int)(uintptr)ss;
+	vlong s = (uintptr)ss;
 
 	return(s >= 128 || s < 0);
 }

+ 3 - 0
sys/src/libsec/port/mkfile

@@ -28,3 +28,6 @@ UPDATE=mkfile\
 	$CFILES\
 
 </sys/src/cmd/mksyslib
+
+$O.rsatest: rsatest.$O
+	$LD -o $target $prereq

+ 6 - 7
sys/src/libsec/port/rsatest.c

@@ -6,16 +6,15 @@
 void
 main(void)
 {
-	RSApriv *rsa;
-	Biobuf b;
-	char *p;
 	int n;
-	mpint *clr, *enc, *clr2;
-	uchar buf[4096];
-	uchar *e;
 	vlong start;
+	char *p;
+	uchar buf[4096];
+	Biobuf b;
+	RSApriv *rsa;
+	mpint *clr, *enc, *clr2;
 
-	fmtinstall('B', mpconv);
+	fmtinstall('B', mpfmt);
 
 	rsa = rsagen(1024, 16, 0);
 	if(rsa == nil)