1 files changed, 75 insertions, 58 deletions

diff --git a/libbb/copy_file.c b/libbb/copy_file.c
index 64b65b9fa..eb9cb1a16 100644
--- a/libbb/copy_file.c
+++ b/libbb/copy_file.c
@@ -41,49 +41,54 @@
  * -Erik Andersen
  */
 int
-copy_file(const char *srcName, const char *destName,
-		 int setModes, int followLinks, int forceFlag)
+copy_file(const char *src_name, const char *dst_name,
+		 int set_modes, int follow_links, int force_flag, int quiet_flag)
 {
-	int rfd;
-	int wfd;
-	int status;
+	FILE *src_file = NULL;
+	FILE *dst_file = NULL;
 	struct stat srcStatBuf;
 	struct stat dstStatBuf;
 	struct utimbuf times;
+	int src_status;
+	int dst_status;
+
+	if (follow_links == TRUE) {
+		src_status = stat(src_name, &srcStatBuf);
+		dst_status = stat(dst_name, &dstStatBuf);
+	} else {
+		src_status = lstat(src_name, &srcStatBuf);
+		dst_status = lstat(dst_name, &dstStatBuf);
+	}
 
-	if (followLinks == TRUE)
-		status = stat(srcName, &srcStatBuf);
-	else
-		status = lstat(srcName, &srcStatBuf);
-
-	if (status < 0) {
-		perror_msg("%s", srcName);
+	if (src_status < 0) {
+		if (!quiet_flag) {
+			perror_msg("%s", src_name);
+		}
 		return FALSE;
 	}
 
-	if (followLinks == TRUE)
-		status = stat(destName, &dstStatBuf);
-	else
-		status = lstat(destName, &dstStatBuf);
-
-	if (status < 0 || forceFlag==TRUE) {
-		unlink(destName);
+	if ((dst_status < 0) || force_flag) {
+		unlink(dst_name);
 		dstStatBuf.st_ino = -1;
 		dstStatBuf.st_dev = -1;
 	}
 
 	if ((srcStatBuf.st_dev == dstStatBuf.st_dev) &&
 		(srcStatBuf.st_ino == dstStatBuf.st_ino)) {
-		error_msg("Copying file \"%s\" to itself", srcName);
+		if (!quiet_flag) {
+			error_msg("Copying file \"%s\" to itself", src_name);
+		}
 		return FALSE;
 	}
 
 	if (S_ISDIR(srcStatBuf.st_mode)) {
 		//fprintf(stderr, "copying directory %s to %s\n", srcName, destName);
 		/* Make sure the directory is writable */
-		status = mkdir(destName, 0777777 ^ umask(0));
-		if (status < 0 && errno != EEXIST) {
-			perror_msg("%s", destName);
+		dst_status = create_path(dst_name, 0777777 ^ umask(0));
+		if ((dst_status < 0) && (errno != EEXIST)) {
+			if (!quiet_flag) {
+				perror_msg("%s", dst_name);
+			}
 			return FALSE;
 		}
 	} else if (S_ISLNK(srcStatBuf.st_mode)) {
@@ -92,80 +97,92 @@ copy_file(const char *srcName, const char *destName,
 
 		//fprintf(stderr, "copying link %s to %s\n", srcName, destName);
 		/* Warning: This could possibly truncate silently, to BUFSIZ chars */
-		link_size = readlink(srcName, &link_val[0], BUFSIZ);
+		link_size = readlink(src_name, &link_val[0], BUFSIZ);
 		if (link_size < 0) {
-			perror_msg("%s", srcName);
+			if (quiet_flag) {
+				perror_msg("%s", src_name);
+			}
 			return FALSE;
 		}
 		link_val[link_size] = '\0';
-		status = symlink(link_val, destName);
-		if (status < 0) {
-			perror_msg("%s", destName);
+		src_status = symlink(link_val, dst_name);
+		if (src_status < 0) {
+			if (!quiet_flag) {
+				perror_msg("%s", dst_name);
+			}
 			return FALSE;
 		}
 #if (__GLIBC__ >= 2) && (__GLIBC_MINOR__ >= 1)
-		if (setModes == TRUE) {
+		if (set_modes == TRUE) {
 			/* Try to set owner, but fail silently like GNU cp */
-			lchown(destName, srcStatBuf.st_uid, srcStatBuf.st_gid);
+			lchown(dst_name, srcStatBuf.st_uid, srcStatBuf.st_gid);
 		}
 #endif
 		return TRUE;
 	} else if (S_ISFIFO(srcStatBuf.st_mode)) {
 		//fprintf(stderr, "copying fifo %s to %s\n", srcName, destName);
-		if (mkfifo(destName, 0644) < 0) {
-			perror_msg("%s", destName);
+		if (mkfifo(dst_name, 0644) < 0) {
+			if (!quiet_flag) {
+				perror_msg("%s", dst_name);
+			}
 			return FALSE;
 		}
 	} else if (S_ISBLK(srcStatBuf.st_mode) || S_ISCHR(srcStatBuf.st_mode)
 			   || S_ISSOCK(srcStatBuf.st_mode)) {
 		//fprintf(stderr, "copying soc, blk, or chr %s to %s\n", srcName, destName);
-		if (mknod(destName, srcStatBuf.st_mode, srcStatBuf.st_rdev) < 0) {
-			perror_msg("%s", destName);
+		if (mknod(dst_name, srcStatBuf.st_mode, srcStatBuf.st_rdev) < 0) {
+			if (!quiet_flag) {
+				perror_msg("%s", dst_name);
+			}
 			return FALSE;
 		}
 	} else if (S_ISREG(srcStatBuf.st_mode)) {
 		//fprintf(stderr, "copying regular file %s to %s\n", srcName, destName);
-		rfd = open(srcName, O_RDONLY);
-		if (rfd < 0) {
-			perror_msg("%s", srcName);
+		src_file = fopen(src_name, "r");
+		if (src_file == NULL) {
+			if (!quiet_flag) {
+				perror_msg("%s", src_name);
+			}
 			return FALSE;
 		}
 
-	 	wfd = open(destName, O_WRONLY | O_CREAT | O_TRUNC,
-				 srcStatBuf.st_mode);
-		if (wfd < 0) {
-			perror_msg("%s", destName);
-			close(rfd);
+	 	dst_file = fopen(dst_name, "w");
+		if (dst_file == NULL) {
+			if (!quiet_flag) {
+				perror_msg("%s", dst_name);
+			}
+			fclose(src_file);
 			return FALSE;
 		}
 
-		if (copy_file_chunk(rfd, wfd, srcStatBuf.st_size)==FALSE)
-			goto error_exit;	
-		
-		close(rfd);
-		if (close(wfd) < 0) {
+		if (copy_file_chunk(src_file, dst_file, srcStatBuf.st_size)==FALSE) {
+			goto error_exit;
+		}
+
+		fclose(src_file);
+		if (fclose(dst_file) < 0) {
 			return FALSE;
 		}
 	}
 
-	if (setModes == TRUE) {
+	if (set_modes == TRUE) {
 		/* This is fine, since symlinks never get here */
-		if (chown(destName, srcStatBuf.st_uid, srcStatBuf.st_gid) < 0)
-			perror_msg_and_die("%s", destName);
-		if (chmod(destName, srcStatBuf.st_mode) < 0)
-			perror_msg_and_die("%s", destName);
+		if (chown(dst_name, srcStatBuf.st_uid, srcStatBuf.st_gid) < 0)
+			perror_msg("%s", dst_name);
+		if (chmod(dst_name, srcStatBuf.st_mode) < 0)
+			perror_msg("%s", dst_name);
 		times.actime = srcStatBuf.st_atime;
 		times.modtime = srcStatBuf.st_mtime;
-		if (utime(destName, &times) < 0)
-			perror_msg_and_die("%s", destName);
+		if (utime(dst_name, &times) < 0)
+			perror_msg("%s", dst_name);
 	}
 
 	return TRUE;
 
-  error_exit:
-	perror_msg("%s", destName);
-	close(rfd);
-	close(wfd);
+error_exit:
+	perror_msg("%s", dst_name);
+	fclose(src_file);
+	fclose(dst_file);
 
 	return FALSE;
 }