diff options
Diffstat (limited to 'usr.bin/vis')
| -rw-r--r-- | usr.bin/vis/foldit.c | 3 | ||||
| -rw-r--r-- | usr.bin/vis/vis.c | 13 |
2 files changed, 9 insertions, 7 deletions
diff --git a/usr.bin/vis/foldit.c b/usr.bin/vis/foldit.c index 6cf63f3..898e341 100644 --- a/usr.bin/vis/foldit.c +++ b/usr.bin/vis/foldit.c @@ -44,6 +44,7 @@ static const char rcsid[] = int foldit(chunk, col, max) char *chunk; + int col, max; { register char *cp; @@ -60,7 +61,7 @@ again: col = 0; break; case '\t': - col = col + 8 &~ 07; + col = (col + 8) &~ 07; break; case '\b': col = col ? col - 1 : 0; diff --git a/usr.bin/vis/vis.c b/usr.bin/vis/vis.c index 0ff6a21..740308e 100644 --- a/usr.bin/vis/vis.c +++ b/usr.bin/vis/vis.c @@ -54,12 +54,13 @@ static const char rcsid[] = int eflags, fold, foldwidth=80, none, markeol, debug; -void process __P((FILE *, char *filename)); +void process __P((FILE *)); static void usage __P((void)); extern int foldit __P((char *, int, int)); int main(argc, argv) + int argc; char *argv[]; { FILE *fp; @@ -115,13 +116,13 @@ main(argc, argv) if (*argv) while (*argv) { if ((fp=fopen(*argv, "r")) != NULL) - process(fp, *argv); + process(fp); else warn("%s", *argv); argv++; } else - process(stdin, "<stdin>"); + process(stdin); exit(0); } @@ -138,12 +139,12 @@ usage() } void -process(fp, filename) +process(fp) FILE *fp; - char *filename; { static int col = 0; - register char *cp = "\0"+1; /* so *(cp-1) starts out != '\n' */ + static char dummy[] = "\0"; + register char *cp = dummy+1; /* so *(cp-1) starts out != '\n' */ register int c, rachar; char buff[5]; |
