summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--sftp.c3
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index cd9edf8c2..31aec8979 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
120121005
2 - (dtucker) OpenBSD CVS Sync
3 - djm@cvs.openbsd.org 2012/09/17 09:54:44
4 [sftp.c]
5 an XXX for later
6
120120917 720120917
2 - (dtucker) OpenBSD CVS Sync 8 - (dtucker) OpenBSD CVS Sync
3 - dtucker@cvs.openbsd.org 2012/09/13 23:37:36 9 - dtucker@cvs.openbsd.org 2012/09/13 23:37:36
diff --git a/sftp.c b/sftp.c
index 235c6ad04..217b63a2d 100644
--- a/sftp.c
+++ b/sftp.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sftp.c,v 1.136 2012/06/22 14:36:33 dtucker Exp $ */ 1/* $OpenBSD: sftp.c,v 1.137 2012/09/17 09:54:44 djm Exp $ */
2/* 2/*
3 * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> 3 * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
4 * 4 *
@@ -1917,6 +1917,7 @@ interactive_loop(struct sftp_conn *conn, char *file1, char *file2)
1917 return (-1); 1917 return (-1);
1918 } 1918 }
1919 } else { 1919 } else {
1920 /* XXX this is wrong wrt quoting */
1920 if (file2 == NULL) 1921 if (file2 == NULL)
1921 snprintf(cmd, sizeof cmd, "get %s", dir); 1922 snprintf(cmd, sizeof cmd, "get %s", dir);
1922 else 1923 else