midfavila/ubase
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

mount: use libutil/concat instead of custom catfile

Browse Source 
this trivializes the code some more
This commit is contained in:
Hiltjo Posthuma 2015-02-22 12:02:20 +01:00 committed by sin
parent a518580165
commit 9455f51dd8
1 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
mount.c
View File

@ -10,6 +10,7 @@
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include "text.h"
#include "util.h" #include "util.h"
struct { struct {
@ -98,21 +99,6 @@ mounted(const char *dir)
return 0; return 0;
} }
static int
catfile(FILE *in, FILE *out)
{
char buf[BUFSIZ];
size_t bytesread;
while (!feof(in)) {
bytesread = fread(buf, 1, sizeof(buf), in);
if (ferror(in))
return -1;
fwrite(buf, 1, bytesread, out);
}
return 0;
}
static void static void
usage(void) usage(void)
{ {
@ -161,12 +147,9 @@ main(int argc, char *argv[])
if (argc < 1 && aflag == 0) { if (argc < 1 && aflag == 0) {
if (!(fp = fopen(files[0], "r"))) if (!(fp = fopen(files[0], "r")))
eprintf("fopen %s:", files[0]); eprintf("fopen %s:", files[0]);
if (catfile(fp, stdout) == -1) { concat(fp, files[0], stdout, "<stdout>");
weprintf("error while reading %s:", files[0]);
status = 1;
}
fclose(fp); fclose(fp);
return status; return 0;
} }
if (aflag == 1) if (aflag == 1)