diff options
| author | Renaud Manus <Renaud.Manus@Sun.COM> | 2009-04-09 19:14:01 +0100 |
|---|---|---|
| committer | Renaud Manus <Renaud.Manus@Sun.COM> | 2009-04-09 19:14:01 +0100 |
| commit | ee9c203b1f94e95f194b035c4166c79fab792a78 (patch) | |
| tree | e0ac547115ef5d84105c6d9525298e1d33cac112 /usr/src | |
| parent | 0fd800607f9e1d26f56908606b5ab776694af8d7 (diff) | |
| download | illumos-gate-ee9c203b1f94e95f194b035c4166c79fab792a78.tar.gz | |
6803774 *cp* cp -rPp, cp -RPp trip over dangling symlinks
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/cmd/mv/mv.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/usr/src/cmd/mv/mv.c b/usr/src/cmd/mv/mv.c index 0eed729435..e2fd05f9ff 100644 --- a/usr/src/cmd/mv/mv.c +++ b/usr/src/cmd/mv/mv.c @@ -19,7 +19,7 @@ * CDDL HEADER END */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -36,8 +36,6 @@ * contributors. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * Combined mv/cp/ln command: * mv file1 file2 @@ -1006,9 +1004,9 @@ chkfiles(char *source, char **to) } /* - * Get ACL info: don't bother with ln or mv'ing symlinks + * Get ACL info: don't bother with ln or cp/mv'ing symlinks */ - if ((!lnk) && !(mve && ISLNK(s1))) { + if (!lnk && !ISLNK(s1)) { if (s1acl != NULL) { acl_free(s1acl); s1acl = NULL; |