summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2003-09-07 09:32:58 +1000
committerDarren Tucker <dtucker@zip.com.au>2003-09-07 09:32:58 +1000
commite7f7580cab715bb3c82c3109edd45b9e2f49f6e5 (patch)
tree87be3df3fc18fae6a15e7b156d402300134ebf57
parente1e26a6c1545f9b54d439178cffa4129fae91426 (diff)
- (dtucker) [regress/sftp-cmds.sh] Skip quoted file test on Cygwin.
-rw-r--r--ChangeLog3
-rw-r--r--regress/sftp-cmds.sh16
2 files changed, 18 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 2ea4cd2e..ef5b1715 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,7 @@
Add ${EXEEXT}: required to work on Cygwin.
- (dtucker) [regress/sftp-batch.sh] Make temporary batch file name more
distinctive, so "rm ${BATCH}.*" doesn't match the script itself.
+ - (dtucker) [regress/sftp-cmds.sh] Skip quoted file test on Cygwin.
20030906
- (dtucker) [acconfig.h configure.ac uidswap.c] Prefer setuid/setgid on AIX.
@@ -1032,4 +1033,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.2965 2003/09/06 23:31:02 dtucker Exp $
+$Id: ChangeLog,v 1.2966 2003/09/06 23:32:58 dtucker Exp $
diff --git a/regress/sftp-cmds.sh b/regress/sftp-cmds.sh
index 7558f5e0..db03c33b 100644
--- a/regress/sftp-cmds.sh
+++ b/regress/sftp-cmds.sh
@@ -17,6 +17,20 @@ do
fi
done
+if [ -x "`which uname 2>&1`" ]
+then
+ case `uname` in
+ CYGWIN*)
+ os=cygwin
+ ;;
+ *)
+ os=`uname`
+ ;;
+ esac
+else
+ os="unknown"
+fi
+
# Path with embedded quote
QUOTECOPY=${COPY}".\"blah\""
QUOTECOPY_ARG=${COPY}'.\"blah\"'
@@ -99,11 +113,13 @@ echo "put $DATA $COPY" | ${SFTP} -P ${SFTPSERVER} >/dev/null 2>&1 \
|| fail "put failed"
cmp $DATA ${COPY} || fail "corrupted copy after put"
+if [ "$os" != "cygwin" ]; then
rm -f ${QUOTECOPY}
verbose "$tid: put filename with quotes"
echo "put $DATA \"$QUOTECOPY_ARG\"" | ${SFTP} -P ${SFTPSERVER} >/dev/null 2>&1 \
|| fail "put failed"
cmp $DATA ${QUOTECOPY} || fail "corrupted copy after put with quotes"
+fi
rm -f ${COPY}.dd/*
verbose "$tid: put to directory"