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.
140 lines
2.5 KiB
C
140 lines
2.5 KiB
C
/* See LICENSE file for copyright and license details. */
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
|
|
#include "utf.h"
|
|
#include "util.h"
|
|
|
|
struct fdescr {
|
|
FILE *fp;
|
|
const char *name;
|
|
};
|
|
|
|
static void
|
|
sequential(struct fdescr *dsc, int fdescrlen, Rune *delim, size_t delimlen)
|
|
{
|
|
Rune c, last;
|
|
size_t i, d;
|
|
|
|
for (i = 0; i < fdescrlen; i++) {
|
|
d = 0;
|
|
last = 0;
|
|
|
|
while (efgetrune(&c, dsc[i].fp, dsc[i].name)) {
|
|
if (last == '\n') {
|
|
if (delim[d] != '\0')
|
|
efputrune(&delim[d], stdout, "<stdout>");
|
|
d = (d + 1) % delimlen;
|
|
}
|
|
|
|
if (c != '\n')
|
|
efputrune(&c, stdout, "<stdout>");
|
|
last = c;
|
|
}
|
|
|
|
if (last == '\n')
|
|
efputrune(&last, stdout, "<stdout>");
|
|
}
|
|
}
|
|
|
|
static void
|
|
parallel(struct fdescr *dsc, int fdescrlen, Rune *delim, size_t delimlen)
|
|
{
|
|
Rune c, d;
|
|
size_t i, m;
|
|
ssize_t last;
|
|
|
|
nextline:
|
|
last = -1;
|
|
|
|
for (i = 0; i < fdescrlen; i++) {
|
|
d = delim[i % delimlen];
|
|
c = 0;
|
|
|
|
for (; efgetrune(&c, dsc[i].fp, dsc[i].name) ;) {
|
|
for (m = last + 1; m < i; m++)
|
|
efputrune(&(delim[m % delimlen]), stdout, "<stdout>");
|
|
last = i;
|
|
if (c == '\n') {
|
|
if (i != fdescrlen - 1)
|
|
c = d;
|
|
efputrune(&c, stdout, "<stdout>");
|
|
break;
|
|
}
|
|
efputrune(&c, stdout, "<stdout>");
|
|
}
|
|
|
|
if (c == 0 && last != -1) {
|
|
if (i == fdescrlen - 1)
|
|
putchar('\n');
|
|
else
|
|
efputrune(&d, stdout, "<stdout>");
|
|
last++;
|
|
}
|
|
}
|
|
if (last != -1)
|
|
goto nextline;
|
|
}
|
|
|
|
static void
|
|
usage(void)
|
|
{
|
|
eprintf("usage: %s [-s] [-d list] file ...\n", argv0);
|
|
}
|
|
|
|
int
|
|
main(int argc, char *argv[])
|
|
{
|
|
struct fdescr *dsc;
|
|
Rune *delim;
|
|
size_t i, len;
|
|
int seq = 0, ret = 0;
|
|
char *adelim = "\t";
|
|
|
|
ARGBEGIN {
|
|
case 's':
|
|
seq = 1;
|
|
break;
|
|
case 'd':
|
|
adelim = EARGF(usage());
|
|
break;
|
|
default:
|
|
usage();
|
|
} ARGEND;
|
|
|
|
if (!argc)
|
|
usage();
|
|
|
|
/* populate delimiters */
|
|
unescape(adelim);
|
|
delim = ereallocarray(NULL, utflen(adelim) + 1, sizeof(*delim));
|
|
len = utftorunestr(adelim, delim);
|
|
if (!len)
|
|
usage();
|
|
|
|
/* populate file list */
|
|
dsc = ereallocarray(NULL, argc, sizeof(*dsc));
|
|
|
|
for (i = 0; i < argc; i++) {
|
|
if (argv[i][0] == '-' && !argv[i][1]) {
|
|
argv[i] = "<stdin>";
|
|
dsc[i].fp = stdin;
|
|
} else if (!(dsc[i].fp = fopen(argv[i], "r"))) {
|
|
eprintf("fopen %s:", argv[i]);
|
|
}
|
|
dsc[i].name = argv[i];
|
|
}
|
|
|
|
if (seq) {
|
|
sequential(dsc, argc, delim, len);
|
|
} else {
|
|
parallel(dsc, argc, delim, len);
|
|
}
|
|
|
|
for (i = 0; i < argc; i++)
|
|
if (dsc[i].fp != stdin && fshut(dsc[i].fp, argv[i]))
|
|
ret = 1;
|
|
|
|
return !!(fshut(stdin, "<stdin>") + fshut(stdout, "<stdout>")) || ret;
|
|
}
|