CC-tea/coreutils
1
0
Fork 0
mirror of git://git.sv.gnu.org/coreutils.git synced 2026-04-20 18:56:39 +02:00
Code Issues Projects Releases Wiki Activity

(copy_internal): Don't allow mv to move a directory onto

Browse Source 
a non-directory.  Reported by Brian Kimball via Michael Stone.
This commit is contained in:
Jim Meyering
2000-02-05 06:02:23 +00:00
parent 980db8d94b
commit e40b2aea74
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/copy.c
View File

@@ -507,11 +507,23 @@ copy_internal (const char *src_path, const char *dst_path,
return (move_mode ? 1 : 0);
}
/* In move_mode, DEST may not be an existing directory. */
if (move_mode && S_ISDIR (dst_sb.st_mode))
if (move_mode)
{
error (0, 0, _("%s: cannot overwrite directory"), dst_path);
return 1;
/* In move_mode, DEST may not be an existing directory. */
if (S_ISDIR (dst_sb.st_mode))
{
error (0, 0, _("%s: cannot overwrite directory"), dst_path);
return 1;
}
/* 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))
{
error (0, 0,
_("cannot move directory onto non-directory: %s -> %s"),
src_path, dst_path);
return 1;
}
}
if (x->backup_type != none && !S_ISDIR (dst_sb.st_mode))