summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2004-04-16 17:58:28 +1000
committerDarren Tucker <dtucker@zip.com.au>2004-04-16 17:58:28 +1000
commitc99a19b44539df51837f125f0607dda9f2876094 (patch)
tree98f591f24e8cb9b093bac64216a0b42937d9c5f3
parent855ffbfc5a08d084ea994515c458f3272ad6d819 (diff)
- (dtucker) [regress/sftp-cmds.sh] Skip quoting test on Cygwin, since
FAT/NTFS does not permit quotes in filenames. From vinschen at redhat.com
-rw-r--r--ChangeLog6
-rw-r--r--regress/sftp-cmds.sh2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 28bb6a223..293123aef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
120040416
2 - (dtucker) [regress/sftp-cmds.sh] Skip quoting test on Cygwin, since
3 FAT/NTFS does not permit quotes in filenames. From vinschen at redhat.com
4
120040412 520040412
2 - (dtucker) [sshd_config.5] Add PermitRootLogin without-password warning 6 - (dtucker) [sshd_config.5] Add PermitRootLogin without-password warning
3 from bug #701 (text from jfh at cise.ufl.edu). 7 from bug #701 (text from jfh at cise.ufl.edu).
@@ -966,4 +970,4 @@
966 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 970 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
967 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 971 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
968 972
969$Id: ChangeLog,v 1.3311 2004/04/14 10:14:26 djm Exp $ 973$Id: ChangeLog,v 1.3312 2004/04/16 07:58:28 dtucker Exp $
diff --git a/regress/sftp-cmds.sh b/regress/sftp-cmds.sh
index 3669b19ff..31b21d1f2 100644
--- a/regress/sftp-cmds.sh
+++ b/regress/sftp-cmds.sh
@@ -85,6 +85,7 @@ echo "get \"$DATA\" $COPY" | ${SFTP} -P ${SFTPSERVER} >/dev/null 2>&1 \
85 || fail "get failed" 85 || fail "get failed"
86cmp $DATA ${COPY} || fail "corrupted copy after get" 86cmp $DATA ${COPY} || fail "corrupted copy after get"
87 87
88if [ "$os" != "cygwin" ]; then
88rm -f ${QUOTECOPY} 89rm -f ${QUOTECOPY}
89cp $DATA ${QUOTECOPY} 90cp $DATA ${QUOTECOPY}
90verbose "$tid: get filename with quotes" 91verbose "$tid: get filename with quotes"
@@ -92,6 +93,7 @@ echo "get \"$QUOTECOPY_ARG\" ${COPY}" | ${SFTP} -P ${SFTPSERVER} >/dev/null 2>&1
92 || fail "put failed" 93 || fail "put failed"
93cmp ${COPY} ${QUOTECOPY} || fail "corrupted copy after get with quotes" 94cmp ${COPY} ${QUOTECOPY} || fail "corrupted copy after get with quotes"
94rm -f ${QUOTECOPY} ${COPY} 95rm -f ${QUOTECOPY} ${COPY}
96fi
95 97
96rm -f ${COPY}.dd/* 98rm -f ${COPY}.dd/*
97verbose "$tid: get to directory" 99verbose "$tid: get to directory"