From 634a7ab84a128d57a08b5859fe1c170a41acb392 Mon Sep 17 00:00:00 2001 From: Kristaps Dzonsons Date: Sat, 31 Oct 2009 06:17:19 +0000 Subject: Removed non-portable __progname (thanks Joerg Sonnenberger). --- main.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'main.c') diff --git a/main.c b/main.c index 13407409..14d66747 100644 --- a/main.c +++ b/main.c @@ -108,7 +108,7 @@ static struct mdoc *mdoc_init(struct curparse *); __dead static void version(void); __dead static void usage(void); -extern char *__progname; +static const char *progname; int @@ -118,6 +118,12 @@ main(int argc, char *argv[]) struct buf ln, blk; struct curparse curp; + progname = strrchr(argv[0], '/'); + if (progname == NULL) + progname = argv[0]; + else + ++progname; + memset(&curp, 0, sizeof(struct curparse)); curp.inttype = INTT_AUTO; @@ -210,7 +216,7 @@ __dead static void version(void) { - (void)printf("%s %s\n", __progname, VERSION); + (void)printf("%s %s\n", progname, VERSION); exit(EXIT_SUCCESS); } @@ -221,7 +227,7 @@ usage(void) (void)fprintf(stderr, "usage: %s [-V] [-foption...] " "[-mformat] [-Ooption] [-Toutput] " - "[-Werr...]\n", __progname); + "[-Werr...]\n", progname); exit(EXIT_FAILURE); } -- cgit