New year, new work. I left gs(1) alone, as it is an import. Notes: Wed Jan 4 07:37:23 EST 2006 rsc Thanks. One fix: your history patch printed usage to stdout. Reference: /n/sources/patch/applied/man1-sync4 Date: Tue Jan 3 16:04:12 CET 2006 Reviewed-by: rsc --- /sys/man/1/freq Tue Jan 3 15:59:31 2006 +++ /sys/man/1/freq Tue Jan 3 15:59:27 2006 @@ -4,7 +4,7 @@ .SH SYNOPSIS .B freq [ -.B -dxocr +.B -cdorx ] [ .I file ... --- /sys/src/cmd/freq.c Tue Jan 3 15:59:49 2006 +++ /sys/src/cmd/freq.c Tue Jan 3 15:59:45 2006 @@ -5,6 +5,7 @@ long count[1<<16]; Biobuf bout; +void usage(void); void freq(int, char*); long flag; enum @@ -24,9 +25,6 @@ flag = 0; Binit(&bout, 1, OWRITE); ARGBEGIN{ - default: - fprint(2, "freq: unknown option %c\n", ARGC()); - exits("usage"); case 'd': flag |= Fdec; break; @@ -42,6 +40,8 @@ case 'r': flag |= Frune; break; + default: + usage(); }ARGEND if((flag&(Fdec|Fhex|Foct|Fchar)) == 0) flag |= Fdec | Fhex | Foct | Fchar; @@ -59,6 +59,13 @@ close(f); } exits(0); +} + +void +usage(void) +{ + fprint(2, "usage: freq [-cdorx] [file ...]\n"); + exits("usage"); } void --- /sys/man/1/grep Tue Jan 3 16:00:12 2006 +++ /sys/man/1/grep Tue Jan 3 16:00:08 2006 @@ -4,9 +4,15 @@ .SH SYNOPSIS .B grep [ -.I option ... +.B -bchiLlnsv ] +[ +.B -e .I pattern +[ +.B -f +.I patternfile +] [ .I file ... ] --- /sys/src/cmd/grep/main.c Tue Jan 3 16:00:38 2006 +++ /sys/src/cmd/grep/main.c Tue Jan 3 16:00:34 2006 @@ -1,11 +1,11 @@ #define EXTERN #include "grep.h" -char *validflags = "1bchiLlnsv"; +char *validflags = "bchiLlnsv"; void usage(void) { - fprint(2, "usage: grep [-%s] [-f file] [-e expr] [file ...]\n", validflags); + fprint(2, "usage: grep [-%s] [-e pattern] [-f patternfile] [file ...]\n", validflags); exits("usage"); } --- /sys/man/1/gview Tue Jan 3 16:01:09 2006 +++ /sys/man/1/gview Tue Jan 3 16:01:05 2006 @@ -4,14 +4,11 @@ .SH SYNOPSIS .B gview [ -.B -l -.I logfile -] -[ -.B -m +.B -mp ] [ -.B -p +.B -l +.I logfile ] [ .I files --- /sys/src/cmd/gview.c Tue Jan 3 16:01:58 2006 +++ /sys/src/cmd/gview.c Tue Jan 3 16:01:45 2006 @@ -1960,7 +1960,7 @@ int i; fprintf(stderr,"Usage %s [options] [infile]\n", argv0); fprintf(stderr, -"option ::= -l logfile | -m\n" +"option ::= -l logfile | -m | -p\n" "\n" "Read a polygonal line graph in an ASCII format (one x y pair per line, delimited\n" "by spaces with a label after each polyline), and view it interactively. Use\n" @@ -1968,6 +1968,7 @@ "Option -l specifies a file in which to log the coordinates of each point selected.\n" "(Clicking a point with button one selects it and displays its coordinates and\n" "the label of its polylone.) Option -m allows polylines to be moved and rotated.\n" +"The -p option plots only the vertices of the polygons.\n" "The polyline labels can use the following color names:" ); for (i=0; clrtab[i].c!=DNofill; i++) @@ -1981,15 +1982,18 @@ int e; ARGBEGIN { - case 'm': cantmv=0; + case 'm': + cantmv=0; break; - case 'l': logfil = fopen(ARGF(),"w"); + case 'l': + logfil = fopen(ARGF(),"w"); break; case 'p': plotdots++; break; - default: usage(); - } ARGEND + default: + usage(); + } ARGEND; if(initdraw(0, 0, "gview") < 0) exits("initdraw"); --- /sys/man/1/hoc Tue Jan 3 16:02:40 2006 +++ /sys/man/1/hoc Tue Jan 3 16:02:36 2006 @@ -4,11 +4,11 @@ .SH SYNOPSIS .B hoc [ -.I file ... -] -[ .B -e .I expression +] +[ +.I file ... ] .SH DESCRIPTION .I Hoc --- /sys/src/cmd/history.c Tue Jan 3 16:03:26 2006 +++ /sys/src/cmd/history.c Tue Jan 3 16:03:21 2006 @@ -12,6 +12,7 @@ int diffb; char* sflag; +void usage(void); void ysearch(char*, char*); long starttime(char*); void lastbefore(ulong, char*, char*, char*); @@ -26,7 +27,7 @@ ndump = nil; ARGBEGIN { default: - goto usage; + usage(); case 'v': verb = 1; break; @@ -50,15 +51,19 @@ break; } ARGEND - if(argc == 0) { - usage: - fprint(2, "usage: history [-bDfuv] [-d 9fsname] [-s yyyymmdd] files\n"); - exits(0); - } + if(argc == 0) + usage(); for(i=0; i