RepoMirrors/openssh
1
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2024-12-27 04:12:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
[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.
This commit is contained in:
Damien Miller 2007-10-26 15:35:54 +10:00
parent ce0e60ee57
commit da1e4bd3bf
3 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -73,6 +73,10 @@
[regress/sftp-cmds.sh regress/sftp-glob.sh regress/test-exec.sh] [regress/sftp-cmds.sh regress/sftp-glob.sh regress/test-exec.sh]
comprehensive tests for sftp escaping its interaction with globbing; comprehensive tests for sftp escaping its interaction with globbing;
ok dtucker@ 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 20070927
- (dtucker) [configure.ac atomicio.c] Fall back to including <sys/poll.h> if - (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 OpenServer 6 and add osr5bigcrypt support so when someone migrates
passwords between UnixWare and OpenServer they will still work. OK dtucker@ 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 $

4
regress/sftp-glob.sh
View File

@ -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. # Placed in the Public Domain.
tid="sftp glob" tid="sftp glob"
@ -9,7 +9,7 @@ sftp_ls() {
expected=$3 expected=$3
unexpected=$4 unexpected=$4
verbose "$tid: $errtag" verbose "$tid: $errtag"
$ECHOE "ls -l ${target}" | \ printf "ls -l %s" "${target}" | \
${SFTP} -b - -P ${SFTPSERVER} 2>/dev/null | \ ${SFTP} -b - -P ${SFTPSERVER} 2>/dev/null | \
grep -v "^sftp>" > ${RESULTS} grep -v "^sftp>" > ${RESULTS}
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then

19
regress/test-exec.sh
View File

@ -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. # Placed in the Public Domain.
#SUDO=sudo #SUDO=sudo
@ -30,9 +30,6 @@ else
USER=`id -un` USER=`id -un`
fi fi
# XXX platforms that don't support -E may need a replacement
ECHOE="echo -E"
OBJ=$1 OBJ=$1
if [ "x$OBJ" = "x" ]; then if [ "x$OBJ" = "x" ]; then
echo '$OBJ not defined' echo '$OBJ not defined'
@ -159,31 +156,31 @@ cleanup ()
trace () trace ()
{ {
$ECHOE "trace: $@" >>$TEST_SSH_LOGFILE echo "trace: $@" >>$TEST_SSH_LOGFILE
if [ "X$TEST_SSH_TRACE" = "Xyes" ]; then if [ "X$TEST_SSH_TRACE" = "Xyes" ]; then
$ECHOE "$@" echo "$@"
fi fi
} }
verbose () verbose ()
{ {
$ECHOE "verbose: $@" >>$TEST_SSH_LOGFILE echo "verbose: $@" >>$TEST_SSH_LOGFILE
if [ "X$TEST_SSH_QUIET" != "Xyes" ]; then if [ "X$TEST_SSH_QUIET" != "Xyes" ]; then
$ECHOE "$@" echo "$@"
fi fi
} }
fail () fail ()
{ {
$ECHOE "FAIL: $@" >>$TEST_SSH_LOGFILE echo "FAIL: $@" >>$TEST_SSH_LOGFILE
RESULT=1 RESULT=1
$ECHOE "$@" echo "$@"
} }
fatal () fatal ()
{ {
$ECHOE "FATAL: $@" >>$TEST_SSH_LOGFILE echo "FATAL: $@" >>$TEST_SSH_LOGFILE
echon "FATAL: " echon "FATAL: "
fail "$@" fail "$@"
cleanup cleanup