diff options
author | Darren Tucker <dtucker@zip.com.au> | 2003-09-07 09:32:58 +1000 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2003-09-07 09:32:58 +1000 |
commit | e7f7580cab715bb3c82c3109edd45b9e2f49f6e5 (patch) | |
tree | 87be3df3fc18fae6a15e7b156d402300134ebf57 | |
parent | e1e26a6c1545f9b54d439178cffa4129fae91426 (diff) |
- (dtucker) [regress/sftp-cmds.sh] Skip quoted file test on Cygwin.
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | regress/sftp-cmds.sh | 16 |
2 files changed, 18 insertions, 1 deletions
@@ -5,6 +5,7 @@ | |||
5 | Add ${EXEEXT}: required to work on Cygwin. | 5 | Add ${EXEEXT}: required to work on Cygwin. |
6 | - (dtucker) [regress/sftp-batch.sh] Make temporary batch file name more | 6 | - (dtucker) [regress/sftp-batch.sh] Make temporary batch file name more |
7 | distinctive, so "rm ${BATCH}.*" doesn't match the script itself. | 7 | distinctive, so "rm ${BATCH}.*" doesn't match the script itself. |
8 | - (dtucker) [regress/sftp-cmds.sh] Skip quoted file test on Cygwin. | ||
8 | 9 | ||
9 | 20030906 | 10 | 20030906 |
10 | - (dtucker) [acconfig.h configure.ac uidswap.c] Prefer setuid/setgid on AIX. | 11 | - (dtucker) [acconfig.h configure.ac uidswap.c] Prefer setuid/setgid on AIX. |
@@ -1032,4 +1033,4 @@ | |||
1032 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. | 1033 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. |
1033 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au | 1034 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au |
1034 | 1035 | ||
1035 | $Id: ChangeLog,v 1.2965 2003/09/06 23:31:02 dtucker Exp $ | 1036 | $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 7558f5e01..db03c33b8 100644 --- a/regress/sftp-cmds.sh +++ b/regress/sftp-cmds.sh | |||
@@ -17,6 +17,20 @@ do | |||
17 | fi | 17 | fi |
18 | done | 18 | done |
19 | 19 | ||
20 | if [ -x "`which uname 2>&1`" ] | ||
21 | then | ||
22 | case `uname` in | ||
23 | CYGWIN*) | ||
24 | os=cygwin | ||
25 | ;; | ||
26 | *) | ||
27 | os=`uname` | ||
28 | ;; | ||
29 | esac | ||
30 | else | ||
31 | os="unknown" | ||
32 | fi | ||
33 | |||
20 | # Path with embedded quote | 34 | # Path with embedded quote |
21 | QUOTECOPY=${COPY}".\"blah\"" | 35 | QUOTECOPY=${COPY}".\"blah\"" |
22 | QUOTECOPY_ARG=${COPY}'.\"blah\"' | 36 | QUOTECOPY_ARG=${COPY}'.\"blah\"' |
@@ -99,11 +113,13 @@ echo "put $DATA $COPY" | ${SFTP} -P ${SFTPSERVER} >/dev/null 2>&1 \ | |||
99 | || fail "put failed" | 113 | || fail "put failed" |
100 | cmp $DATA ${COPY} || fail "corrupted copy after put" | 114 | cmp $DATA ${COPY} || fail "corrupted copy after put" |
101 | 115 | ||
116 | if [ "$os" != "cygwin" ]; then | ||
102 | rm -f ${QUOTECOPY} | 117 | rm -f ${QUOTECOPY} |
103 | verbose "$tid: put filename with quotes" | 118 | verbose "$tid: put filename with quotes" |
104 | echo "put $DATA \"$QUOTECOPY_ARG\"" | ${SFTP} -P ${SFTPSERVER} >/dev/null 2>&1 \ | 119 | echo "put $DATA \"$QUOTECOPY_ARG\"" | ${SFTP} -P ${SFTPSERVER} >/dev/null 2>&1 \ |
105 | || fail "put failed" | 120 | || fail "put failed" |
106 | cmp $DATA ${QUOTECOPY} || fail "corrupted copy after put with quotes" | 121 | cmp $DATA ${QUOTECOPY} || fail "corrupted copy after put with quotes" |
122 | fi | ||
107 | 123 | ||
108 | rm -f ${COPY}.dd/* | 124 | rm -f ${COPY}.dd/* |
109 | verbose "$tid: put to directory" | 125 | verbose "$tid: put to directory" |