mirror of
git://anongit.mindrot.org/openssh.git
synced 2025-02-27 19:31:11 +00:00
20030116
- (djm) OpenBSD CVS Sync - djm@cvs.openbsd.org 2003/01/16 03:41:55 [sftp-int.c] explicitly use first glob result
This commit is contained in:
parent
5fa01fd7fb
commit
cb3e3c8b24
@ -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
|
20030114
|
||||||
- (djm) OpenBSD CVS Sync
|
- (djm) OpenBSD CVS Sync
|
||||||
- fgsch@cvs.openbsd.org 2003/01/10 23:23:24
|
- 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;
|
save auth method before monitor_reset_key_state(); bugzilla bug #284;
|
||||||
ok provos@
|
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 $
|
||||||
|
@ -25,7 +25,7 @@
|
|||||||
/* XXX: recursive operations */
|
/* XXX: recursive operations */
|
||||||
|
|
||||||
#include "includes.h"
|
#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 "buffer.h"
|
||||||
#include "xmalloc.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 */
|
/* Only one match, dst may be file, directory or unspecified */
|
||||||
if (g.gl_pathv[0] && g.gl_matchc == 1) {
|
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",
|
error("Can't upload %s: not a regular file",
|
||||||
g.gl_pathv[0]);
|
g.gl_pathv[0]);
|
||||||
err = 1;
|
err = 1;
|
||||||
|
Loading…
Reference in New Issue
Block a user