- djm@cvs.openbsd.org 2007/10/26 05:30:01

     [regress/sftp-glob.sh regress/test-exec.sh]
     remove "echo -E" crap that I added in last commit and use printf(1) for
     cases where we strictly require echo not to reprocess escape characters.

diff --git a/ChangeLog b/ChangeLog
index 02ffc285b463ab4910b3fbcd25e69d1590962350..d0535f4405f32c6715802a2ba95757a4a19f658f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -73,6 +73,10 @@
      [regress/sftp-cmds.sh regress/sftp-glob.sh regress/test-exec.sh]
      comprehensive tests for sftp escaping its interaction with globbing;
      ok dtucker@
+   - djm@cvs.openbsd.org 2007/10/26 05:30:01
+     [regress/sftp-glob.sh regress/test-exec.sh]
+     remove "echo -E" crap that I added in last commit and use printf(1) for
+     cases where we strictly require echo not to reprocess escape characters.
 
 20070927
  - (dtucker) [configure.ac atomicio.c] Fall back to including <sys/poll.h> if

diff --git a/regress/sftp-glob.sh b/regress/sftp-glob.sh
index d5ebf9fd6d59747014b00bee9179ad7ffc3db01c..62004efc5e50878d642a4b4731460602e13ccc1d 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.3 2007/10/26 05:30:01 djm Exp $
 #      Placed in the Public Domain.
 
 tid="sftp glob"
@@ -9,7 +9,7 @@ sftp_ls() {
        expected=$3
        unexpected=$4
        verbose "$tid: $errtag"
-       $ECHOE "ls -l ${target}" | \
+       printf "ls -l %s" "${target}" | \
                ${SFTP} -b - -P ${SFTPSERVER} 2>/dev/null | \
                grep -v "^sftp>" > ${RESULTS}
        if [ $? -ne 0 ]; then

diff --git a/regress/test-exec.sh b/regress/test-exec.sh
index 650be419e267aa71d261021dba36e98b011afca2..e44778065f6ab35af2b6891ea0c96c137463cb7c 100644 (file)
--- a/regress/test-exec.sh
+++ b/regress/test-exec.sh
@@ -1,4 +1,4 @@
-#      $OpenBSD: test-exec.sh,v 1.28 2005/05/20 23:14:15 djm Exp $
+#      $OpenBSD: test-exec.sh,v 1.30 2007/10/26 05:30:01 djm Exp $
 #      Placed in the Public Domain.
 
 #SUDO=sudo
@@ -30,9 +30,6 @@ else
        USER=`id -un`
 fi
 
-# XXX platforms that don't support -E may need a replacement
-ECHOE="echo -E"
-
 OBJ=$1
 if [ "x$OBJ" = "x" ]; then
        echo '$OBJ not defined'
@@ -159,31 +156,31 @@ cleanup ()
 
 trace ()
 {
-       $ECHOE "trace: $@" >>$TEST_SSH_LOGFILE
+       echo "trace: $@" >>$TEST_SSH_LOGFILE
        if [ "X$TEST_SSH_TRACE" = "Xyes" ]; then
-               $ECHOE "$@"
+               echo "$@"
        fi
 }
 
 verbose ()
 {
-       $ECHOE "verbose: $@" >>$TEST_SSH_LOGFILE
+       echo "verbose: $@" >>$TEST_SSH_LOGFILE
        if [ "X$TEST_SSH_QUIET" != "Xyes" ]; then
-               $ECHOE "$@"
+               echo "$@"
        fi
 }
 
 
 fail ()
 {
-       $ECHOE "FAIL: $@" >>$TEST_SSH_LOGFILE
+       echo "FAIL: $@" >>$TEST_SSH_LOGFILE
        RESULT=1
-       $ECHOE "$@"
+       echo "$@"
 }
 
 fatal ()
 {
-       $ECHOE "FATAL: $@" >>$TEST_SSH_LOGFILE
+       echo "FATAL: $@" >>$TEST_SSH_LOGFILE
        echon "FATAL: "
        fail "$@"
        cleanup