summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin Steves <stevesk@pobox.com>2001-03-05 19:50:57 +0000
committerKevin Steves <stevesk@pobox.com>2001-03-05 19:50:57 +0000
commit12888d1fc8bdcc2212ce61ffd523166c7e4ed5af (patch)
treea242f4eba3b6cc407a5e156223c8ed5d3732681b
parent935aa24bf41c0b77b79e6f010d482c9093a4b6d8 (diff)
- (stevesk) sftp.c: handle __progname
-rw-r--r--ChangeLog3
-rw-r--r--sftp.c7
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index cb3b2e45c..7ee586cbd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -175,6 +175,7 @@
175 - deraadt@cvs.openbsd.org 2001/03/05 08:37:27 175 - deraadt@cvs.openbsd.org 2001/03/05 08:37:27
176 [ssh-keyscan.c] 176 [ssh-keyscan.c]
177 skip inlining, why bother 177 skip inlining, why bother
178 - (stevesk) sftp.c: handle __progname
178 179
17920010304 18020010304
180 - (bal) Remove make-ssh-known-hosts.1 since it's no longer valid. 181 - (bal) Remove make-ssh-known-hosts.1 since it's no longer valid.
@@ -4367,4 +4368,4 @@
4367 - Wrote replacements for strlcpy and mkdtemp 4368 - Wrote replacements for strlcpy and mkdtemp
4368 - Released 1.0pre1 4369 - Released 1.0pre1
4369 4370
4370$Id: ChangeLog,v 1.907 2001/03/05 19:46:37 stevesk Exp $ 4371$Id: ChangeLog,v 1.908 2001/03/05 19:50:57 stevesk Exp $
diff --git a/sftp.c b/sftp.c
index b2c4a649a..f24f75071 100644
--- a/sftp.c
+++ b/sftp.c
@@ -40,6 +40,12 @@ RCSID("$OpenBSD: sftp.c,v 1.9 2001/03/03 23:52:22 markus Exp $");
40#include "sftp-client.h" 40#include "sftp-client.h"
41#include "sftp-int.h" 41#include "sftp-int.h"
42 42
43#ifdef HAVE___PROGNAME
44extern char *__progname;
45#else
46char *__progname;
47#endif
48
43int use_ssh1 = 0; 49int use_ssh1 = 0;
44char *ssh_program = _PATH_SSH_PROGRAM; 50char *ssh_program = _PATH_SSH_PROGRAM;
45char *sftp_server = NULL; 51char *sftp_server = NULL;
@@ -154,6 +160,7 @@ main(int argc, char **argv)
154 extern int optind; 160 extern int optind;
155 extern char *optarg; 161 extern char *optarg;
156 162
163 __progname = get_progname(argv[0]);
157 debug_level = compress_flag = 0; 164 debug_level = compress_flag = 0;
158 165
159 while ((ch = getopt(argc, argv, "1hvCo:s:S:")) != -1) { 166 while ((ch = getopt(argc, argv, "1hvCo:s:S:")) != -1) {