From: Jim Meyering <jim@meyering.net>
Date: Wed, 12 Jun 2002 08:01:48 +0000 (+0000)
Subject: (do_move): Give one diagnostic, not two, when unable to
X-Git-Tag: FILEUTILS-4_1_9~116
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f849e0aaac8bbb08a9afdfa5fc8272e7835040f5;p=thirdparty%2Fcoreutils.git

(do_move): Give one diagnostic, not two, when unable to
unlink a destination file.  This bug was introduced in fileutils-3.16l.

$ /bin/mv /etc/passwd /tmp
/bin/mv: cannot unlink `/etc/passwd': Permission denied
/bin/mv: cannot remove `/etc/passwd': Permission denied
[Exit 1]
---

diff --git a/src/mv.c b/src/mv.c
index 46aad167e6..c8e504e287 100644
--- a/src/mv.c
+++ b/src/mv.c
@@ -248,9 +248,6 @@ do_move (const char *source, const char *dest, const struct cp_options *x)
 	  assert (VALID_STATUS (status));
 	  if (status == RM_ERROR)
 	    fail = 1;
-
-	  if (fail)
-	    error (0, errno, _("cannot remove %s"), quote (dir_to_remove));
 	}
     }