summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2003-01-16 15:39:13 +1100
committerDamien Miller <djm@mindrot.org>2003-01-16 15:39:13 +1100
commitcb3e3c8b24b5c62a56241719df3702b5d598d5f4 (patch)
tree7869f49faa994ace4221d2bda51b587ebec99190
parent5fa01fd7fba87bbd716b4ca32d4d7e2f7180975a (diff)
- (djm) OpenBSD CVS Sync - djm@cvs.openbsd.org 2003/01/16 03:41:55 [sftp-int.c] explicitly use first glob result
-rw-r--r--ChangeLog8
-rw-r--r--sftp-int.c4
2 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 36d5d2ca..63979507 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+20030116
+ - (djm) OpenBSD CVS Sync
+ - djm@cvs.openbsd.org 2003/01/16 03:41:55
+ [sftp-int.c]
+ explicitly use first glob result
+
20030114
- (djm) OpenBSD CVS Sync
- fgsch@cvs.openbsd.org 2003/01/10 23:23:24
@@ -1021,4 +1027,4 @@
save auth method before monitor_reset_key_state(); bugzilla bug #284;
ok provos@
-$Id: ChangeLog,v 1.2572 2003/01/14 11:24:47 djm Exp $
+$Id: ChangeLog,v 1.2573 2003/01/16 04:39:13 djm Exp $
diff --git a/sftp-int.c b/sftp-int.c
index 42040f5b..013ea84e 100644
--- a/sftp-int.c
+++ b/sftp-int.c
@@ -25,7 +25,7 @@
/* XXX: recursive operations */
#include "includes.h"
-RCSID("$OpenBSD: sftp-int.c,v 1.55 2003/01/14 10:58:00 djm Exp $");
+RCSID("$OpenBSD: sftp-int.c,v 1.56 2003/01/16 03:41:55 djm Exp $");
#include "buffer.h"
#include "xmalloc.h"
@@ -505,7 +505,7 @@ process_put(struct sftp_conn *conn, char *src, char *dst, char *pwd, int pflag)
/* Only one match, dst may be file, directory or unspecified */
if (g.gl_pathv[0] && g.gl_matchc == 1) {
- if (!is_reg(g.gl_pathv[i])) {
+ if (!is_reg(g.gl_pathv[0])) {
error("Can't upload %s: not a regular file",
g.gl_pathv[0]);
err = 1;