- djm@cvs.openbsd.org 2010/01/11 10:51:07

[openssh.git] / regress / sftp-glob.sh

diff --git a/regress/sftp-glob.sh b/regress/sftp-glob.sh
index d5ebf9fd6d59747014b00bee9179ad7ffc3db01c..72bb17d75336a1f04ada48a560f683360c7224d4 100644 (file)
--- a/regress/sftp-glob.sh
+++ b/regress/sftp-glob.sh
@@ -1,4 +1,4 @@
-#      $OpenBSD: sftp-glob.sh,v 1.2 2007/10/24 03:32:35 djm Exp $
+#      $OpenBSD: sftp-glob.sh,v 1.4 2009/08/13 01:11:55 djm Exp $
 #      Placed in the Public Domain.
 
 tid="sftp glob"
@@ -9,15 +9,18 @@ sftp_ls() {
        expected=$3
        unexpected=$4
        verbose "$tid: $errtag"
-       $ECHOE "ls -l ${target}" | \
-               ${SFTP} -b - -P ${SFTPSERVER} 2>/dev/null | \
+       printf "ls -l %s" "${target}" | \
+               ${SFTP} -b - -D ${SFTPSERVER} 2>/dev/null | \
                grep -v "^sftp>" > ${RESULTS}
        if [ $? -ne 0 ]; then
                fail "$errtag failed"
        fi
-       if test "x$expected" != "x" && \
-          ! fgrep "$expected" ${RESULTS} >/dev/null 2>&1 ; then
+       if test "x$expected" != "x" ; then
+           if fgrep "$expected" ${RESULTS} >/dev/null 2>&1 ; then
+               :
+           else
                fail "$expected missing from $errtag results"
+           fi
        fi
        if test "x$unexpected" != "x" && \
           fgrep "$unexpected" ${RESULTS} >/dev/null 2>&1 ; then