From 811901cb41421e315c4b2e04989fb380ec20cb33 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Mon, 18 Jun 2007 11:58:47 +0200 Subject: A few more symlink-related fixes. Fix a bug triggered by cp --parents and symlinks. Close some race conditions possible when the destination replaces a newly-created file with a symlink. * NEWS: Document that 'cp --parents' no longer mishandles symlinks in file name components of source. * src/copy.c (HAVE_LCHOWN): Default to false. (lchown) [!defined HAVE_LCHOWN]: Define to chown, for convenience. * src/cp.c (lchown) [!HAVE_LCHOWN]: Likewise. * src/install.c (lchown [!HAVE_LCHOWN]: Likewise. * src/copy.c (set_owner): Use lchown instead of chown, for safety in case the file got replaced by a symlink in the meantime. * src/cp.c (re_protect): Likewise. * src/install.c (change_attributes): Likewise. * src/copy.c (copy_internal): Use ordinary C rather than an #if. * src/cp.c (lchown) [!HAVE_LCHOWN]: Define to chown, for convenience. (struct dir_attr): Cache the entire struct stat of the directory, rather than just its mode, so that we needn't stat the directory twice (which can lead to races). (re_protect): Don't use XSTAT as that's not appropriate in this context (symlinks should be followed here). Instead, use the cached stat value. (make_dir_parents_private): Save dir's entire struct stat, not just its mode. * tests/cp/cp-parents: Add test to check against bug with cp --parents and symlinks. --- tests/cp/cp-parents | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'tests/cp') diff --git a/tests/cp/cp-parents b/tests/cp/cp-parents index 384f6c926..274f47d8d 100755 --- a/tests/cp/cp-parents +++ b/tests/cp/cp-parents @@ -48,7 +48,8 @@ cd $tmp || framework_failure=1 . "$abs_srcdir/../setgid-check" mkdir foo bar || framework_failure=1 -mkdir -p a/b/c d e || framework_failure=1 +mkdir -p a/b/c d e g || framework_failure=1 +ln -s d/a sym || framework_failure=1 touch f || framework_failure=1 if test $framework_failure = 1; then @@ -75,8 +76,11 @@ test -d d/f && fail=1 # Check that re_protect works. chmod go=w d/a cp -a --parents d/a/b/c e || fail=1 +cp -a --parents sym/b/c g || fail=1 p=`ls -ld e/d|cut -b-10`; case $p in drwxr-xr-x);; *) fail=1;; esac p=`ls -ld e/d/a|cut -b-10`; case $p in drwx-w--w-);; *) fail=1;; esac +p=`ls -ld g/sym|cut -b-10`; case $p in drwx-w--w-);; *) fail=1;; esac p=`ls -ld e/d/a/b/c|cut -b-10`; case $p in drwxr-xr-x);; *) fail=1;; esac +p=`ls -ld g/sym/b/c|cut -b-10`; case $p in drwxr-xr-x);; *) fail=1;; esac (exit $fail); exit $fail -- cgit v1.2.3-54-g00ecf