diff --git a/ChangeLog b/ChangeLog index 116be9687..6baf7e72e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16,6 +16,9 @@ - markus@cvs.openbsd.org 2002/02/06 14:22:42 [sftp.1] sort options; ok mpech@, stevesk@ + - mpech@cvs.openbsd.org 2002/02/06 14:27:23 + [sftp.c] + sync usage() with manual. 20020205 - (djm) Cleanup after sync: @@ -7522,4 +7525,4 @@ - Wrote replacements for strlcpy and mkdtemp - Released 1.0pre1 -$Id: ChangeLog,v 1.1832 2002/02/08 11:06:03 djm Exp $ +$Id: ChangeLog,v 1.1833 2002/02/08 11:06:29 djm Exp $ diff --git a/sftp.c b/sftp.c index c2282b502..160851d7f 100644 --- a/sftp.c +++ b/sftp.c @@ -24,7 +24,7 @@ #include "includes.h" -RCSID("$OpenBSD: sftp.c,v 1.24 2002/02/05 00:00:46 djm Exp $"); +RCSID("$OpenBSD: sftp.c,v 1.25 2002/02/06 14:27:23 mpech Exp $"); /* XXX: short-form remote directory listings (like 'ls -C') */ @@ -92,10 +92,12 @@ connect_to_server(char *path, char **args, int *in, int *out, pid_t *sshpid) static void usage(void) { + extern char *__progname; + fprintf(stderr, - "usage: sftp [-1Cv] [-b batchfile] [-F config] [-o option] [-s subsystem|path]\n" - " [-P direct server path] [-S program] \n" - " [-B buffer_size] [user@]host[:file [file]]\n"); + "usage: %s [-vC1] [-b batchfile] [-o option] [-s subsystem|path] [-B buffer_size]\n" + " [-F config] [-P direct server path] [-S program]\n" + " [user@]host[:file [file]]\n", __progname); exit(1); }