diff options
| author | Miles Bader <miles@gnu.org> | 1997-02-12 13:21:20 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 1997-02-12 13:21:20 +0000 |
| commit | 02d7a565d974d9d85e37a5592fa33dae7bd783ff (patch) | |
| tree | eba622fff0e04bc834e23237a4f58eb53c1c9a4d | |
| parent | 25c7144ba51c57c415200c7f5f61d8b6815a40df (diff) | |
(__progname, __progname_full):
Decls removed.
(__argp_failure, __argp_error, __argp_state_help):
Use PROGRAM_INVOCATION_NAME instead of __PROGNAME_FULL.
(__argp_error):
Use STATE->name if it's available.
| -rw-r--r-- | libshouldbeinlibc/argp-help.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/libshouldbeinlibc/argp-help.c b/libshouldbeinlibc/argp-help.c index 831bd9d5..a58e4c4b 100644 --- a/libshouldbeinlibc/argp-help.c +++ b/libshouldbeinlibc/argp-help.c @@ -27,8 +27,6 @@ #include <malloc.h> #include <ctype.h> -extern char *__progname, *__progname_full; - #include "argp.h" #include "argp-fmtstream.h" #include "argp-namefrob.h" @@ -1255,7 +1253,7 @@ __argp_state_help (struct argp_state *state, FILE *stream, unsigned flags) flags |= ARGP_HELP_LONG_ONLY; __argp_help (state ? state->argp : 0, stream, flags, - state ? state->name : __progname_full); + state ? state->name : program_invocation_name); if (!state || ! (state->flags & ARGP_NO_EXIT)) { @@ -1284,7 +1282,7 @@ __argp_error (struct argp_state *state, const char *fmt, ...) { va_list ap; - fputs (__progname_full, stream); + fputs (state ? state->name : program_invocation_name, stream); putc (':', stream); putc (' ', stream); @@ -1320,7 +1318,7 @@ __argp_failure (struct argp_state *state, int status, int errnum, if (stream) { - fputs (state ? state->name : __progname_full, stream); + fputs (state ? state->name : program_invocation_name, stream); if (fmt) { |