a4587b84f8
1) Use the LIMIT()-macro in util.h instead of defining our own.
2) Drop nextline() and finish(), not needed anymore. Use
fputs in printline instead of printf.
--> BUGFIX: Finish exited with status 1, but actually should
exit with status 0 if ferror(f) == 0.
3) Don't use /dev/fd/0 and use idiomatic <stdin> and fp = stdin
instead.
4) Refactor loop to use getline() instead of some handrolled
nextline-function.
--> BUGFIX: Line-length was limited to LINE_MAX before, now
it's factually unlimited.
5) Combine diff >= 0 and diff <= 0 into one loop with a beginning
continue-condition (diff && i == (diff < 0)).
6) BUGFIX: If diff == 0, don't print one buffer after EOFing on the
other.
84 lines
1.4 KiB
C
84 lines
1.4 KiB
C
/* See LICENSE file for copyright and license details. */
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
|
|
#include "util.h"
|
|
|
|
static int show = 0x07;
|
|
|
|
static void
|
|
printline(int pos, char *line)
|
|
{
|
|
int i;
|
|
|
|
if (!(show & (0x1 << pos)))
|
|
return;
|
|
|
|
for (i = 0; i < pos; i++) {
|
|
if (show & (0x1 << i))
|
|
putchar('\t');
|
|
}
|
|
fputs(line, stdout);
|
|
}
|
|
|
|
static void
|
|
usage(void)
|
|
{
|
|
eprintf("usage: %s [-123] file1 file2\n", argv0);
|
|
}
|
|
|
|
int
|
|
main(int argc, char *argv[])
|
|
{
|
|
FILE *fp[2];
|
|
size_t linelen[2] = { 0, 0 };
|
|
int i, diff = 0;
|
|
char *line[2] = { NULL, NULL };
|
|
|
|
ARGBEGIN {
|
|
case '1':
|
|
case '2':
|
|
case '3':
|
|
show &= 0x07 ^ (1 << (ARGC() - '1'));
|
|
break;
|
|
default:
|
|
usage();
|
|
} ARGEND;
|
|
|
|
if (argc != 2)
|
|
usage();
|
|
|
|
for (i = 0; i < 2; i++) {
|
|
if (argv[i][0] == '-' && !argv[i][1]) {
|
|
argv[i] = "<stdin>";
|
|
fp[i] = stdin;
|
|
} else if (!(fp[i] = fopen(argv[i], "r"))) {
|
|
eprintf("fopen %s:", argv[i]);
|
|
}
|
|
}
|
|
|
|
for (;;) {
|
|
for (i = 0; i < 2; i++) {
|
|
if (diff && i == (diff < 0))
|
|
continue;
|
|
if (getline(&line[i], &linelen[i], fp[i]) >= 0)
|
|
continue;
|
|
if (ferror(fp[i]))
|
|
eprintf("getline %s:", argv[i]);
|
|
if (diff && strlen(line[!i]))
|
|
printline(!i, line[!i]);
|
|
while (getline(&line[!i], &linelen[!i], fp[!i]) >= 0)
|
|
printline(!i, line[!i]);
|
|
if (ferror(fp[!i]))
|
|
eprintf("getline %s:", argv[!i]);
|
|
goto end;
|
|
}
|
|
diff = strcmp(line[0], line[1]);
|
|
LIMIT(diff, -1, 1);
|
|
printline((2-diff) % 3, line[MAX(0, diff)]);
|
|
}
|
|
end:
|
|
return 0;
|
|
}
|