fbt/sbase
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cat: fix u flag

Browse Source 
Our libutil concat() always uses a buffer for input wich is obviously
not compatible with unbuffered io. Here is a local uconcat() which
naively copies input to stdout char by char.
This commit is contained in:
Quentin Rameau 2016-03-01 11:04:11 +01:00 committed by sin
parent 3da450e203
commit d04402b6ea
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
cat.c
View File

@ -6,6 +6,16 @@
#include "text.h" #include "text.h"
#include "util.h" #include "util.h"
static void
uconcat(FILE *fp1, const char *s1, FILE *fp2, const char *s2)
{
int c;
setbuf(fp2, NULL);
while ((c = getc(fp1)) != EOF)
putc(c, fp2);
}
static void static void
usage(void) usage(void)
{ {
@ -17,17 +27,18 @@ main(int argc, char *argv[])
{ {
FILE *fp; FILE *fp;
int ret = 0; int ret = 0;
void (*cat)(FILE *, const char *, FILE *, const char *) = &concat;
ARGBEGIN { ARGBEGIN {
case 'u': case 'u':
setbuf(stdout, NULL); cat = &uconcat;
break; break;
default: default:
usage(); usage();
} ARGEND } ARGEND
if (!argc) { if (!argc) {
concat(stdin, "<stdin>", stdout, "<stdout>"); cat(stdin, "<stdin>", stdout, "<stdout>");
} else { } else {
for (; *argv; argc--, argv++) { for (; *argv; argc--, argv++) {
if (!strcmp(*argv, "-")) { if (!strcmp(*argv, "-")) {
@ -38,7 +49,7 @@ main(int argc, char *argv[])
ret = 1; ret = 1;
continue; continue;
} }
concat(fp, *argv, stdout, "<stdout>"); cat(fp, *argv, stdout, "<stdout>");
if (fp != stdin && fshut(fp, *argv)) if (fp != stdin && fshut(fp, *argv))
ret = 1; ret = 1;
} }