Audit expand(1)

Not much to do here. Forgot a colon in the manpage and some style-
changes in the code.
This commit is contained in:
FRIGN 2015-03-13 00:37:37 +01:00
parent 9fd4a745f8
commit b12041365d
3 changed files with 11 additions and 9 deletions

2
README
View File

@ -29,7 +29,7 @@ The following tools are implemented ('*' == finished, '#' == UTF-8 support,
=*| du yes none
=*| echo yes none
=*| env yes none
#* expand yes none
#*| expand yes none
#* expr yes none
=*| false yes none
= find yes none

View File

@ -1,4 +1,4 @@
.Dd January 25, 2015
.Dd March 13, 2015
.Dt EXPAND 1
.Os sbase
.Sh NAME
@ -48,4 +48,4 @@ specification.
.Pp
The
.Op Fl i
flag is an extension to that specification
flag is an extension to that specification.

View File

@ -27,6 +27,7 @@ parselist(const char *s)
tablist = ereallocarray(tablist, i + 1, sizeof(*tablist));
/* tab length = 1 for the overflowing case later in the matcher */
tablist[i] = 1;
return i;
}
@ -87,8 +88,8 @@ int
main(int argc, char *argv[])
{
FILE *fp;
int ret = 0;
char *tl = "8";
int ret = 0;
ARGBEGIN {
case 'i':
@ -105,18 +106,19 @@ main(int argc, char *argv[])
tablistlen = parselist(tl);
if (argc == 0) {
if (!argc) {
expand("<stdin>", stdin);
} else {
for (; argc > 0; argc--, argv++) {
if (!(fp = fopen(argv[0], "r"))) {
weprintf("fopen %s:", argv[0]);
for (; *argv; argc--, argv++) {
if (!(fp = fopen(*argv, "r"))) {
weprintf("fopen %s:", *argv);
ret = 1;
continue;
}
expand(argv[0], fp);
expand(*argv, fp);
fclose(fp);
}
}
return ret;
}