3 files changed, 15 insertions, 14 deletions

diff --git a/ChangeLog b/ChangeLog
index c20d611b5..1cf5e350f 100644
--- 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
@@ -3344,4 +3348,4 @@
    OpenServer 6 and add osr5bigcrypt support so when someone migrates
    passwords between UnixWare and OpenServer they will still work. OK dtucker@
 
-$Id: ChangeLog,v 1.4776 2007/10/26 04:54:12 djm Exp $
+$Id: ChangeLog,v 1.4777 2007/10/26 05:35:54 djm Exp $
diff --git a/regress/sftp-glob.sh b/regress/sftp-glob.sh
index d5ebf9fd6..62004efc5 100644
--- 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 650be419e..e44778065 100644
--- 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