From 12888d1fc8bdcc2212ce61ffd523166c7e4ed5af Mon Sep 17 00:00:00 2001 From: Kevin Steves Date: Mon, 5 Mar 2001 19:50:57 +0000 Subject: [PATCH] - (stevesk) sftp.c: handle __progname --- ChangeLog | 3 ++- sftp.c | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index cb3b2e45c..7ee586cbd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -175,6 +175,7 @@ - deraadt@cvs.openbsd.org 2001/03/05 08:37:27 [ssh-keyscan.c] skip inlining, why bother + - (stevesk) sftp.c: handle __progname 20010304 - (bal) Remove make-ssh-known-hosts.1 since it's no longer valid. @@ -4367,4 +4368,4 @@ - Wrote replacements for strlcpy and mkdtemp - Released 1.0pre1 -$Id: ChangeLog,v 1.907 2001/03/05 19:46:37 stevesk Exp $ +$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 $"); #include "sftp-client.h" #include "sftp-int.h" +#ifdef HAVE___PROGNAME +extern char *__progname; +#else +char *__progname; +#endif + int use_ssh1 = 0; char *ssh_program = _PATH_SSH_PROGRAM; char *sftp_server = NULL; @@ -154,6 +160,7 @@ main(int argc, char **argv) extern int optind; extern char *optarg; + __progname = get_progname(argv[0]); debug_level = compress_flag = 0; while ((ch = getopt(argc, argv, "1hvCo:s:S:")) != -1) {