mirror of
https://github.com/sheumann/hush.git
synced 2024-12-22 14:30:31 +00:00
applying fix from:
0000067: cp -p produces misleading error message
This commit is contained in:
parent
574fee4f99
commit
0a92bbf349
@ -198,11 +198,15 @@ int copy_file(const char *source, const char *dest, int flags)
|
|||||||
S_ISSOCK(source_stat.st_mode) || S_ISFIFO(source_stat.st_mode) ||
|
S_ISSOCK(source_stat.st_mode) || S_ISFIFO(source_stat.st_mode) ||
|
||||||
S_ISLNK(source_stat.st_mode)) {
|
S_ISLNK(source_stat.st_mode)) {
|
||||||
|
|
||||||
if (dest_exists &&
|
if (dest_exists) {
|
||||||
((flags & FILEUTILS_FORCE) == 0 || unlink(dest) < 0)) {
|
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);
|
bb_perror_msg("unable to remove `%s'", dest);
|
||||||
return -1;
|
return -1;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
bb_error_msg("internal error: unrecognized file type");
|
bb_error_msg("internal error: unrecognized file type");
|
||||||
|
Loading…
Reference in New Issue
Block a user