diff options
| author |   Ingo Schwarze <schwarze@openbsd.org> | 2015-11-06 16:30:33 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@openbsd.org> | 2015-11-06 16:30:33 +0000 |
| commit | 3fffa6c6072826f70aebe72863968bffb9d714cc (patch) | |
| tree | 3baa7131a7aebf9cc11c25b444093e25a01efbcc /mandocdb.c | |
| parent | 3e3c69e597d7b127284c4d3fc3acbffb42f51999 (diff) | |
| download | mandoc-3fffa6c6072826f70aebe72863968bffb9d714cc.tar.gz mandoc-3fffa6c6072826f70aebe72863968bffb9d714cc.tar.zst mandoc-3fffa6c6072826f70aebe72863968bffb9d714cc.zip | |
Use getprogname(3) rather than __progname.
Suggested by Joerg@ Sonnenberger (NetBSD).
Last year, deraadt@ confirmed on tech@ that this "has the potential
to be more portable", and micro-optimizing for speed is not relevant
here. Also gets rid of one global variable.
Diffstat (limited to 'mandocdb.c')
| -rw-r--r-- | mandocdb.c | 10 |
1 files changed, 4 insertions, 6 deletions
@@ -1,4 +1,4 @@ -/* $Id: mandocdb.c,v 1.205 2015/10/22 22:06:43 schwarze Exp $ */ +/* $Id: mandocdb.c,v 1.206 2015/11/06 16:30:33 schwarze Exp $ */ /* * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2011-2015 Ingo Schwarze <schwarze@openbsd.org> @@ -183,8 +183,6 @@ static int set_basedir(const char *, int); static int treescan(void); static size_t utf8(unsigned int, char [7]); -extern char *__progname; - static char tempfilename[32]; static int nodb; /* no database changes */ static int mparse_options; /* abort the parse early */ @@ -335,7 +333,7 @@ mandocdb(int argc, char *argv[]) { struct manconf conf; struct mparse *mp; - const char *path_arg; + const char *path_arg, *progname; size_t j, sz; int ch, i; @@ -526,13 +524,13 @@ out: ohash_delete(&mlinks); return exitcode; usage: + progname = getprogname(); fprintf(stderr, "usage: %s [-aDnpQ] [-C file] [-Tutf8]\n" " %s [-aDnpQ] [-Tutf8] dir ...\n" " %s [-DnpQ] [-Tutf8] -d dir [file ...]\n" " %s [-Dnp] -u dir [file ...]\n" " %s [-Q] -t file ...\n", - __progname, __progname, __progname, - __progname, __progname); + progname, progname, progname, progname, progname); return (int)MANDOCLEVEL_BADARG; } |