emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cp: add ENABLE_FEATURE_VERBOSE_CP_MESSAGE. Closes bug 1470

Browse Source
This commit is contained in:
Denis Vlasenko
2008-02-13 16:52:00 +00:00
parent 9d96af2e83
commit d5fe880a57
3 changed files with 32 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libbb/copy_file.c
View File

@@ -29,6 +29,7 @@
// for POSIX mode to give reasonable error message
static int ask_and_unlink(const char *dest, int flags)
{
int e = errno;
#if DO_POSIX_CP
if (!(flags & (FILEUTILS_FORCE|FILEUTILS_INTERACTIVE))) {
// Either it exists, or the *path* doesnt exist
@@ -50,7 +51,16 @@ static int ask_and_unlink(const char *dest, int flags)
return 0; // not allowed to overwrite
}
if (unlink(dest) < 0) {
bb_perror_msg("cannot remove '%s'", dest);
#if ENABLE_FEATURE_VERBOSE_CP_MESSAGE
if (e == errno && e == ENOENT) {
/* e == ENOTDIR is similar: path has non-dir component,
* but in this case we don't even reach copy_file() */
bb_error_msg("cannot create '%s': Path does not exist", dest);
return -1; // error
}
#endif
errno = e;
bb_perror_msg("cannot create '%s'", dest);
return -1; // error
}
return 1; // ok (to try again)