===================================================================
RCS file: /cvs/mandoc/main.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- mandoc/main.c	2009/10/31 06:10:57	1.53
+++ mandoc/main.c	2009/10/31 06:17:19	1.54
@@ -1,4 +1,4 @@
-/*	$Id: main.c,v 1.53 2009/10/31 06:10:57 kristaps Exp $ */
+/*	$Id: main.c,v 1.54 2009/10/31 06:17:19 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -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);
 }