suckless
/
sbase
mirror of git://git.suckless.org/sbase
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
sbase/comm.c

91 lines
1.6 KiB
C
Raw Normal View History

Add comm Signed-off-by: Christoph Lohmann <20h@r-36.net>
2013-06-18 10:19:47 +00:00
/* See LICENSE file for copyright and license details. */
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
Fix coding style It was about damn time. Consistency is very important in such a big codebase.
2014-11-13 17:29:30 +00:00
Add comm Signed-off-by: Christoph Lohmann <20h@r-36.net>
2013-06-18 10:19:47 +00:00
#include "util.h"
Optimizing comm(1) with the second sent in patch.
2013-06-19 19:09:50 +00:00
static int show = 0x07;
Add comm Signed-off-by: Christoph Lohmann <20h@r-36.net>
2013-06-18 10:19:47 +00:00
Add mandoc-manpage for comm(1) and clean up code and mark it as finished in README.
2015-01-17 23:07:29 +00:00
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');
}
Audit comm(1) 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.
2015-03-11 12:39:08 +00:00
fputs(line, stdout);
Add mandoc-manpage for comm(1) and clean up code and mark it as finished in README.
2015-01-17 23:07:29 +00:00
}
Add comm Signed-off-by: Christoph Lohmann <20h@r-36.net>
2013-06-18 10:19:47 +00:00
static void
usage(void)
{
eprintf("usage: %s [-123] file1 file2\n", argv0);
}
int
main(int argc, char *argv[])
{
Optimizing comm(1) with the second sent in patch.
2013-06-19 19:09:50 +00:00
FILE *fp[2];
Audit comm(1) 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.
2015-03-11 12:39:08 +00:00
size_t linelen[2] = { 0, 0 };
comm: Print first trailing unpaired line in file 1 Previously, a line read from file 1 before a strcmp was performed would be overwritten and lost. Something like this: comm one_line_file empty_file produced no output. This patch is a bit inelegant, but quite simple.
2015-08-03 19:30:35 +00:00
int ret = 0, i, diff = 0, seenline = 0;
Audit comm(1) 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.
2015-03-11 12:39:08 +00:00
char *line[2] = { NULL, NULL };
Add comm Signed-off-by: Christoph Lohmann <20h@r-36.net>
2013-06-18 10:19:47 +00:00
ARGBEGIN {
case '1':
case '2':
case '3':
Optimizing comm(1) with the second sent in patch.
2013-06-19 19:09:50 +00:00
show &= 0x07 ^ (1 << (ARGC() - '1'));
Add comm Signed-off-by: Christoph Lohmann <20h@r-36.net>
2013-06-18 10:19:47 +00:00
break;
default:
usage();
No need for semicolon after ARGEND This is also the style used in Plan 9.
2015-11-01 10:16:49 +00:00
} ARGEND
Add comm Signed-off-by: Christoph Lohmann <20h@r-36.net>
2013-06-18 10:19:47 +00:00
Fix coding style It was about damn time. Consistency is very important in such a big codebase.
2014-11-13 17:29:30 +00:00
if (argc != 2)
Add comm Signed-off-by: Christoph Lohmann <20h@r-36.net>
2013-06-18 10:19:47 +00:00
usage();
Audit comm(1) 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.
2015-03-11 12:39:08 +00:00
for (i = 0; i < 2; i++) {
Remove handrolled strcmp()'s Favor readability over bare-metal.
2015-05-19 15:44:15 +00:00
if (!strcmp(argv[i], "-")) {
Audit comm(1) 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.
2015-03-11 12:39:08 +00:00
argv[i] = "<stdin>";
fp[i] = stdin;
} else if (!(fp[i] = fopen(argv[i], "r"))) {
Fix some error messages There's many more to go.
2014-11-17 16:22:01 +00:00
eprintf("fopen %s:", argv[i]);
Audit comm(1) 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.
2015-03-11 12:39:08 +00:00
}
Optimizing comm(1) with the second sent in patch.
2013-06-19 19:09:50 +00:00
}
Add comm Signed-off-by: Christoph Lohmann <20h@r-36.net>
2013-06-18 10:19:47 +00:00
Fix coding style It was about damn time. Consistency is very important in such a big codebase.
2014-11-13 17:29:30 +00:00
for (;;) {
Audit comm(1) 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.
2015-03-11 12:39:08 +00:00
for (i = 0; i < 2; i++) {
if (diff && i == (diff < 0))
continue;
comm: Print first trailing unpaired line in file 1 Previously, a line read from file 1 before a strcmp was performed would be overwritten and lost. Something like this: comm one_line_file empty_file produced no output. This patch is a bit inelegant, but quite simple.
2015-08-03 19:30:35 +00:00
if (getline(&line[i], &linelen[i], fp[i]) > 0) {
seenline = 1;
Audit comm(1) 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.
2015-03-11 12:39:08 +00:00
continue;
comm: Print first trailing unpaired line in file 1 Previously, a line read from file 1 before a strcmp was performed would be overwritten and lost. Something like this: comm one_line_file empty_file produced no output. This patch is a bit inelegant, but quite simple.
2015-08-03 19:30:35 +00:00
}
Audit comm(1) 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.
2015-03-11 12:39:08 +00:00
if (ferror(fp[i]))
eprintf("getline %s:", argv[i]);
comm: Print first trailing unpaired line in file 1 Previously, a line read from file 1 before a strcmp was performed would be overwritten and lost. Something like this: comm one_line_file empty_file produced no output. This patch is a bit inelegant, but quite simple.
2015-08-03 19:30:35 +00:00
if ((diff || seenline) && line[!i][0])
Audit comm(1) 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.
2015-03-11 12:39:08 +00:00
printline(!i, line[!i]);
fix some signed/unsigned warnings and style fixes
2015-03-27 16:03:44 +00:00
while (getline(&line[!i], &linelen[!i], fp[!i]) > 0)
Audit comm(1) 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.
2015-03-11 12:39:08 +00:00
printline(!i, line[!i]);
if (ferror(fp[!i]))
eprintf("getline %s:", argv[!i]);
goto end;
Optimizing comm(1) with the second sent in patch.
2013-06-19 19:09:50 +00:00
}
Audit comm(1) 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.
2015-03-11 12:39:08 +00:00
diff = strcmp(line[0], line[1]);
LIMIT(diff, -1, 1);
comm: Print first trailing unpaired line in file 1 Previously, a line read from file 1 before a strcmp was performed would be overwritten and lost. Something like this: comm one_line_file empty_file produced no output. This patch is a bit inelegant, but quite simple.
2015-08-03 19:30:35 +00:00
seenline = 0;
Add *fshut() functions to properly flush file streams This has been a known issue for a long time. Example: printf "word" > /dev/full wouldn't report there's not enough space on the device. This is due to the fact that every libc has internal buffers for stdout which store fragments of written data until they reach a certain size or on some callback to flush them all at once to the kernel. You can force the libc to flush them with fflush(). In case flushing fails, you can check the return value of fflush() and report an error. However, previously, sbase didn't have such checks and without fflush(), the libc silently flushes the buffers on exit without checking the errors. No offense, but there's no way for the libc to report errors in the exit- condition. GNU coreutils solve this by having onexit-callbacks to handle the flushing and report issues, but they have obvious deficiencies. After long discussions on IRC, we came to the conclusion that checking the return value of every io-function would be a bit too much, and having a general-purpose fclose-wrapper would be the best way to go. It turned out that fclose() alone is not enough to detect errors. The right way to do it is to fflush() + check ferror on the fp and then to a fclose(). This is what fshut does and that's how it's done before each return. The return value is obviously affected, reporting an error in case a flush or close failed, but also when reading failed for some reason, the error- state is caught. the !!( ... + ...) construction is used to call all functions inside the brackets and not "terminating" on the first. We want errors to be reported, but there's no reason to stop flushing buffers when one other file buffer has issues. Obviously, functionales come before the flush and ret-logic comes after to prevent early exits as well without reporting warnings if there are any. One more advantage of fshut() is that it is even able to report errors on obscure NFS-setups which the other coreutils are unable to detect, because they only check the return-value of fflush() and fclose(), not ferror() as well.
2015-04-04 19:25:17 +00:00
printline((2 - diff) % 3, line[MAX(0, diff)]);
Optimizing comm(1) with the second sent in patch.
2013-06-19 19:09:50 +00:00
}
Audit comm(1) 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.
2015-03-11 12:39:08 +00:00
end:
Simplify return & fshut() logic Get rid of the !!()-constructs and use ret where available (or introduce it). In some cases, there would be an "abort" on the first fshut-error, but we want to close all files and report all warnings and then quit, not just the warning for the first file.
2015-05-24 23:33:19 +00:00
ret |= fshut(fp[0], argv[0]);
ret |= (fp[0] != fp[1]) && fshut(fp[1], argv[1]);
ret |= fshut(stdout, "<stdout>");
return ret;
Add comm Signed-off-by: Christoph Lohmann <20h@r-36.net>
2013-06-18 10:19:47 +00:00
}