0545d32ce9
In general, POSIX does not define /dev/std{in, out, err} because it does not want to depend on the dev-filesystem. For utilities, it thus introduced the '-'-keyword to denote standard input (and output in some cases) and the programs have to deal with it accordingly. Sadly, the design of many tools doesn't allow strict shell-redirections and many scripts don't even use this feature when possible. Thus, we made the decision to implement it consistently across all tools where it makes sense (namely those which read files). Along the way, I spotted some behavioural bugs in libutil/crypt.c and others where it was forgotten to fshut the files after use.
129 lines
2.2 KiB
C
129 lines
2.2 KiB
C
/* See LICENSE file for copyright and license details. */
|
|
#include <stdint.h>
|
|
#include <stdlib.h>
|
|
|
|
#include "utf.h"
|
|
#include "util.h"
|
|
|
|
static int iflag = 0;
|
|
static size_t *tablist = NULL;
|
|
static size_t tablistlen = 0;
|
|
|
|
static size_t
|
|
parselist(const char *s)
|
|
{
|
|
size_t i;
|
|
char *p, *tmp;
|
|
|
|
tmp = estrdup(s);
|
|
for (i = 0; (p = strsep(&tmp, " ,")); i++) {
|
|
if (*p == '\0')
|
|
eprintf("empty field in tablist\n");
|
|
tablist = ereallocarray(tablist, i + 1, sizeof(*tablist));
|
|
tablist[i] = estrtonum(p, 1, MIN(LLONG_MAX, SIZE_MAX));
|
|
if (i > 0 && tablist[i - 1] >= tablist[i])
|
|
eprintf("tablist must be ascending\n");
|
|
}
|
|
tablist = ereallocarray(tablist, i + 1, sizeof(*tablist));
|
|
/* tab length = 1 for the overflowing case later in the matcher */
|
|
tablist[i] = 1;
|
|
|
|
return i;
|
|
}
|
|
|
|
static int
|
|
expand(const char *file, FILE *fp)
|
|
{
|
|
size_t bol = 1, col = 0, i;
|
|
Rune r;
|
|
|
|
while (efgetrune(&r, fp, file)) {
|
|
switch (r) {
|
|
case '\t':
|
|
if (tablistlen == 1)
|
|
i = 0;
|
|
else for (i = 0; i < tablistlen; i++)
|
|
if (col < tablist[i])
|
|
break;
|
|
if (bol || !iflag) {
|
|
do {
|
|
col++;
|
|
putchar(' ');
|
|
} while (col % tablist[i]);
|
|
} else {
|
|
putchar('\t');
|
|
col = tablist[i];
|
|
}
|
|
break;
|
|
case '\b':
|
|
bol = 0;
|
|
if (col)
|
|
col--;
|
|
putchar('\b');
|
|
break;
|
|
case '\n':
|
|
bol = 1;
|
|
col = 0;
|
|
putchar('\n');
|
|
break;
|
|
default:
|
|
col++;
|
|
if (r != ' ')
|
|
bol = 0;
|
|
efputrune(&r, stdout, "<stdout>");
|
|
break;
|
|
}
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static void
|
|
usage(void)
|
|
{
|
|
eprintf("usage: %s [-i] [-t tablist] [file ...]\n", argv0);
|
|
}
|
|
|
|
int
|
|
main(int argc, char *argv[])
|
|
{
|
|
FILE *fp;
|
|
int ret = 0;
|
|
char *tl = "8";
|
|
|
|
ARGBEGIN {
|
|
case 'i':
|
|
iflag = 1;
|
|
break;
|
|
case 't':
|
|
tl = EARGF(usage());
|
|
if (!*tl)
|
|
eprintf("tablist cannot be empty\n");
|
|
break;
|
|
default:
|
|
usage();
|
|
} ARGEND;
|
|
|
|
tablistlen = parselist(tl);
|
|
|
|
if (!argc) {
|
|
expand("<stdin>", stdin);
|
|
} else {
|
|
for (; *argv; argc--, argv++) {
|
|
if ((*argv)[0] == '-' && !(*argv)[1]) {
|
|
*argv = "<stdin>";
|
|
fp = stdin;
|
|
} else if (!(fp = fopen(*argv, "r"))) {
|
|
weprintf("fopen %s:", *argv);
|
|
ret = 1;
|
|
continue;
|
|
}
|
|
expand(*argv, fp);
|
|
if (fp != stdin && fshut(fp, *argv))
|
|
ret = 1;
|
|
}
|
|
}
|
|
|
|
return !!(fshut(stdin, "<stdin>") + fshut(stdout, "<stdout>")) || ret;
|
|
}
|