diff options
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | src/copy.c | 4 | ||||
| -rwxr-xr-x | tests/cp/link-preserve.sh | 12 | ||||
| -rwxr-xr-x | tests/cp/link-symlink.sh | 2 | ||||
| -rwxr-xr-x | tests/cp/preserve-mode.sh | 6 |
5 files changed, 15 insertions, 12 deletions
@@ -10,6 +10,9 @@ GNU coreutils NEWS -*- outline -*- ** Bug fixes + cp --no-preserve=mode now no longer exits non-zero. + [bug introduced in coreutils-8.20] + cut no longer accepts the invalid range 0-, which made it print empty lines. Instead, cut now fails and emits an appropriate diagnostic. [This bug was present in "the beginning".] diff --git a/src/copy.c b/src/copy.c index 7a354140a..0decf9f9f 100644 --- a/src/copy.c +++ b/src/copy.c @@ -1153,8 +1153,8 @@ preserve_metadata: } else if (x->explicit_no_preserve_mode) { - set_acl (dst_name, dest_desc, 0666 & ~cached_umask ()); - return_val = false; + if (set_acl (dst_name, dest_desc, 0666 & ~cached_umask ()) != 0) + return_val = false; } else if (omitted_permissions) { diff --git a/tests/cp/link-preserve.sh b/tests/cp/link-preserve.sh index bb3b2447e..44768e470 100755 --- a/tests/cp/link-preserve.sh +++ b/tests/cp/link-preserve.sh @@ -37,7 +37,7 @@ rm -rf a b c touch a ln -s a b mkdir c -cp --preserve=links -R -H a b c +cp --preserve=links -R -H a b c || fail=1 a_inode=$(ls -i c/a|sed 's,c/.*,,') b_inode=$(ls -i c/b|sed 's,c/.*,,') test "$a_inode" = "$b_inode" || fail=1 @@ -46,7 +46,7 @@ test "$a_inode" = "$b_inode" || fail=1 # Ensure that -L makes cp follow the b->a symlink # and translates to hard-linked a and b in the destination dir. rm -rf a b c d; mkdir d; (cd d; touch a; ln -s a b) -cp --preserve=links -R -L d c +cp --preserve=links -R -L d c || fail=1 a_inode=$(ls -i c/a|sed 's,c/.*,,') b_inode=$(ls -i c/b|sed 's,c/.*,,') test "$a_inode" = "$b_inode" || fail=1 @@ -54,7 +54,7 @@ test "$a_inode" = "$b_inode" || fail=1 # Same as above, but starting with a/b hard linked. rm -rf a b c d; mkdir d; (cd d; touch a; ln a b) -cp --preserve=links -R -L d c +cp --preserve=links -R -L d c || fail=1 a_inode=$(ls -i c/a|sed 's,c/.*,,') b_inode=$(ls -i c/b|sed 's,c/.*,,') test "$a_inode" = "$b_inode" || fail=1 @@ -62,7 +62,7 @@ test "$a_inode" = "$b_inode" || fail=1 # Ensure that --no-preserve=links works. rm -rf a b c d; mkdir d; (cd d; touch a; ln a b) -cp -dR --no-preserve=links d c +cp -dR --no-preserve=links d c || fail=1 a_inode=$(ls -i c/a|sed 's,c/.*,,') b_inode=$(ls -i c/b|sed 's,c/.*,,') test "$a_inode" = "$b_inode" && fail=1 @@ -72,7 +72,7 @@ test "$a_inode" = "$b_inode" && fail=1 rm -rf a b c d touch a; ln a b mkdir c -cp -d a b c +cp -d a b c || fail=1 a_inode=$(ls -i c/a|sed 's,c/.*,,') b_inode=$(ls -i c/b|sed 's,c/.*,,') test "$a_inode" = "$b_inode" || fail=1 @@ -82,7 +82,7 @@ test "$a_inode" = "$b_inode" || fail=1 rm -rf a b c d touch a; chmod 731 a umask 077 -cp -a --no-preserve=mode a b +cp -a --no-preserve=mode a b || fail=1 mode=$(ls -l b|cut -b-10) test "$mode" = "-rw-------" || fail=1 umask 022 diff --git a/tests/cp/link-symlink.sh b/tests/cp/link-symlink.sh index 518688762..0b7fb6ed8 100755 --- a/tests/cp/link-symlink.sh +++ b/tests/cp/link-symlink.sh @@ -32,7 +32,7 @@ esac # link.cp is probably a hardlink, but may also be a symlink # In either case the timestamp should match the original. -cp -al link link.cp +cp -al link link.cp || fail=1 case $(stat --format=%y link.cp) in 2011-01-01*) ;; *) fail=1 ;; diff --git a/tests/cp/preserve-mode.sh b/tests/cp/preserve-mode.sh index dc97cbaa0..e1096f5d6 100755 --- a/tests/cp/preserve-mode.sh +++ b/tests/cp/preserve-mode.sh @@ -26,7 +26,7 @@ touch b chmod 600 b #regular file test -cp --no-preserve=mode b c +cp --no-preserve=mode b c || fail=1 mode_a=$(ls -l a | gawk '{print $1}') mode_c=$(ls -l c | gawk '{print $1}') test "$mode_a" = "$mode_c" || fail=1 @@ -36,7 +36,7 @@ mkdir d1 d2 chmod 705 d2 #directory test -cp --no-preserve=mode -r d2 d3 +cp --no-preserve=mode -r d2 d3 || fail=1 mode_d1=$(ls -l d1 | gawk '{print $1}') mode_d3=$(ls -l d3 | gawk '{print $1}') test "$mode_d1" = "$mode_d3" || fail=1 @@ -46,7 +46,7 @@ touch a chmod 600 a #contradicting options test -cp --no-preserve=mode --preserve=all a b +cp --no-preserve=mode --preserve=all a b || fail=1 mode_a=$(ls -l a | gawk '{print $1}') mode_b=$(ls -l b | gawk '{print $1}') test "$mode_a" = "$mode_b" || fail=1 |