From: Jim Meyering <jim@meyering.net>
Date: Thu, 11 May 2006 08:55:04 +0000 (+0000)
Subject: mv -T DIR EMPTY_DIR no longer fails
X-Git-Tag: v6.0~405
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=156459c2f5e368fdd2c55fc051caeb48fd995b4c;p=thirdparty%2Fcoreutils.git

mv -T DIR EMPTY_DIR no longer fails

(copy_internal): Don't manually prohibit a move where
the destination is an existing directory.  Sometimes doing that is
valid.  Let the rename system call enforce the rules.  That is
allowed only when the source is a directory and the destination
directory (to be replaced) is empty.  Reported by Eric Blake.
---

diff --git a/src/copy.c b/src/copy.c
index 645b90b468..a6f6ec54ea 100644
--- a/src/copy.c
+++ b/src/copy.c
@@ -1157,14 +1157,6 @@ copy_internal (char const *src_name, char const *dst_name,
 
 	  if (x->move_mode)
 	    {
-	      /* In move_mode, DEST may not be an existing directory.  */
-	      if (S_ISDIR (dst_sb.st_mode) && x->backup_type == no_backups)
-		{
-		  error (0, 0, _("cannot overwrite directory %s"),
-			 quote (dst_name));
-		  return false;
-		}
-
 	      /* Don't allow user to move a directory onto a non-directory.  */
 	      if (S_ISDIR (src_sb.st_mode) && !S_ISDIR (dst_sb.st_mode)
 		  && x->backup_type == no_backups)