use better trap

diff --git a/tests/cp/perm b/tests/cp/perm
index 44a839f222783e215fba897046a2ad56bf9c661d..6901a89acf0555e99a397ecc376eb6597395737b 100755 (executable)
--- a/tests/cp/perm
+++ b/tests/cp/perm
@@ -12,7 +12,7 @@ fi
 pwd=`pwd`
 tmp=perm.$$
 trap 'status=$?; cd $pwd; rm -rf $tmp && exit $status' 0
-trap 'exit $?' 1 2 13 15
+trap '(exit $?); exit' 1 2 13 15
 
 framework_failure=0
 mkdir $tmp || framework_failure=1
@@ -39,7 +39,7 @@ for u in 31 37 2; do
          for o_perm in r w x rw wx xr rwx; do
            touch src || exit 1
            chmod u=r,g=rx,o= src || exit 1
-           set X `ls -l src`
+           set _ `ls -l src`
            shift
            expected_perms=$1
            rm -f dest
@@ -50,23 +50,23 @@ for u in 31 37 2; do
            $cmd $force src dest || exit 1
            test "$cmd" = mv && test -f src && exit 1
            test "$cmd" = cp && { test -f src || exit 1; }
-           set X `ls -l dest`
+           set _ `ls -l dest`
            shift
 
            case "$cmd:$force:$existing_dest" in
-             cp::yes)
+             cp:*:yes)
                _g_perm=`echo rwx|sed 's/[^'$g_perm']/-/g'`
                _o_perm=`echo rwx|sed 's/[^'$o_perm']/-/g'`
                expected_perms=-rw-$_g_perm$_o_perm
                ;;
-             cp::no|cp:-f:*)
+             cp:*:no)
                test $u = 37 &&
                  expected_perms=`echo $expected_perms|sed 's/.....$/-----/'`
                test $u = 31 &&
                  expected_perms=`echo $expected_perms|sed 's/..\(..\).$/--\1-/'`
                ;;
            esac
-           test x$1 = x$expected_perms || exit 1
+           test _$1 = _$expected_perms || exit 1
            # Perform only one iteration when there's no existing destination.
            test $existing_dest = no && break 3
          done