diff options
| author | markm <markm@FreeBSD.org> | 2002-03-29 22:43:43 +0000 |
|---|---|---|
| committer | markm <markm@FreeBSD.org> | 2002-03-29 22:43:43 +0000 |
| commit | 76fe441a7bf75d73962641b785f158b5cc9dc7f8 (patch) | |
| tree | 4e267e060bfb6d96f46ab0d79c49b277402c0dd0 /lib/libncp/ncpl_subr.c | |
| parent | 6085f75ded37ec415ded7d6373ecd09bcb088ac4 (diff) | |
| download | FreeBSD-src-76fe441a7bf75d73962641b785f158b5cc9dc7f8.zip FreeBSD-src-76fe441a7bf75d73962641b785f158b5cc9dc7f8.tar.gz | |
Do not use __progname directly (except in [gs]etprogname(3)).
Also, make an internal _getprogname() that is used only inside
libc. For libc, getprogname(3) is a weak symbol in case a
function of the same name is defined in userland.
Diffstat (limited to 'lib/libncp/ncpl_subr.c')
| -rw-r--r-- | lib/libncp/ncpl_subr.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/lib/libncp/ncpl_subr.c b/lib/libncp/ncpl_subr.c index f516ece..ed70eb8 100644 --- a/lib/libncp/ncpl_subr.c +++ b/lib/libncp/ncpl_subr.c @@ -51,8 +51,6 @@ __FBSDID("$FreeBSD$"); /*#include <netncp/ncp_cfg.h>*/ #include "ncp_mod.h" -extern char *__progname; - int sysentoffset; void @@ -309,7 +307,7 @@ ncp_getopt(nargc, nargv, ostr) ++ncp_optind; if (ncp_opterr && *ostr != ':') (void)fprintf(stderr, - "%s: illegal option -- %c\n", __progname, ncp_optopt); + "%s: illegal option -- %c\n", _getprogname(), ncp_optopt); return (BADCH); } if (*++oli != ':') { /* don't need argument */ @@ -327,7 +325,7 @@ ncp_getopt(nargc, nargv, ostr) if (ncp_opterr) (void)fprintf(stderr, "%s: option requires an argument -- %c\n", - __progname, ncp_optopt); + _getprogname(), ncp_optopt); return (BADCH); } else /* white space */ @@ -439,7 +437,7 @@ void ncp_error(const char *fmt, int error, ...) { va_list ap; - fprintf(stderr, "%s: ", __progname); + fprintf(stderr, "%s: ", _getprogname()); va_start(ap, error); vfprintf(stderr, fmt, ap); va_end(ap); |
