summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Rice <tim@multitalents.net>2003-09-09 08:35:20 -0700
committerTim Rice <tim@multitalents.net>2003-09-09 08:35:20 -0700
commit1eb40cf514eaf0abb70442c258d06fbf5ce3b03f (patch)
tree635037eae3d7b6c04838f1c5f81f42110e8469c6
parent5543947d7f022e1bc705aecce6761b00e8cba02f (diff)
[regress/sftp-badcmds.sh regress/sftp-cmds.sh] Fix errors like
UX:rm: ERROR: Cannot remove '.' or '..'
-rw-r--r--ChangeLog4
-rw-r--r--regress/sftp-badcmds.sh4
-rw-r--r--regress/sftp-cmds.sh4
3 files changed, 7 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 7e848eb5..1f042d64 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,8 @@
source tree.
- (tim) [regress/agent-timeout.sh] s/TIMEOUT/SSHAGENT_TIMEOUT/ Fixes conflict
with shell read-only variable.
+ - (tim) [regress/sftp-badcmds.sh regress/sftp-cmds.sh] Fix errors like
+ UX:rm: ERROR: Cannot remove '.' or '..'
20030908
- (tim) [configure.ac openbsd-compat/getrrsetbyname.c] wrap _getshort and
@@ -1050,4 +1052,4 @@
- Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
Report from murple@murple.net, diagnosis from dtucker@zip.com.au
-$Id: ChangeLog,v 1.2974 2003/09/09 15:27:40 tim Exp $
+$Id: ChangeLog,v 1.2975 2003/09/09 15:35:20 tim Exp $
diff --git a/regress/sftp-badcmds.sh b/regress/sftp-badcmds.sh
index 4fe32eff..a6a19409 100644
--- a/regress/sftp-badcmds.sh
+++ b/regress/sftp-badcmds.sh
@@ -9,7 +9,7 @@ NONEXIST=/NONEXIST.$$
COPY=${OBJ}/copy
GLOBFILES=`(cd /bin;echo l*)`
-rm -rf ${COPY} ${COPY}.1 ${COPY}.2 ${COPY}.dd ${BATCH}.*
+rm -rf ${COPY} ${COPY}.1 ${COPY}.2 ${COPY}.dd
rm -f ${COPY}
verbose "$tid: get nonexistent"
@@ -73,6 +73,6 @@ verbose "$tid: glob put files to local file"
echo "put /bin/l* $COPY" | ${SFTP} -P ${SFTPSERVER} >/dev/null 2>&1
cmp ${DATA2} ${COPY} || fail "put successed when it should have failed"
-rm -rf ${COPY} ${COPY}.1 ${COPY}.2 ${COPY}.dd ${BATCH}.*
+rm -rf ${COPY} ${COPY}.1 ${COPY}.2 ${COPY}.dd
diff --git a/regress/sftp-cmds.sh b/regress/sftp-cmds.sh
index db03c33b..1237720f 100644
--- a/regress/sftp-cmds.sh
+++ b/regress/sftp-cmds.sh
@@ -35,7 +35,7 @@ fi
QUOTECOPY=${COPY}".\"blah\""
QUOTECOPY_ARG=${COPY}'.\"blah\"'
-rm -rf ${COPY} ${COPY}.1 ${COPY}.2 ${COPY}.dd ${COPY}.dd2 ${BATCH}.*
+rm -rf ${COPY} ${COPY}.1 ${COPY}.2 ${COPY}.dd ${COPY}.dd2
mkdir ${COPY}.dd
verbose "$tid: lls"
@@ -190,6 +190,6 @@ verbose "$tid: lchdir"
echo "lchdir ${COPY}.dd" | ${SFTP} -P ${SFTPSERVER} >/dev/null 2>&1 \
|| fail "lchdir failed"
-rm -rf ${COPY} ${COPY}.1 ${COPY}.2 ${COPY}.dd ${COPY}.dd2 ${BATCH}.*
+rm -rf ${COPY} ${COPY}.1 ${COPY}.2 ${COPY}.dd ${COPY}.dd2