convert to use getprogname()

diff --git a/arithmetic/arithmetic.c b/arithmetic/arithmetic.c
index 03e00106a9e1081fa59a5ed4ecb7768256e1c0a5..45a7109e68dcc7411e105a527b4100e20ea5dbce 100644 (file)
--- a/arithmetic/arithmetic.c
+++ b/arithmetic/arithmetic.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: arithmetic.c,v 1.16 2001/02/05 00:20:58 christos Exp $ */
+/*     $NetBSD: arithmetic.c,v 1.17 2001/02/19 22:41:45 cgd Exp $      */
 
 /*
  * Copyright (c) 1989, 1993
@@ -46,7 +46,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 1993\n\
 #if 0
 static char sccsid[] = "@(#)arithmetic.c       8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: arithmetic.c,v 1.16 2001/02/05 00:20:58 christos Exp $");
+__RCSID("$NetBSD: arithmetic.c,v 1.17 2001/02/19 22:41:45 cgd Exp $");
 #endif
 #endif /* not lint */
 
@@ -106,8 +106,6 @@ int nright, nwrong;
 time_t qtime;
 #define        NQUESTS 20
 
-extern char *__progname;       /* from crt0.o */
-
 /*
  * Select keys from +-x/ to be asked addition, subtraction, multiplication,
  * and division problems.  More than one key may be given.  The default is
@@ -389,6 +387,6 @@ void
 usage()
 {
        (void)fprintf(stderr, "Usage: %s [-o +-x/] [-r range]\n",
-               __progname);
+               getprogname());
        exit(1);
 }

diff --git a/fortune/fortune/fortune.c b/fortune/fortune/fortune.c
index 5a383bc158814ba08235f829fee335fd96ef83a5..0593b0c7e3e8fb786791d86edb7ea21e35c68af9 100644 (file)
--- a/fortune/fortune/fortune.c
+++ b/fortune/fortune/fortune.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: fortune.c,v 1.26 2001/02/05 00:29:44 christos Exp $    */
+/*     $NetBSD: fortune.c,v 1.27 2001/02/19 22:41:45 cgd Exp $ */
 
 /*-
  * Copyright (c) 1986, 1993
@@ -46,7 +46,7 @@ __COPYRIGHT("@(#) Copyright (c) 1986, 1993\n\
 #if 0
 static char sccsid[] = "@(#)fortune.c  8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: fortune.c,v 1.26 2001/02/05 00:29:44 christos Exp $");
+__RCSID("$NetBSD: fortune.c,v 1.27 2001/02/19 22:41:45 cgd Exp $");
 #endif
 #endif /* not lint */
 
@@ -206,8 +206,6 @@ regex_t *Re_pat = NULL;
 #define                NAMLEN(d)       ((d)->d_namlen)
 #endif
 
-extern char *__progname;
-
 int
 main(ac, av)
        int     ac;
@@ -1357,7 +1355,8 @@ matches_in_list(list)
 void
 usage()
 {
-       (void) fprintf(stderr, "Usage: %s [-a", __progname);
+
+       (void) fprintf(stderr, "Usage: %s [-a", getprogname());
 #ifdef DEBUG
        (void) fprintf(stderr, "D");
 #endif /* DEBUG */