# they're explicitly given on the command line.
# Also, we can't count on 'cp -a' or 'mkdir -p', although they're
-# pretty handy.
+# pretty handy (see function makepath for the latter).
# I think some of the GNU documentation suggests that we shouldn't
# rely on shell functions. However, the Bash manual seems to say that
# You cannot do "export VAR=VALUE" all on one line; the export must be
# separate from the assignment. (SCO SysV)
+# Don't rely on grep -q, as that doesn't work everywhere -- just redirect
+# stdout to /dev/null to keep it quiet.
# STILL TO DO:
. "./shconfig"
RUNSHFLAGS='-e'
+export RUNSHFLAGS
# for Solaris
[ -d /usr/xpg4/bin ] && PATH="/usr/xpg4/bin/:$PATH"
testuser=`/usr/bin/whoami`
elif [ -f /usr/ucb/whoami ]; then
testuser=`/usr/ucb/whoami`
+elif [ -f /bin/whoami ]; then
+ testuser=`/bin/whoami`
else
- testuser=`id -un || whoami || echo ${LOGNAME:-${USERNAME:-${USER:-'UNKNOWN'}}}`
+ testuser=`id -un 2>/dev/null || echo ${LOGNAME:-${USERNAME:-${USER:-'UNKNOWN'}}}`
fi
echo " testuser=$testuser"
echo " preserve_scratch=no"
fi
+# Check if setfacl is around and if it supports the -k or -s option.
+if setfacl --help 2>/dev/null | grep ' -k,' >/dev/null; then
+ setfacl_nodef='setfacl -k'
+elif setfacl -s u::7,g::5,o:5 testsuite 2>/dev/null; then
+ setfacl_nodef='setfacl -s u::7,g::5,o:5'
+else
+ setfacl_nodef=true
+fi
if [ ! -f "$rsync_bin" ]; then
echo "rsync_bin $rsync_bin is not a file" >&2
RSYNC="$rsync_bin"
#RSYNC="valgrind --tool=addrcheck $rsync_bin"
-export rsync_bin RSYNC
+export rsync_bin RSYNC setfacl_nodef
skipped=0
missing=0
prep_scratch() {
[ -d "$scratchdir" ] && rm -rf "$scratchdir"
mkdir "$scratchdir"
+ # Get rid of default ACLs and dir-setgid to avoid confusing some tests.
+ $setfacl_nodef "$scratchdir"
+ chmod g-s "$scratchdir"
return 0
}