From: djm <djm>
Date: Wed, 21 Jan 2004 03:11:05 +0000 (+0000)
Subject:    - djm@cvs.openbsd.org 2004/01/21 03:07:59
X-Git-Tag: V_3_8_P1~88
X-Git-Url: http://andersk.mit.edu/gitweb/openssh.git/commitdiff_plain/ac414e17828b29dc7001bc86e17d981104ec4079

   - djm@cvs.openbsd.org 2004/01/21 03:07:59
     [sftp.c]
     initialise infile in main, rather than statically - from portable
---

diff --git a/ChangeLog b/ChangeLog
index d9168f6a..dc788f5b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -23,6 +23,9 @@
    - markus@cvs.openbsd.org 2004/01/19 21:25:15
      [auth2-hostbased.c auth2-pubkey.c serverloop.c ssh-keysign.c sshconnect2.c]
      fix mem leaks; some fixes from Pete Flugstad; tested dtucker@
+   - djm@cvs.openbsd.org 2004/01/21 03:07:59
+     [sftp.c]
+     initialise infile in main, rather than statically - from portable
 
 20040114
  - (dtucker) [auth-pam.c] Have monitor die if PAM authentication thread exits
diff --git a/sftp.c b/sftp.c
index e288302f..0be27887 100644
--- a/sftp.c
+++ b/sftp.c
@@ -24,7 +24,7 @@
 
 #include "includes.h"
 
-RCSID("$OpenBSD: sftp.c,v 1.39 2004/01/13 09:25:05 djm Exp $");
+RCSID("$OpenBSD: sftp.c,v 1.40 2004/01/21 03:07:59 djm Exp $");
 
 #include "buffer.h"
 #include "xmalloc.h"
@@ -43,7 +43,7 @@ extern char *__progname;
 char *__progname;
 #endif
 
-FILE* infile = stdin;
+FILE* infile;
 int batchmode = 0;
 size_t copy_buffer_len = 32768;
 size_t num_requests = 16;
@@ -141,7 +141,9 @@ main(int argc, char **argv)
 	addargs(&args, "-oForwardX11 no");
 	addargs(&args, "-oForwardAgent no");
 	addargs(&args, "-oClearAllForwardings yes");
+
 	ll = SYSLOG_LEVEL_INFO;
+	infile = stdin;
 
 	while ((ch = getopt(argc, argv, "1hvCo:s:S:b:B:F:P:R:")) != -1) {
 		switch (ch) {