Sync concat() from sbase

This commit is contained in:
sin 2015-02-22 11:08:16 +00:00
parent 43327506b6
commit a518580165

View File

@ -1,6 +1,5 @@
/* See LICENSE file for copyright and license details. */
#include <stdio.h>
#include <unistd.h>
#include "../text.h"
#include "../util.h"
@ -9,12 +8,14 @@ void
concat(FILE *fp1, const char *s1, FILE *fp2, const char *s2)
{
char buf[BUFSIZ];
ssize_t n;
size_t n;
while ((n = read(fileno(fp1), buf, sizeof buf)) > 0) {
if (write(fileno(fp2), buf, n) != n)
while ((n = fread(buf, 1, sizeof(buf), fp1)) > 0) {
if (fwrite(buf, 1, n, fp2) != n)
eprintf("%s: write error:", s2);
if (feof(fp1))
break;
}
if (n < 0)
if (ferror(fp1))
eprintf("%s: read error:", s1);
}