summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2003-10-08 17:34:38 +1000
committerDarren Tucker <dtucker@zip.com.au>2003-10-08 17:34:38 +1000
commit64dbccc2a517fb77f648e4a9aed5ae78719309bb (patch)
treeff4739eb3e7cfe305c8b1a0524d9d321912be245
parent046dff2a07d63d41967d2e8b97c3d460336932a2 (diff)
- djm@cvs.openbsd.org 2003/10/07 07:04:16
[sftp-int.c] sftp quoting fix from admorten AT umich.edu; ok markus@
-rw-r--r--ChangeLog5
-rw-r--r--sftp-int.c3
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 6c1edbd9f..aa0f798b0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,9 @@
4 [sshconnect2.c] 4 [sshconnect2.c]
5 Don't use logit for banner, since it truncates to MSGBUFSIZ; bz #668 & #707. 5 Don't use logit for banner, since it truncates to MSGBUFSIZ; bz #668 & #707.
6 ok markus@ 6 ok markus@
7 - djm@cvs.openbsd.org 2003/10/07 07:04:16
8 [sftp-int.c]
9 sftp quoting fix from admorten AT umich.edu; ok markus@
7 10
820031007 1120031007
9 - (djm) Delete autom4te.cache after autoreconf 12 - (djm) Delete autom4te.cache after autoreconf
@@ -1299,4 +1302,4 @@
1299 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. 1302 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
1300 Report from murple@murple.net, diagnosis from dtucker@zip.com.au 1303 Report from murple@murple.net, diagnosis from dtucker@zip.com.au
1301 1304
1302$Id: ChangeLog,v 1.3064 2003/10/08 07:32:02 dtucker Exp $ 1305$Id: ChangeLog,v 1.3065 2003/10/08 07:34:38 dtucker Exp $
diff --git a/sftp-int.c b/sftp-int.c
index c93eaabff..2deb29bb1 100644
--- a/sftp-int.c
+++ b/sftp-int.c
@@ -25,7 +25,7 @@
25/* XXX: recursive operations */ 25/* XXX: recursive operations */
26 26
27#include "includes.h" 27#include "includes.h"
28RCSID("$OpenBSD: sftp-int.c,v 1.62 2003/08/25 08:13:09 fgsch Exp $"); 28RCSID("$OpenBSD: sftp-int.c,v 1.63 2003/10/07 07:04:16 djm Exp $");
29 29
30#include "buffer.h" 30#include "buffer.h"
31#include "xmalloc.h" 31#include "xmalloc.h"
@@ -350,6 +350,7 @@ get_pathname(const char **cpp, char **path)
350 /* Search for terminating quote, unescape some chars */ 350 /* Search for terminating quote, unescape some chars */
351 for (i = j = 0; i <= strlen(cp); i++) { 351 for (i = j = 0; i <= strlen(cp); i++) {
352 if (cp[i] == quot) { /* Found quote */ 352 if (cp[i] == quot) { /* Found quote */
353 i++;
353 (*path)[j] = '\0'; 354 (*path)[j] = '\0';
354 i++; 355 i++;
355 break; 356 break;