sbase

commit a62eda512c688e4dada99cba21788cb67258512b
parent f5ac08cc04c12d7e35f614918d2fc3c44e158dcf
Author: sin <sin@2f30.org>
Date:   Fri,  4 Jul 2014 16:42:31 +0100

Don't require two C-d to exit the loop

Diffstat:
M
util/concat.c
 | 
10
+++++-----

1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/util/concat.c b/util/concat.c
@@ -10,12 +10,12 @@ concat(FILE *fp1, const char *s1, FILE *fp2, const char *s2)
 	char buf[BUFSIZ];
 	size_t n;
 
-	while((n = fread(buf, 1, sizeof buf, fp1)) > 0) {
-		if(fwrite(buf, 1, n, fp2) != 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(ferror(fp1))
+	if (ferror(fp1))
 		eprintf("%s: read error:", s1);
 }
-