midfavila/sbase
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

nl(1) should handle up to 1 file

Browse Source
This commit is contained in:
sin 2014-12-04 12:04:41 +00:00
parent 86c88d8b3a
commit 761599ae61
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nl.1
View File

@ -9,7 +9,7 @@ nl \- number lines
.IR increment ]
.RB [ \-s
.IR separator ]
.RI [ file ...]
.RI [ file ]
.SH DESCRIPTION
.B nl
reads each file in sequence and writes it to stdout with non\-empty lines

18
nl.c
View File

@ -18,8 +18,7 @@ static regex_t preg;
static void
usage(void)
{
eprintf("usage: %s [-b style] [-i increment] [-s sep] [FILE...]\n",
argv0);
eprintf("usage: %s [-b style] [-i increment] [-s sep] [file]\n", argv0);
}
int
@ -27,7 +26,6 @@ main(int argc, char *argv[])
{
FILE *fp;
char *r;
int ret = 0;
ARGBEGIN {
case 'b':
@ -48,18 +46,18 @@ main(int argc, char *argv[])
usage();
} ARGEND;
if (argc > 1)
usage();
if (argc == 0) {
nl("<stdin>", stdin);
} else for (; argc > 0; argc--, argv++) {
if (!(fp = fopen(argv[0], "r"))) {
weprintf("fopen %s:", argv[0]);
ret = 1;
continue;
}
} else {
if (!(fp = fopen(argv[0], "r")))
eprintf("fopen %s:", argv[0]);
nl(argv[0], fp);
fclose(fp);
}
return ret;
return 0;
}
void