diff options
| author | Mike Pechkin <mpech@cvs.openbsd.org> | 2001-09-06 13:29:09 +0000 |
|---|---|---|
| committer | Mike Pechkin <mpech@cvs.openbsd.org> | 2001-09-06 13:29:09 +0000 |
| commit | e9adfbcaf16f3287027630e6f8926cbf5195af9f (patch) | |
| tree | b20ad65ef5726147335786dc24cc1d1a00d5c7f3 /bin/cp | |
| parent | 99d09c2c5ce8a0c313c2a485a4a6a8ed24e805c5 (diff) | |
o) __progname aria;
millert@ ok.
Diffstat (limited to 'bin/cp')
| -rw-r--r-- | bin/cp/extern.h | 3 | ||||
| -rw-r--r-- | bin/cp/utils.c | 12 |
2 files changed, 9 insertions, 6 deletions
diff --git a/bin/cp/extern.h b/bin/cp/extern.h index 64de7e4bd86..4c410aca776 100644 --- a/bin/cp/extern.h +++ b/bin/cp/extern.h @@ -1,4 +1,4 @@ -/* $OpenBSD: extern.h,v 1.7 1999/05/06 17:19:46 millert Exp $ */ +/* $OpenBSD: extern.h,v 1.8 2001/09/06 13:29:08 mpech Exp $ */ /* $NetBSD: extern.h,v 1.3 1995/03/21 09:02:16 cgd Exp $ */ /*- @@ -45,6 +45,7 @@ typedef struct { extern PATH_T to; extern uid_t myuid; extern int fflag, iflag, pflag, myumask; +extern char *__progname; #include <sys/cdefs.h> diff --git a/bin/cp/utils.c b/bin/cp/utils.c index 32ee5d4cbac..cf33ef608fc 100644 --- a/bin/cp/utils.c +++ b/bin/cp/utils.c @@ -1,4 +1,4 @@ -/* $OpenBSD: utils.c,v 1.16 2001/06/25 04:35:31 art Exp $ */ +/* $OpenBSD: utils.c,v 1.17 2001/09/06 13:29:08 mpech Exp $ */ /* $NetBSD: utils.c,v 1.6 1997/02/26 14:40:51 cgd Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)utils.c 8.3 (Berkeley) 4/1/94"; #else -static char rcsid[] = "$OpenBSD: utils.c,v 1.16 2001/06/25 04:35:31 art Exp $"; +static char rcsid[] = "$OpenBSD: utils.c,v 1.17 2001/09/06 13:29:08 mpech Exp $"; #endif #endif /* not lint */ @@ -315,8 +315,10 @@ setlink(fs) void usage() { - (void)fprintf(stderr, "%s\n%s\n", - "usage: cp [-R [-H | -L | -P]] [-fip] src target", - " cp [-R [-H | -L | -P]] [-fip] src1 ... srcN directory"); + (void)fprintf(stderr, + "usage: %s [-R [-H | -L | -P]] [-fip] src target\n", __progname); + (void)fprintf(stderr, + " %s [-R [-H | -L | -P]] [-fip] src1 ... srcN directory\n", + __progname); exit(1); } |