- djm@cvs.openbsd.org 2003/07/19 00:46:31

     [regress/sftp-cmds.sh]
     regress test for sftp arguments with escaped quotes; ok markus

2 files changed, 15 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index c2bb7bc32..383f85395 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,9 @@
      [sftp-int.c]
      fix sftp filename parsing for arguments with escaped quotes. bz #517;
      ok markus
+   - djm@cvs.openbsd.org 2003/07/19 00:46:31
+     [regress/sftp-cmds.sh]
+     regress test for sftp arguments with escaped quotes; ok markus
 
 20030714
  - (dtucker) [acconfig.h configure.ac port-aix.c] Older AIXes don't declare
@@ -715,4 +718,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.2862 2003/07/19 10:09:21 dtucker Exp $
+$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 @@
-#       $OpenBSD: sftp-cmds.sh,v 1.4 2003/05/15 04:07:12 mouring Exp $
+#       $OpenBSD: sftp-cmds.sh,v 1.5 2003/07/19 00:46:31 djm Exp $
 #       Placed in the Public Domain.
 
 # XXX - TODO: 
@@ -11,6 +11,10 @@ DATA=/bin/ls
 COPY=${OBJ}/copy
 GLOBFILES=`(cd /bin;echo l*)`
 
+# Path with embedded quote
+QUOTECOPY=${COPY}".\"blah\""
+QUOTECOPY_ARG=${COPY}'.\"blah\"'
+
 rm -rf ${COPY} ${COPY}.1 ${COPY}.2 ${COPY}.dd ${COPY}.dd2 ${BATCH}.*
 mkdir ${COPY}.dd
 
@@ -89,6 +93,12 @@ echo "put $DATA $COPY" | ${SFTP} -P ${SFTPSERVER} >/dev/null 2>&1 \
         || fail "put failed"
 cmp $DATA ${COPY} || fail "corrupted copy after put"
 
+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"
+
 rm -f ${COPY}.dd/*
 verbose "$tid: put to directory"
 echo "put $DATA ${COPY}.dd" | ${SFTP} -P ${SFTPSERVER} >/dev/null 2>&1 \