0a92bbf34
Paul Fox
2005-07-19
Subject
applying fix from: 0000067: cp -p produces misleading error message
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
libbb/copy_file.c+7 -3
| @@ -198,12 +198,16 @@ int copy_file(const char *source, const char *dest, int flags) | |
| S_ISSOCK(source_stat.st_mode) || S_ISFIFO(source_stat.st_mode) || | |
| S_ISLNK(source_stat.st_mode)) { | |
| - | if (dest_exists && |
| - | ((flags & FILEUTILS_FORCE) == 0 || unlink(dest) < 0)) { |
| + | if (dest_exists) { |
| + | if((flags & FILEUTILS_FORCE) == 0) { |
| + | fprintf(stderr, "`%s' exists\n", dest); |
| + | return -1; |
| + | } |
| + | if(unlink(dest) < 0) { |
| bb_perror_msg("unable to remove `%s'", dest); | |
| return -1; | |
| - | |
| } | |
| + | } |
| } else { | |
| bb_error_msg("internal error: unrecognized file type"); | |
| return -1; | |