[regress/agent-ptrace.sh regress/dynamic-forward.sh

regress/sftp-cmds.sh regress/stderr-after-eof.sh regress/test-exec.sh]
no longer depends on which(1). patch by dtucker@

1 files changed, 16 insertions, 1 deletions

diff --git a/regress/test-exec.sh b/regress/test-exec.sh
index b5ef3bc7c..cc7ea67fe 100644
--- a/regress/test-exec.sh
+++ b/regress/test-exec.sh
@@ -6,7 +6,7 @@ PORT=4242
 
 if [ -x /usr/ucb/whoami ]; then
         USER=`/usr/ucb/whoami`
-elif [ -x "`which whoami 2>&1`" ]; then
+elif whoami >/dev/null 2>&1; then
         USER=`whoami`
 else
         USER=`id -un`
@@ -89,6 +89,21 @@ echon()
        fi
 }
 
+have_prog()
+{
+        saved_IFS="$IFS"
+        IFS=":"
+        for i in $PATH
+        do
+                if [ -x $i/$1 ]; then
+                        IFS="$saved_IFS"
+                        return 0
+                fi
+        done
+        IFS="$saved_IFS"
+        return 1
+}
+
 cleanup ()
 {
         if [ -f $PIDFILE ]; then