diff options
| author | Jim Meyering <jim@meyering.net> | 2001-07-08 21:22:40 +0000 |
|---|---|---|
| committer | Jim Meyering <jim@meyering.net> | 2001-07-08 21:22:40 +0000 |
| commit | c6d89f346ac981c2ebc84363f8f17ef700de3b33 (patch) | |
| tree | 41a46c1ce8a1f2a12933fec30ec63ef8c73a1ec7 /src | |
| parent | 7fe83a7a355ba76eff830ea2d20b617ae5cfefb4 (diff) | |
| download | coreutils-c6d89f346ac981c2ebc84363f8f17ef700de3b33.tar.xz | |
(get_dest_mode): Clear set-user-ID and set-group-ID bits
when copying (i.e., not in move mode) and not preserving permissions.
Diffstat (limited to 'src')
| -rw-r--r-- | src/copy.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/src/copy.c b/src/copy.c index d0aad251b..1096fba23 100644 --- a/src/copy.c +++ b/src/copy.c @@ -86,9 +86,11 @@ get_dest_mode (const struct cp_options *option, mode_t mode) if (option->set_mode) return option->mode; - /* Honor the umask for `cp', but not for `mv' or `cp -p'. */ + /* Honor the umask for `cp', but not for `mv' or `cp -p'. + In addition, `cp' without -p must clear the set-user-ID and set-group-ID + bits. POSIX requires it do that when creating new files. */ if (!option->move_mode && !option->preserve_chmod_bits) - mode &= option->umask_kill; + mode &= (option->umask_kill & ~(S_ISUID | S_ISGID)); return mode; } @@ -651,7 +653,13 @@ copy_internal (const char *src_path, const char *dst_path, } if (x->update && MTIME_CMP (src_sb, dst_sb) <= 0) - return 0; + { + /* Pretend the rename succeeded, so the caller (mv) + doesn't end up removing the source file. */ + if (rename_succeeded) + *rename_succeeded = 1; + return 0; + } } if (!S_ISDIR (src_type) && x->interactive) |