 |
mount: use libutil/concat instead of custom catfile - ubase - suckless linux ba… |
 |
git clone git://git.suckless.org/ubase |
 |
Log |
|
Files |
|
Refs |
|
README |
|
LICENSE |
|
--- |
|
commit 9455f51dd8f7bebeb13074b34deeb41f491d5343 |
|
parent a51858016570713a2aca623645aa3ec2ac1a3d6c |
|
Author: Hiltjo Posthuma <[email protected]> |
|
Date: Sun, 22 Feb 2015 12:02:20 +0100 |
|
|
|
mount: use libutil/concat instead of custom catfile |
|
|
|
this trivializes the code some more |
|
|
|
Diffstat: |
|
M mount.c | 23 +++-------------------- |
|
|
|
1 file changed, 3 insertions(+), 20 deletions(-) |
|
--- |
|
diff --git a/mount.c b/mount.c |
|
@@ -10,6 +10,7 @@ |
|
#include <string.h> |
|
#include <unistd.h> |
|
|
|
+#include "text.h" |
|
#include "util.h" |
|
|
|
struct { |
|
@@ -98,21 +99,6 @@ mounted(const char *dir) |
|
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 |
|
usage(void) |
|
{ |
|
@@ -161,12 +147,9 @@ main(int argc, char *argv[]) |
|
if (argc < 1 && aflag == 0) { |
|
if (!(fp = fopen(files[0], "r"))) |
|
eprintf("fopen %s:", files[0]); |
|
- if (catfile(fp, stdout) == -1) { |
|
- weprintf("error while reading %s:", files[0]); |
|
- status = 1; |
|
- } |
|
+ concat(fp, files[0], stdout, "<stdout>"); |
|
fclose(fp); |
|
- return status; |
|
+ return 0; |
|
} |
|
|
|
if (aflag == 1) |
