diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | regress/sftp-cmds.sh | 12 |
2 files changed, 15 insertions, 2 deletions
@@ -19,6 +19,9 @@ | |||
19 | [sftp-int.c] | 19 | [sftp-int.c] |
20 | fix sftp filename parsing for arguments with escaped quotes. bz #517; | 20 | fix sftp filename parsing for arguments with escaped quotes. bz #517; |
21 | ok markus | 21 | ok markus |
22 | - djm@cvs.openbsd.org 2003/07/19 00:46:31 | ||
23 | [regress/sftp-cmds.sh] | ||
24 | regress test for sftp arguments with escaped quotes; ok markus | ||
22 | 25 | ||
23 | 20030714 | 26 | 20030714 |
24 | - (dtucker) [acconfig.h configure.ac port-aix.c] Older AIXes don't declare | 27 | - (dtucker) [acconfig.h configure.ac port-aix.c] Older AIXes don't declare |
@@ -715,4 +718,4 @@ | |||
715 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. | 718 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. |
716 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au | 719 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au |
717 | 720 | ||
718 | $Id: ChangeLog,v 1.2862 2003/07/19 10:09:21 dtucker Exp $ | 721 | $Id: ChangeLog,v 1.2863 2003/07/19 10:11:54 dtucker Exp $ |
diff --git a/regress/sftp-cmds.sh b/regress/sftp-cmds.sh index b86712f47..0969dbd46 100644 --- a/regress/sftp-cmds.sh +++ b/regress/sftp-cmds.sh | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: sftp-cmds.sh,v 1.4 2003/05/15 04:07:12 mouring Exp $ | 1 | # $OpenBSD: sftp-cmds.sh,v 1.5 2003/07/19 00:46:31 djm Exp $ |
2 | # Placed in the Public Domain. | 2 | # Placed in the Public Domain. |
3 | 3 | ||
4 | # XXX - TODO: | 4 | # XXX - TODO: |
@@ -11,6 +11,10 @@ DATA=/bin/ls | |||
11 | COPY=${OBJ}/copy | 11 | COPY=${OBJ}/copy |
12 | GLOBFILES=`(cd /bin;echo l*)` | 12 | GLOBFILES=`(cd /bin;echo l*)` |
13 | 13 | ||
14 | # Path with embedded quote | ||
15 | QUOTECOPY=${COPY}".\"blah\"" | ||
16 | QUOTECOPY_ARG=${COPY}'.\"blah\"' | ||
17 | |||
14 | rm -rf ${COPY} ${COPY}.1 ${COPY}.2 ${COPY}.dd ${COPY}.dd2 ${BATCH}.* | 18 | rm -rf ${COPY} ${COPY}.1 ${COPY}.2 ${COPY}.dd ${COPY}.dd2 ${BATCH}.* |
15 | mkdir ${COPY}.dd | 19 | mkdir ${COPY}.dd |
16 | 20 | ||
@@ -89,6 +93,12 @@ echo "put $DATA $COPY" | ${SFTP} -P ${SFTPSERVER} >/dev/null 2>&1 \ | |||
89 | || fail "put failed" | 93 | || fail "put failed" |
90 | cmp $DATA ${COPY} || fail "corrupted copy after put" | 94 | cmp $DATA ${COPY} || fail "corrupted copy after put" |
91 | 95 | ||
96 | rm -f ${QUOTECOPY} | ||
97 | verbose "$tid: put filename with quotes" | ||
98 | echo "put $DATA \"$QUOTECOPY_ARG\"" | ${SFTP} -P ${SFTPSERVER} >/dev/null 2>&1 \ | ||
99 | || fail "put failed" | ||
100 | cmp $DATA ${QUOTECOPY} || fail "corrupted copy after put with quotes" | ||
101 | |||
92 | rm -f ${COPY}.dd/* | 102 | rm -f ${COPY}.dd/* |
93 | verbose "$tid: put to directory" | 103 | verbose "$tid: put to directory" |
94 | echo "put $DATA ${COPY}.dd" | ${SFTP} -P ${SFTPSERVER} >/dev/null 2>&1 \ | 104 | echo "put $DATA ${COPY}.dd" | ${SFTP} -P ${SFTPSERVER} >/dev/null 2>&1 \ |