diff options
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | sftp.c | 7 |
2 files changed, 9 insertions, 1 deletions
@@ -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 | ||
179 | 20010304 | 180 | 20010304 |
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 $ |
@@ -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 | ||
44 | extern char *__progname; | ||
45 | #else | ||
46 | char *__progname; | ||
47 | #endif | ||
48 | |||
43 | int use_ssh1 = 0; | 49 | int use_ssh1 = 0; |
44 | char *ssh_program = _PATH_SSH_PROGRAM; | 50 | char *ssh_program = _PATH_SSH_PROGRAM; |
45 | char *sftp_server = NULL; | 51 | char *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) { |