From: Jim Meyering <jim@meyering.net>
Date: Wed, 10 Jan 2001 09:43:36 +0000 (+0000)
Subject: (copy_internal): Don't allow cp (or mv, when working
X-Git-Tag: FILEUTILS-4_0_36~47
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2a5fb11132e09058344ba9a3a58a74230e2cf373;p=thirdparty%2Fcoreutils.git

(copy_internal): Don't allow cp (or mv, when working
across a partition boundary) to overwrite a non-directory with a directory.
---

diff --git a/src/copy.c b/src/copy.c
index 734271b4f8..c7a5b72fae 100644
--- a/src/copy.c
+++ b/src/copy.c
@@ -628,6 +628,14 @@ copy_internal (const char *src_path, const char *dst_path,
 	      return 1;
 	    }
 
+	  if (S_ISDIR (src_type) && !S_ISDIR (dst_sb.st_mode))
+	    {
+	      error (0, 0,
+		     _("cannot overwrite non-directory %s with directory %s"),
+		     quote_n (0, dst_path), quote_n (1, src_path));
+	      return 1;
+	    }
+
 	  if (!S_ISDIR (src_type))
 	    {
 	      if (S_ISDIR (dst_sb.st_mode))