mirror of
git://git.suckless.org/sbase
synced 2024-12-22 23:13:44 +00:00
60da4fb049
_Bug_
Got the following error after cloning and running make:
paste.c: In function ‘parallel’:
paste.c:70:4: warning: this ‘else’ clause does not guard... [-Wmisleading-indentation]
else
^~~~
paste.c:72:5: note: ...this statement, but the latter is misleadingly indented as if it is guarded by the ‘else’
last++;
^~~~
This patch preserves the same functionality and just adjusts indentation to squelch the warning.
_Test plan_
Used the following 'script' to convince myself output looked correct for inputs
where the latter arguments to paste had fewer lines.
make && printf "1\n2\n" > two.txt && printf "" > zero.txt && ./paste -d, two.txt zero.txt
142 lines
2.5 KiB
C
142 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 delimlen, i;
|
|
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 */
|
|
/* TODO: fix libutf to accept sizes */
|
|
unescape(adelim);
|
|
delim = ereallocarray(NULL, utflen(adelim) + 1, sizeof(*delim));
|
|
if (!(delimlen = utftorunestr(adelim, delim)))
|
|
usage();
|
|
|
|
/* populate file list */
|
|
dsc = ereallocarray(NULL, argc, sizeof(*dsc));
|
|
|
|
for (i = 0; i < argc; i++) {
|
|
if (!strcmp(argv[i], "-")) {
|
|
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, delimlen);
|
|
} else {
|
|
parallel(dsc, argc, delim, delimlen);
|
|
}
|
|
|
|
for (i = 0; i < argc; i++)
|
|
if (dsc[i].fp != stdin && fshut(dsc[i].fp, argv[i]))
|
|
ret |= fshut(dsc[i].fp, argv[i]);
|
|
|
|
ret |= fshut(stdin, "<stdin>") | fshut(stdout, "<stdout>");
|
|
|
|
return ret;
|
|
}
|