aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2007-08-24 14:23:57 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2007-08-24 14:23:57 +0000
commit3d829627fb5e6631a106fd5f03824426c06eab42 (patch)
treefd3fc8a6830f138b678b9d569d53c4e0a3667bf3
parentcab774d6e5c41c110345e5ce95d78ff714e2ece7 (diff)
downloadbusybox-3d829627fb5e6631a106fd5f03824426c06eab42.tar.gz
cp: make POSIX-me-harder mode complain with a bit less insane message
-rw-r--r--libbb/copy_file.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/libbb/copy_file.c b/libbb/copy_file.c
index b68a257b5..8a7db77e6 100644
--- a/libbb/copy_file.c
+++ b/libbb/copy_file.c
@@ -22,25 +22,25 @@
#define DO_POSIX_CP 0 /* 1 - POSIX behavior, 0 - safe behavior */
-
+// errno must be set to relevant value ("why we cannot create dest?")
+// for POSIX mode to give reasonable error message
static int ask_and_unlink(const char *dest, int flags)
{
- // If !DO_POSIX_CP, act as if -f is always in effect - we don't want
- // "'file' exists" msg, we want unlink to be done (silently unless -i
- // is also in effect).
- // This prevents safe way from asking more questions than POSIX does.
#if DO_POSIX_CP
if (!(flags & (FILEUTILS_FORCE|FILEUTILS_INTERACTIVE))) {
- fprintf(stderr, "'%s' exists\n", dest);
+ // Either it exists, or the *path* doesnt exist
+ bb_perror_msg("cannot create '%s'", dest);
return -1;
}
#endif
+ // If !DO_POSIX_CP, act as if -f is always in effect - we don't want
+ // "cannot create" msg, we want unlink to be done (silently unless -i).
// TODO: maybe we should do it only if ctty is present?
if (flags & FILEUTILS_INTERACTIVE) {
// We would not do POSIX insanity. -i asks,
// then _unlinks_ the offender. Presto.
- // (No opening without O_EXCL, no unlinks only if -f)
+ // (No "opening without O_EXCL", no "unlink only if -f")
// Or else we will end up having 3 open()s!
fprintf(stderr, "%s: overwrite '%s'? ", applet_name, dest);
if (!bb_ask_confirmation())
@@ -280,6 +280,7 @@ int copy_file(const char *source, const char *dest, int flags)
) {
// We are lazy here, a bit lax with races...
if (dest_exists) {
+ errno = EEXIST;
ovr = ask_and_unlink(dest, flags);
if (ovr <= 0)
return ovr;