fcopyfile: Westermo fixes and code simplification

Signed-off-by: Joachim Nilsson <troglobit@gmail.com>

copyfile.c

@@ -237,27 +237,23 @@ int movefile(char *src, char *dst)
  */
 int fcopyfile(FILE *src, FILE *dst)
 {
-	int ret;
+	char *buf;
-	char *buffer;
 
 	if (!src || !dst) {
 		errno = EINVAL;
 		return -1;
 	}
 
-	buffer = malloc(BUFSIZ);
+	buf = malloc(BUFSIZ);
-	if (!buffer)
+	if (!buf)
 		return -1;
 
-	ret = do_copy(fileno(src), fileno(dst), BUFSIZ, buffer, BUFSIZ);
+	while (fgets(buf, BUFSIZ, src))
-	if (ret > 0)
+		fputs(buf, dst);
-		ret = 0;
+	
-	else if (errno)
+	free(buf);
-		ret = -1;
 
-	free(buffer);
+	return 0;
-
-	return ret;
 }
 
 #ifdef UNITTEST
@@ -267,7 +263,7 @@ int main(void)
 {
 	int i = 0;
 	char *files[] = {
-		"/etc/passwd", "/tmp/tok", "/tmp/tok",
+		"/etc/passwd", "/tmp/mypwd", "/tmp/mypwd",
 		"/etc/passwd", "/tmp/", "/tmp/passwd",
 		"/etc/passwd", "/tmp", "/tmp/passwd",
 		NULL