Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

convert to use getprogname()

This commit is contained in:
cgd 2001-02-19 23:22:40 +00:00
parent a8ec668ddf
commit 25bdbb661e
55 changed files with 201 additions and 264 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
usr.sbin/ac/ac.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ac.c,v 1.13 2000/10/15 13:34:20 bjh21 Exp $ */
/* $NetBSD: ac.c,v 1.14 2001/02/19 23:22:40 cgd Exp $ */
/*
* Copyright (c) 1994 Christopher G. Demetriou
@ -49,7 +49,7 @@
#include <sys/cdefs.h>
#ifndef lint
__RCSID("$NetBSD: ac.c,v 1.13 2000/10/15 13:34:20 bjh21 Exp $");
__RCSID("$NetBSD: ac.c,v 1.14 2001/02/19 23:22:40 cgd Exp $");
#endif
#include <sys/types.h>
@ -600,9 +600,9 @@ ac(fp)
static void
usage()
{
extern char *__progname;
(void)fprintf(stderr,
"Usage: %s [-d | -p] [-t tty] [-w wtmp] [users ...]\n", __progname);
"Usage: %s [-d | -p] [-t tty] [-w wtmp] [users ...]\n",
getprogname());
exit(1);
}

7
usr.sbin/accton/accton.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: accton.c,v 1.7 1997/10/18 07:26:45 lukem Exp $ */
/* $NetBSD: accton.c,v 1.8 2001/02/19 23:22:41 cgd Exp $ */
/*
* Copyright (c) 1988, 1993
@ -43,7 +43,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 1993\n\
#if 0
static char sccsid[] = "@(#)accton.c 8.1 (Berkeley) 6/6/93";
#else
__RCSID("$NetBSD: accton.c,v 1.7 1997/10/18 07:26:45 lukem Exp $");
__RCSID("$NetBSD: accton.c,v 1.8 2001/02/19 23:22:41 cgd Exp $");
#endif
#endif /* not lint */
@ -92,8 +92,7 @@ main(argc, argv)
void
usage()
{
extern char *__progname;
(void)fprintf(stderr, "usage: %s [file]\n", __progname);
(void)fprintf(stderr, "usage: %s [file]\n", getprogname());
exit(1);
}

10
usr.sbin/apm/apm.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: apm.c,v 1.8 1999/01/15 00:29:02 augustss Exp $ */
/* $NetBSD: apm.c,v 1.9 2001/02/19 23:22:41 cgd Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@ -57,8 +57,6 @@
#define FALSE 0
#define TRUE 1
extern char *__progname;
void usage(void);
void zzusage(void);
int do_zzz(const char *pn, enum apm_action action);
@ -71,7 +69,7 @@ void
usage(void)
{
fprintf(stderr,"usage: %s [-v] [-z | -S] [-slmba] [-f socket]\n",
__progname);
getprogname());
exit(1);
}
@ -79,7 +77,7 @@ void
zzusage(void)
{
fprintf(stderr,"usage: %s [-z | -S] [-f socket]\n",
__progname);
getprogname());
exit(1);
}
@ -225,7 +223,7 @@ main(int argc, char *argv[])
usage();
}
if (!strcmp(__progname, "zzz")) {
if (!strcmp(getprogname(), "zzz")) {
exit(do_zzz(sockname, action));
}

6
usr.sbin/apmd/apmd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: apmd.c,v 1.17 2001/01/25 00:48:59 chuck Exp $ */
/* $NetBSD: apmd.c,v 1.18 2001/02/19 23:22:42 cgd Exp $ */
/*-
* Copyright (c) 1996, 2000 The NetBSD Foundation, Inc.
@ -72,8 +72,6 @@ const char sockfile[] = _PATH_APM_SOCKET;
static int debug = 0;
static int verbose = 0;
extern char *__progname;
void usage (void);
int power_status (int fd, int force, struct apm_power_info *pinfo);
int bind_socket (const char *sn, mode_t mode, uid_t uid, gid_t gid);
@ -95,7 +93,7 @@ sigexit(int signo)
void
usage(void)
{
fprintf(stderr,"usage: %s [-adlqsv] [-t seconds] [-S sockname]\n\t[-m sockmode] [-o sockowner:sockgroup] [-f devname]\n", __progname);
fprintf(stderr,"usage: %s [-adlqsv] [-t seconds] [-S sockname]\n\t[-m sockmode] [-o sockowner:sockgroup] [-f devname]\n", getprogname());
exit(1);
}

17
usr.sbin/arp/arp.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: arp.c,v 1.27 2001/01/05 19:34:13 christos Exp $ */
/* $NetBSD: arp.c,v 1.28 2001/02/19 23:22:42 cgd Exp $ */
/*
* Copyright (c) 1984, 1993
@ -46,7 +46,7 @@ __COPYRIGHT("@(#) Copyright (c) 1984, 1993\n\
#if 0
static char sccsid[] = "@(#)arp.c 8.3 (Berkeley) 4/28/95";
#else
__RCSID("$NetBSD: arp.c,v 1.27 2001/01/05 19:34:13 christos Exp $");
__RCSID("$NetBSD: arp.c,v 1.28 2001/02/19 23:22:42 cgd Exp $");
#endif
#endif /* not lint */
@ -99,8 +99,6 @@ static int pid;
static int nflag, vflag;
static int s = -1;
extern char *__progname;
int
main(argc, argv)
int argc;
@ -499,13 +497,14 @@ atosdl(s, sdl)
void
usage()
{
const char *progname = getprogname();
(void)fprintf(stderr, "usage: %s [-n] hostname\n", __progname);
(void)fprintf(stderr, "usage: %s [-n] -a\n", __progname);
(void)fprintf(stderr, "usage: %s -d hostname\n", __progname);
(void)fprintf(stderr, "usage: %s [-n] hostname\n", progname);
(void)fprintf(stderr, "usage: %s [-n] -a\n", progname);
(void)fprintf(stderr, "usage: %s -d hostname\n", progname);
(void)fprintf(stderr,
"usage: %s -s hostname ether_addr [temp] [pub]\n", __progname);
(void)fprintf(stderr, "usage: %s -f filename\n", __progname);
"usage: %s -s hostname ether_addr [temp] [pub]\n", progname);
(void)fprintf(stderr, "usage: %s -f filename\n", progname);
exit(1);
}

5
usr.sbin/chrtbl/chrtbl.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: chrtbl.c,v 1.4 1998/02/03 04:39:14 perry Exp $ */
/* $NetBSD: chrtbl.c,v 1.5 2001/02/19 23:22:42 cgd Exp $ */
/*
* Copyright (c) 1997 Christos Zoulas. All rights reserved.
@ -92,10 +92,9 @@ static const struct toklist {
static void
usage()
{
extern char *__progname;
(void) fprintf(stderr, "Usage: %s [-o <filename>] <description>\n",
__progname);
getprogname());
exit(1);
}

11
usr.sbin/eeprom/main.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: main.c,v 1.14 2001/01/29 03:11:50 jmc Exp $ */
/* $NetBSD: main.c,v 1.15 2001/02/19 23:22:42 cgd Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@ -40,13 +40,14 @@
#ifndef lint
__COPYRIGHT(
"@(#) Copyright (c) 1996 The NetBSD Foundation, Inc. All rights reserved.");
__RCSID("$NetBSD: main.c,v 1.14 2001/01/29 03:11:50 jmc Exp $");
__RCSID("$NetBSD: main.c,v 1.15 2001/02/19 23:22:42 cgd Exp $");
#endif
#include <sys/param.h>
#include <err.h>
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
#include <machine/eeprom.h>
@ -82,8 +83,6 @@ int verbose = 0;
int use_openprom;
#endif
extern char *__progname;
int
main(argc, argv)
int argc;
@ -219,10 +218,10 @@ usage()
{
#ifdef USE_OPENPROM
fprintf(stderr, "usage: %s %s\n", __progname,
fprintf(stderr, "usage: %s %s\n", getprogname(),
"[-] [-c] [-f device] [-i] [-v] [field[=value] ...]");
#else
fprintf(stderr, "usage: %s %s\n", __progname,
fprintf(stderr, "usage: %s %s\n", getprogname(),
"[-] [-c] [-f device] [-i] [field[=value] ...]");
#endif /* __us */
exit(1);

8
usr.sbin/envstat/envstat.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: envstat.c,v 1.4 2000/07/02 00:55:47 augustss Exp $ */
/* $NetBSD: envstat.c,v 1.5 2001/02/19 23:22:43 cgd Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@ -38,7 +38,7 @@
#include <sys/cdefs.h>
#ifndef lint
__RCSID("$NetBSD: envstat.c,v 1.4 2000/07/02 00:55:47 augustss Exp $");
__RCSID("$NetBSD: envstat.c,v 1.5 2001/02/19 23:22:43 cgd Exp $");
#endif
#include <fcntl.h>
@ -51,7 +51,6 @@ __RCSID("$NetBSD: envstat.c,v 1.4 2000/07/02 00:55:47 augustss Exp $");
#include <sys/envsys.h>
#include <sys/ioctl.h>
extern char *__progname;
const char E_CANTENUM[] = "cannot enumerate sensors";
#define _PATH_SYSMON "/dev/sysmon"
@ -280,7 +279,8 @@ values(width, celsius, etds, cetds, ns)
void
usage()
{
fprintf(stderr, "usage: %s [-c] [-s s1,s2,...]", __progname);
fprintf(stderr, "usage: %s [-c] [-s s1,s2,...]", getprogname());
fprintf(stderr, " [-i interval] [-n headrep] [-w width] [device]\n");
fprintf(stderr, " envstat -l [device]\n");
exit(1);

8
usr.sbin/grfinfo/grfinfo.c
View File

@ -19,12 +19,12 @@
* improvements that they make and grant CSS redistribution rights.
*
* from: Utah $Hdr: grfinfo.c 1.3 94/04/04$
* $NetBSD: grfinfo.c,v 1.7 1997/11/01 06:54:11 lukem Exp $
* $NetBSD: grfinfo.c,v 1.8 2001/02/19 23:22:43 cgd Exp $
*/
#include <sys/cdefs.h>
#ifndef lint
__RCSID("$NetBSD: grfinfo.c,v 1.7 1997/11/01 06:54:11 lukem Exp $");
__RCSID("$NetBSD: grfinfo.c,v 1.8 2001/02/19 23:22:43 cgd Exp $");
#endif
#include <sys/types.h>
@ -32,6 +32,7 @@ __RCSID("$NetBSD: grfinfo.c,v 1.7 1997/11/01 06:54:11 lukem Exp $");
#include <dev/grfioctl.h>
#include <fcntl.h>
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
int aflg = 0;
@ -147,8 +148,7 @@ tname()
void
usage()
{
extern char *__progname; /* from crt0.o */
fprintf(stderr, "usage: %s [-at] device\n", __progname);
fprintf(stderr, "usage: %s [-at] device\n", getprogname());
exit(1);
}

8
usr.sbin/hilinfo/hilinfo.c
View File

@ -19,12 +19,12 @@
* improvements that they make and grant CSS redistribution rights.
*
* from: Utah $Hdr: hilinfo.c 1.3 94/04/04$
* $NetBSD: hilinfo.c,v 1.3 1999/01/11 22:40:01 kleink Exp $
* $NetBSD: hilinfo.c,v 1.4 2001/02/19 23:22:43 cgd Exp $
*/
#include <sys/cdefs.h>
#ifndef lint
__RCSID("$NetBSD: hilinfo.c,v 1.3 1999/01/11 22:40:01 kleink Exp $");
__RCSID("$NetBSD: hilinfo.c,v 1.4 2001/02/19 23:22:43 cgd Exp $");
#endif
#include <sys/types.h>
@ -33,6 +33,7 @@ __RCSID("$NetBSD: hilinfo.c,v 1.3 1999/01/11 22:40:01 kleink Exp $");
#include <errno.h>
#include <fcntl.h>
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
int aflg = 0;
@ -155,8 +156,7 @@ tname()
void
usage()
{
extern char *__progname; /* from crt0.o */
fprintf(stderr, "usage: %s [-at] device\n", __progname);
fprintf(stderr, "usage: %s [-at] device\n", getprogname());
exit(1);
}

9
usr.sbin/inetd/inetd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: inetd.c,v 1.72 2001/01/11 01:36:40 lukem Exp $ */
/* $NetBSD: inetd.c,v 1.73 2001/02/19 23:22:43 cgd Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -77,7 +77,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 1991, 1993, 1994\n\
#if 0
static char sccsid[] = "@(#)inetd.c 8.4 (Berkeley) 4/13/94";
#else
__RCSID("$NetBSD: inetd.c,v 1.72 2001/01/11 01:36:40 lukem Exp $");
__RCSID("$NetBSD: inetd.c,v 1.73 2001/02/19 23:22:43 cgd Exp $");
#endif
#endif /* not lint */
@ -433,7 +433,6 @@ u_int16_t bad_ports[] = { 7, 9, 13, 19, 37, 0};
char *CONFIG = _PATH_INETDCONF;
char **Argv;
char *LastArg;
extern char *__progname;
int
main(argc, argv, envp)
@ -2108,9 +2107,9 @@ usage()
{
#ifdef LIBWRAP
(void)fprintf(stderr, "usage: %s [-dl] [conf]\n", __progname);
(void)fprintf(stderr, "usage: %s [-dl] [conf]\n", getprogname());
#else
(void)fprintf(stderr, "usage: %s [-d] [conf]\n", __progname);
(void)fprintf(stderr, "usage: %s [-d] [conf]\n", getprogname());
#endif
exit(1);
}

7
usr.sbin/lastlogin/lastlogin.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: lastlogin.c,v 1.5 2000/07/04 20:27:37 matt Exp $ */
/* $NetBSD: lastlogin.c,v 1.6 2001/02/19 23:22:44 cgd Exp $ */
/*
* Copyright (c) 1996 John M. Vinopal
* All rights reserved.
@ -33,7 +33,7 @@
#include <sys/cdefs.h>
#ifndef lint
__RCSID("$NetBSD: lastlogin.c,v 1.5 2000/07/04 20:27:37 matt Exp $");
__RCSID("$NetBSD: lastlogin.c,v 1.6 2001/02/19 23:22:44 cgd Exp $");
#endif
#include <sys/types.h>
@ -46,7 +46,6 @@ __RCSID("$NetBSD: lastlogin.c,v 1.5 2000/07/04 20:27:37 matt Exp $");
#include <utmp.h>
#include <unistd.h>
extern char *__progname;
static char *logfile = _PATH_LASTLOG;
int main __P((int, char **));
@ -129,6 +128,6 @@ output(p, l)
static void
usage()
{
fprintf(stderr, "usage: %s [user ...]\n", __progname);
fprintf(stderr, "usage: %s [user ...]\n", getprogname());
exit(1);
}

7
usr.sbin/lpr/lpd/lpd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: lpd.c,v 1.26 2001/02/02 14:20:33 itojun Exp $ */
/* $NetBSD: lpd.c,v 1.27 2001/02/19 23:22:44 cgd Exp $ */
/*
* Copyright (c) 1983, 1993, 1994
@ -45,7 +45,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 1993, 1994\n\
#if 0
static char sccsid[] = "@(#)lpd.c 8.7 (Berkeley) 5/10/95";
#else
__RCSID("$NetBSD: lpd.c,v 1.26 2001/02/02 14:20:33 itojun Exp $");
__RCSID("$NetBSD: lpd.c,v 1.27 2001/02/19 23:22:44 cgd Exp $");
#endif
#endif /* not lint */
@ -685,10 +685,9 @@ again:
static void
usage()
{
extern char *__progname; /* XXX */
fprintf(stderr, "usage: %s [-dlrs] [-b bind-address] [-n maxchild] [-w maxwait] [port]\n",
__progname);
getprogname());
exit(1);
}

6
usr.sbin/mailwrapper/mailwrapper.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: mailwrapper.c,v 1.4 2000/11/16 08:33:33 msaitoh Exp $ */
/* $NetBSD: mailwrapper.c,v 1.5 2001/02/19 23:22:44 cgd Exp $ */
/*
* Copyright (c) 1998
@ -50,8 +50,6 @@ int main __P((int, char *[], char *[]));
static void initarg __P((struct arglist *));
static void addarg __P((struct arglist *, const char *, int));
extern const char *__progname; /* from crt0.o */
static void
initarg(al)
struct arglist *al;
@ -125,7 +123,7 @@ main(argc, argv, envp)
if ((to = strsep(&cp, WS)) == NULL)
goto parse_error;
if (strcmp(from, __progname) == 0) {
if (strcmp(from, getprogname()) == 0) {
for (ap = strsep(&cp, WS); ap != NULL;
ap = strsep(&cp, WS))
if (*ap)

7
usr.sbin/mdsetimage/mdsetimage.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: mdsetimage.c,v 1.11 2001/01/05 03:27:27 lukem Exp $ */
/* $NetBSD: mdsetimage.c,v 1.12 2001/02/19 23:22:44 cgd Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou
@ -42,7 +42,7 @@ __COPYRIGHT(
#endif /* not lint */
#ifndef lint
__RCSID("$NetBSD: mdsetimage.c,v 1.11 2001/01/05 03:27:27 lukem Exp $");
__RCSID("$NetBSD: mdsetimage.c,v 1.12 2001/02/19 23:22:44 cgd Exp $");
#endif /* not lint */
#include <sys/types.h>
@ -178,9 +178,8 @@ main(argc, argv)
static void
usage()
{
extern const char *__progname;
fprintf(stderr, "usage: %s kernel_file fsimage_file\n", __progname);
fprintf(stderr, "usage: %s kernel_file fsimage_file\n", getprogname());
exit(1);
}

9
usr.sbin/mopd/mopa.out/mopa.out.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: mopa.out.c,v 1.6 2000/05/20 10:58:05 ragge Exp $ */
/* $NetBSD: mopa.out.c,v 1.7 2001/02/19 23:22:44 cgd Exp $ */
/* mopa.out - Convert a Unix format kernel into something that
* can be transfered via MOP.
@ -49,7 +49,7 @@
#include <sys/cdefs.h>
#ifndef lint
__RCSID("$NetBSD: mopa.out.c,v 1.6 2000/05/20 10:58:05 ragge Exp $");
__RCSID("$NetBSD: mopa.out.c,v 1.7 2001/02/19 23:22:44 cgd Exp $");
#endif
#include "os.h"
@ -80,14 +80,13 @@ main (int argc, char **argv)
int i;
struct dllist dl;
extern char *__progname; /* from crt0.o */
#ifdef NOAOUT
errx(1, "has no function in NetBSD");
#endif
if (argc != 3) {
fprintf (stderr, "usage: %s kernel-in sys-out\n", __progname);
fprintf (stderr, "usage: %s kernel-in sys-out\n",
getprogname());
return (1);
}

9
usr.sbin/mopd/mopchk/mopchk.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: mopchk.c,v 1.7 2001/01/11 01:42:50 lukem Exp $ */
/* $NetBSD: mopchk.c,v 1.8 2001/02/19 23:22:45 cgd Exp $ */
/*
* Copyright (c) 1995-96 Mats O Jansson. All rights reserved.
@ -31,7 +31,7 @@
#include <sys/cdefs.h>
#ifndef lint
__RCSID("$NetBSD: mopchk.c,v 1.7 2001/01/11 01:42:50 lukem Exp $");
__RCSID("$NetBSD: mopchk.c,v 1.8 2001/02/19 23:22:45 cgd Exp $");
#endif
/*
@ -61,7 +61,6 @@ int AllFlag = 0; /* listen on "all" interfaces */
int VersionFlag = 0; /* Show version */
int promisc = 0; /* promisc mode not needed */
extern char *__progname; /* from crt0.o */
extern char version[];
int
@ -93,7 +92,7 @@ main(argc, argv)
}
if (VersionFlag)
printf("%s: Version %s\n", __progname, version);
printf("%s: Version %s\n", getprogname(), version);
if (AllFlag) {
if (VersionFlag)
@ -151,7 +150,7 @@ void
Usage()
{
(void) fprintf(stderr, "usage: %s [-a] [-v] [filename...]\n",
__progname);
getprogname());
exit(1);
}

16
usr.sbin/mopd/mopd/mopd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: mopd.c,v 1.7 2001/01/11 01:42:50 lukem Exp $ */
/* $NetBSD: mopd.c,v 1.8 2001/02/19 23:22:45 cgd Exp $ */
/*
* Copyright (c) 1993-96 Mats O Jansson. All rights reserved.
@ -31,7 +31,7 @@
#include <sys/cdefs.h>
#ifndef lint
__RCSID("$NetBSD: mopd.c,v 1.7 2001/01/11 01:42:50 lukem Exp $");
__RCSID("$NetBSD: mopd.c,v 1.8 2001/02/19 23:22:45 cgd Exp $");
#endif
/*
@ -73,8 +73,6 @@ int Not3Flag = 0; /* Not MOP V3 messages. */
int Not4Flag = 0; /* Not MOP V4 messages. */
int promisc = 1; /* Need promisc mode */
extern char *__progname; /* from crt0.o */
int
main(argc, argv)
int argc;
@ -111,7 +109,7 @@ main(argc, argv)
}
if (VersionFlag) {
fprintf(stdout,"%s: version %s\n", __progname, version);
fprintf(stdout,"%s: version %s\n", getprogname(), version);
exit(0);
}
@ -128,7 +126,7 @@ main(argc, argv)
if ((!ForegroundFlag) && DebugFlag)
fprintf(stdout,
"%s: not running as daemon, -d given.\n", __progname);
"%s: not running as daemon, -d given.\n", getprogname());
if ((!ForegroundFlag) && (!DebugFlag)) {
pid = fork();
@ -146,7 +144,7 @@ main(argc, argv)
pidfile(NULL);
}
syslog(LOG_INFO, "%s %s started.", __progname, version);
syslog(LOG_INFO, "%s %s started.", getprogname(), version);
if (AllFlag)
deviceInitAll();
@ -162,9 +160,9 @@ void
Usage()
{
(void) fprintf(stderr, "usage: %s -a [ -d -f -v ] [ -3 | -4 ]\n",
__progname);
getprogname());
(void) fprintf(stderr, " %s [ -d -f -v ] [ -3 | -4 ] interface\n",
__progname);
getprogname());
exit(1);
}

11
usr.sbin/mopd/mopprobe/mopprobe.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: mopprobe.c,v 1.6 2001/01/11 01:42:50 lukem Exp $ */
/* $NetBSD: mopprobe.c,v 1.7 2001/02/19 23:22:45 cgd Exp $ */
/*
* Copyright (c) 1993-96 Mats O Jansson. All rights reserved.
@ -31,7 +31,7 @@
#include <sys/cdefs.h>
#ifndef lint
__RCSID("$NetBSD: mopprobe.c,v 1.6 2001/01/11 01:42:50 lukem Exp $");
__RCSID("$NetBSD: mopprobe.c,v 1.7 2001/02/19 23:22:45 cgd Exp $");
#endif
/*
@ -68,8 +68,6 @@ int Not4Flag = 0; /* Not MOP V4 messages */
int oflag = 0; /* print only once */
int promisc = 1; /* Need promisc mode */
extern char *__progname; /* from crt0.o */
int
main(argc, argv)
int argc;
@ -125,8 +123,9 @@ main(argc, argv)
void
Usage()
{
(void) fprintf(stderr, "usage: %s -a [ -3 | -4 ]\n", __progname);
(void) fprintf(stderr, " %s [ -3 | -4 ] interface\n", __progname);
(void) fprintf(stderr, "usage: %s -a [ -3 | -4 ]\n", getprogname());
(void) fprintf(stderr, " %s [ -3 | -4 ] interface\n",
getprogname());
exit(1);
}

11
usr.sbin/mopd/moptrace/moptrace.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: moptrace.c,v 1.6 2001/01/11 01:42:50 lukem Exp $ */
/* $NetBSD: moptrace.c,v 1.7 2001/02/19 23:22:45 cgd Exp $ */
/*
* Copyright (c) 1993-95 Mats O Jansson. All rights reserved.
@ -31,7 +31,7 @@
#include <sys/cdefs.h>
#ifndef lint
__RCSID("$NetBSD: moptrace.c,v 1.6 2001/01/11 01:42:50 lukem Exp $");
__RCSID("$NetBSD: moptrace.c,v 1.7 2001/02/19 23:22:45 cgd Exp $");
#endif
/*
@ -67,8 +67,6 @@ int Not3Flag = 0; /* Ignore MOP V3 messages */
int Not4Flag = 0; /* Ignore MOP V4 messages */
int promisc = 1; /* Need promisc mode */
extern char *__progname; /* from crt0.o */
int
main(argc, argv)
int argc;
@ -121,9 +119,10 @@ main(argc, argv)
void
Usage()
{
(void) fprintf(stderr, "usage: %s -a [ -d ] [ -3 | -4 ]\n", __progname);
(void) fprintf(stderr, "usage: %s -a [ -d ] [ -3 | -4 ]\n",
getprogname());
(void) fprintf(stderr, " %s [ -d ] [ -3 | -4 ] interface\n",
__progname);
getprogname());
exit(1);
}

8
usr.sbin/netgroup_mkdb/netgroup_mkdb.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: netgroup_mkdb.c,v 1.10 2000/07/07 15:11:46 itojun Exp $ */
/* $NetBSD: netgroup_mkdb.c,v 1.11 2001/02/19 23:22:45 cgd Exp $ */
/*
* Copyright (c) 1994 Christos Zoulas
@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
#ifndef lint
__RCSID("$NetBSD: netgroup_mkdb.c,v 1.10 2000/07/07 15:11:46 itojun Exp $");
__RCSID("$NetBSD: netgroup_mkdb.c,v 1.11 2001/02/19 23:22:45 cgd Exp $");
#endif
#include <sys/types.h>
@ -732,7 +732,7 @@ ng_rwrite(odb, idb, k)
static void
usage()
{
extern const char *__progname;
fprintf(stderr, "usage: %s [-o db] file\n", __progname);
fprintf(stderr, "usage: %s [-o db] file\n", getprogname());
exit(1);
}

8
usr.sbin/pkg_install/admin/main.c
View File

@ -1,8 +1,8 @@
/* $NetBSD: main.c,v 1.18 2001/01/10 22:53:22 jdolecek Exp $ */
/* $NetBSD: main.c,v 1.19 2001/02/19 23:22:46 cgd Exp $ */
#include <sys/cdefs.h>
#ifndef lint
__RCSID("$NetBSD: main.c,v 1.18 2001/01/10 22:53:22 jdolecek Exp $");
__RCSID("$NetBSD: main.c,v 1.19 2001/02/19 23:22:46 cgd Exp $");
#endif
/*
@ -49,8 +49,6 @@ __RCSID("$NetBSD: main.c,v 1.18 2001/01/10 22:53:22 jdolecek Exp $");
void usage(void);
extern const char *__progname; /* from crt0.o */
int filecnt;
int pkgcnt;
@ -560,7 +558,7 @@ usage(void)
" delete key - delete reference to key\n"
#endif
" dump - dump database\n"
,__progname);
, getprogname());
exit(1);
}

10
usr.sbin/quotacheck/quotacheck.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: quotacheck.c,v 1.20 1999/03/30 23:56:26 abs Exp $ */
/* $NetBSD: quotacheck.c,v 1.21 2001/02/19 23:22:46 cgd Exp $ */
/*
* Copyright (c) 1980, 1990, 1993
@ -46,7 +46,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1990, 1993\n\
#if 0
static char sccsid[] = "@(#)quotacheck.c 8.6 (Berkeley) 4/28/95";
#else
__RCSID("$NetBSD: quotacheck.c,v 1.20 1999/03/30 23:56:26 abs Exp $");
__RCSID("$NetBSD: quotacheck.c,v 1.21 2001/02/19 23:22:46 cgd Exp $");
#endif
#endif /* not lint */
@ -232,10 +232,10 @@ main(argc, argv)
static void
usage()
{
extern char *__progname;
(void)fprintf(stderr,
"Usage:\t%s -a [-guv]\n\t%s [-guv] filesys ...\n", __progname,
__progname);
"Usage:\t%s -a [-guv]\n\t%s [-guv] filesys ...\n", getprogname(),
getprogname());
exit(1);
}

16
usr.sbin/quotaon/quotaon.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: quotaon.c,v 1.15 2000/07/07 15:11:46 itojun Exp $ */
/* $NetBSD: quotaon.c,v 1.16 2001/02/19 23:22:46 cgd Exp $ */
/*
* Copyright (c) 1980, 1990, 1993
@ -46,7 +46,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1990, 1993\n\
#if 0
static char sccsid[] = "@(#)quotaon.c 8.1 (Berkeley) 6/6/93";
#else
__RCSID("$NetBSD: quotaon.c,v 1.15 2000/07/07 15:11:46 itojun Exp $");
__RCSID("$NetBSD: quotaon.c,v 1.16 2001/02/19 23:22:46 cgd Exp $");
#endif
#endif /* not lint */
@ -73,8 +73,6 @@ int gflag; /* operate on group quotas */
int uflag; /* operate on user quotas */
int vflag; /* verbose */
extern char *__progname;
int main __P((int, char *[]));
static void usage __P((void));
@ -94,9 +92,9 @@ main(argc, argv)
int i, offmode = 0, errs = 0;
int ch;
if (strcmp(__progname, "quotaoff") == 0)
if (strcmp(getprogname(), "quotaoff") == 0)
offmode++;
else if (strcmp(__progname, "quotaon") != 0)
else if (strcmp(getprogname(), "quotaon") != 0)
errx(1, "Name must be quotaon or quotaoff\n");
while ((ch = getopt(argc, argv, "avug")) != -1) {
@ -160,8 +158,10 @@ static void
usage()
{
(void) fprintf(stderr, "Usage:\n\t%s [-g] [-u] [-v] -a\n", __progname);
(void) fprintf(stderr, "\t%s [-g] [-u] [-v] filesys ...\n", __progname);
(void) fprintf(stderr, "Usage:\n\t%s [-g] [-u] [-v] -a\n",
getprogname());
(void) fprintf(stderr, "\t%s [-g] [-u] [-v] filesys ...\n",
getprogname());
exit(1);
}

6
usr.sbin/rbootd/rbootd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: rbootd.c,v 1.13 2001/01/16 02:36:29 cgd Exp $ */
/* $NetBSD: rbootd.c,v 1.14 2001/02/19 23:22:46 cgd Exp $ */
/*
* Copyright (c) 1988, 1992 The University of Utah and the Center
@ -57,7 +57,7 @@ __COPYRIGHT(
#if 0
static char sccsid[] = "@(#)rbootd.c 8.1 (Berkeley) 6/4/93";
#else
__RCSID("$NetBSD: rbootd.c,v 1.13 2001/01/16 02:36:29 cgd Exp $");
__RCSID("$NetBSD: rbootd.c,v 1.14 2001/02/19 23:22:46 cgd Exp $");
#endif
#endif /* not lint */
@ -78,8 +78,6 @@ __RCSID("$NetBSD: rbootd.c,v 1.13 2001/01/16 02:36:29 cgd Exp $");
int main __P((int, char *[]));
extern char *__progname; /* from crt0.o */
int
main(argc, argv)
int argc;

11
usr.sbin/rdate/rdate.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: rdate.c,v 1.11 2000/07/07 15:11:47 itojun Exp $ */
/* $NetBSD: rdate.c,v 1.12 2001/02/19 23:22:47 cgd Exp $ */
/*
* Copyright (c) 1994 Christos Zoulas
@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
#ifndef lint
__RCSID("$NetBSD: rdate.c,v 1.11 2000/07/07 15:11:47 itojun Exp $");
__RCSID("$NetBSD: rdate.c,v 1.12 2001/02/19 23:22:47 cgd Exp $");
#endif/* lint */
#include <sys/types.h>
@ -52,6 +52,7 @@ __RCSID("$NetBSD: rdate.c,v 1.11 2000/07/07 15:11:47 itojun Exp $");
#include <err.h>
#include <netdb.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <util.h>
@ -63,15 +64,13 @@ __RCSID("$NetBSD: rdate.c,v 1.11 2000/07/07 15:11:47 itojun Exp $");
#define DIFFERENCE 2208988800
#endif
extern char *__progname;
int main __P((int, char **));
static void usage __P((void));
static void
usage()
{
(void) fprintf(stderr, "Usage: %s [-psa] host\n", __progname);
(void) fprintf(stderr, "Usage: %s [-psa] host\n", getprogname());
(void) fprintf(stderr, " -p: just print, don't set\n");
(void) fprintf(stderr, " -s: just set, don't print\n");
(void) fprintf(stderr, " -a: use adjtime instead of instant change\n");
@ -175,7 +174,7 @@ main(argc, argv)
if (slidetime)
(void) fprintf(stdout,
"%s: adjust local clock by %d seconds\n",
__progname, adjustment);
getprogname(), adjustment);
}
return 0;
}

8
usr.sbin/rpc.bootparamd/bootparamd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: bootparamd.c,v 1.37 2001/01/11 01:44:23 lukem Exp $ */
/* $NetBSD: bootparamd.c,v 1.38 2001/02/19 23:22:47 cgd Exp $ */
/*
* This code is not copyright, and is placed in the public domain.
@ -11,7 +11,7 @@
#include <sys/cdefs.h>
#ifndef lint
__RCSID("$NetBSD: bootparamd.c,v 1.37 2001/01/11 01:44:23 lukem Exp $");
__RCSID("$NetBSD: bootparamd.c,v 1.38 2001/02/19 23:22:47 cgd Exp $");
#endif
#include <sys/types.h>
@ -59,7 +59,6 @@ int debug = 0;
int dolog = 0;
struct in_addr route_addr;
struct sockaddr_in my_addr;
extern char *__progname;
char *bootpfile = _PATH_BOOTPARAMS;
int main __P((int, char *[]));
@ -448,7 +447,8 @@ void
usage()
{
fprintf(stderr,
"usage: %s [-d] [-s] [-r router] [-f bootparmsfile]\n", __progname);
"usage: %s [-d] [-s] [-r router] [-f bootparmsfile]\n",
getprogname());
exit(1);
}

8
usr.sbin/rpc.statd/statd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: statd.c,v 1.17 2000/06/09 14:02:13 fvdl Exp $ */
/* $NetBSD: statd.c,v 1.18 2001/02/19 23:22:47 cgd Exp $ */
/*
* Copyright (c) 1997 Christos Zoulas. All rights reserved.
@ -37,7 +37,7 @@
#include <sys/cdefs.h>
#ifndef lint
__RCSID("$NetBSD: statd.c,v 1.17 2000/06/09 14:02:13 fvdl Exp $");
__RCSID("$NetBSD: statd.c,v 1.18 2001/02/19 23:22:47 cgd Exp $");
#endif
/* main() function for status monitor daemon. Some of the code in this */
@ -76,7 +76,6 @@ static DBT undefkey = {
undefdata,
sizeof(undefdata)
};
extern char *__progname;
/* statd.c */
@ -106,7 +105,8 @@ main(argc, argv)
break;
default:
case '?':
(void)fprintf(stderr, "usage: %s [-d]\n", __progname);
(void)fprintf(stderr, "usage: %s [-d]\n",
getprogname());
exit(1);
/* NOTREACHED */
}

8
usr.sbin/rpc.yppasswdd/rpc.yppasswdd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: rpc.yppasswdd.c,v 1.8 2000/12/08 22:23:14 tron Exp $ */
/* $NetBSD: rpc.yppasswdd.c,v 1.9 2001/02/19 23:22:47 cgd Exp $ */
/*
* Copyright (c) 1994 Mats O Jansson <moj@stacken.kth.se>
@ -33,7 +33,7 @@
#include <sys/cdefs.h>
#ifndef lint
__RCSID("$NetBSD: rpc.yppasswdd.c,v 1.8 2000/12/08 22:23:14 tron Exp $");
__RCSID("$NetBSD: rpc.yppasswdd.c,v 1.9 2001/02/19 23:22:47 cgd Exp $");
#endif /* not lint */
#include <sys/types.h>
@ -55,8 +55,6 @@ __RCSID("$NetBSD: rpc.yppasswdd.c,v 1.8 2000/12/08 22:23:14 tron Exp $");
#include "extern.h"
extern char *__progname; /* from crt0.s */
int noshell, nogecos, nopw;
char make_arg[_POSIX2_LINE_MAX] = "make";
@ -176,6 +174,6 @@ usage(void)
{
fprintf(stderr, "usage: %s [-noshell] [-nogecos] [-nopw] "
"[-m arg1 [arg2 ...]]\n", __progname);
"[-m arg1 [arg2 ...]]\n", getprogname());
exit(EXIT_FAILURE);
}

8
usr.sbin/screenblank/screenblank.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: screenblank.c,v 1.10 1999/06/06 03:35:36 thorpej Exp $ */
/* $NetBSD: screenblank.c,v 1.11 2001/02/19 23:22:47 cgd Exp $ */
/*-
* Copyright (c) 1996, 1998 The NetBSD Foundation, Inc.
@ -45,7 +45,7 @@
__COPYRIGHT(
"@(#) Copyright (c) 1996, 1998 \
The NetBSD Foundation, Inc. All rights reserved.");
__RCSID("$NetBSD: screenblank.c,v 1.10 1999/06/06 03:35:36 thorpej Exp $");
__RCSID("$NetBSD: screenblank.c,v 1.11 2001/02/19 23:22:47 cgd Exp $");
#endif
#include <sys/types.h>
@ -88,8 +88,6 @@ struct dev_stat {
};
LIST_HEAD(ds_list, dev_stat) ds_list;
extern char *__progname;
int main __P((int, char *[]));
static void add_dev __P((const char *, int));
static void change_state __P((int));
@ -377,6 +375,6 @@ usage()
{
fprintf(stderr, "usage: %s [-k | -m] [-d timeout] [-e timeout] %s\n",
__progname, "[-f framebuffer]");
getprogname(), "[-f framebuffer]");
exit(1);
}

8
usr.sbin/slstats/slstats.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: slstats.c,v 1.12 1999/11/19 10:45:23 bouyer Exp $ */
/* $NetBSD: slstats.c,v 1.13 2001/02/19 23:22:48 cgd Exp $ */
/*
* print serial line IP statistics:
@ -25,7 +25,7 @@
#include <sys/cdefs.h>
#ifndef lint
__RCSID("$NetBSD: slstats.c,v 1.12 1999/11/19 10:45:23 bouyer Exp $");
__RCSID("$NetBSD: slstats.c,v 1.13 2001/02/19 23:22:48 cgd Exp $");
#endif
#define INET
@ -65,8 +65,6 @@ struct nlist nl[] = {
{ "" },
};
extern char *__progname; /* from crt0.o */
char *kernel; /* kernel for namelist */
char *kmemf; /* memory file */
@ -168,7 +166,7 @@ usage()
{
(void)fprintf(stderr, "usage: %s [-M core] [-N system] [-i interval] %s",
__progname, "[-v] [unit]\n");
getprogname(), "[-v] [unit]\n");
exit(1);
}

7
usr.sbin/syslogd/syslogd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: syslogd.c,v 1.42 2000/09/18 13:04:53 sommerfeld Exp $ */
/* $NetBSD: syslogd.c,v 1.43 2001/02/19 23:22:48 cgd Exp $ */
/*
* Copyright (c) 1983, 1988, 1993, 1994
@ -43,7 +43,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 1988, 1993, 1994\n\
#if 0
static char sccsid[] = "@(#)syslogd.c 8.3 (Berkeley) 4/4/94";
#else
__RCSID("$NetBSD: syslogd.c,v 1.42 2000/09/18 13:04:53 sommerfeld Exp $");
__RCSID("$NetBSD: syslogd.c,v 1.43 2001/02/19 23:22:48 cgd Exp $");
#endif
#endif /* not lint */
@ -436,11 +436,10 @@ main(argc, argv)
void
usage()
{
extern char *__progname;
(void)fprintf(stderr,
"usage: %s [-ds] [-f conffile] [-m markinterval] [-P logpathfile] [-p logpath1] [-p logpath2 ..]\n",
__progname);
getprogname());
exit(1);
}

8
usr.sbin/trpt/trpt.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: trpt.c,v 1.9 1999/07/01 19:15:03 itojun Exp $ */
/* $NetBSD: trpt.c,v 1.10 2001/02/19 23:22:48 cgd Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@ -81,7 +81,7 @@ __COPYRIGHT(
#if 0
static char sccsid[] = "@(#)trpt.c 8.1 (Berkeley) 6/6/93";
#else
__RCSID("$NetBSD: trpt.c,v 1.9 1999/07/01 19:15:03 itojun Exp $");
__RCSID("$NetBSD: trpt.c,v 1.10 2001/02/19 23:22:48 cgd Exp $");
#endif
#endif /* not lint */
@ -144,8 +144,6 @@ static caddr_t tcp_pcbs[TCP_NDEBUG];
static n_time ntime;
static int aflag, follow, sflag, tflag;
extern char *__progname;
int main __P((int, char *[]));
void dotrace __P((caddr_t));
void tcp_trace __P((short, short, struct tcpcb *, struct tcpcb *,
@ -545,6 +543,6 @@ usage()
{
(void) fprintf(stderr, "usage: %s [-afjst] [-p hex-address]"
" [-N system] [-M core]\n", __progname);
" [-N system] [-M core]\n", getprogname());
exit(1);
}

8
usr.sbin/trsp/trsp.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: trsp.c,v 1.5 1998/07/06 07:50:21 mrg Exp $ */
/* $NetBSD: trsp.c,v 1.6 2001/02/19 23:22:48 cgd Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@ -81,7 +81,7 @@ __COPYRIGHT(
#if 0
static char sccsid[] = "@(#)trsp.c 8.1 (Berkeley) 6/6/93";
#else
__RCSID("$NetBSD: trsp.c,v 1.5 1998/07/06 07:50:21 mrg Exp $");
__RCSID("$NetBSD: trsp.c,v 1.6 2001/02/19 23:22:48 cgd Exp $");
#endif
#endif /* not lint */
@ -143,8 +143,6 @@ int spp_debx;
kvm_t *kd;
extern char *__progname;
int main __P((int, char *[]));
void dotrace __P((caddr_t));
int numeric __P((const void *, const void *));
@ -479,6 +477,6 @@ usage()
{
fprintf(stderr, "usage: %s [-azstj] [-p hex-address]"
" [-N system] [-M core]\n", __progname);
" [-N system] [-M core]\n", getprogname());
exit(1);
}

9
usr.sbin/usbdevs/usbdevs.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: usbdevs.c,v 1.16 2001/01/09 17:35:45 augustss Exp $ */
/* $NetBSD: usbdevs.c,v 1.17 2001/02/19 23:22:48 cgd Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -57,13 +57,11 @@ void usbdump(int f);
void dumpone(char *name, int f, int addr);
int main(int, char **);
extern char *__progname;
void
usage()
{
fprintf(stderr, "Usage: %s [-a addr] [-d] [-f dev] [-v]\n",
__progname);
getprogname());
exit(1);
}
@ -208,7 +206,8 @@ main(int argc, char **argv)
ncont++;
}
if (verbose && ncont == 0)
printf("%s: no USB controllers found\n", __progname);
printf("%s: no USB controllers found\n",
getprogname());
} else {
f = open(dev, O_RDONLY);
if (f >= 0)

10
usr.sbin/user/main.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: main.c,v 1.1 1999/12/24 09:08:50 agc Exp $ */
/* $NetBSD: main.c,v 1.2 2001/02/19 23:22:49 cgd Exp $ */
/*
* Copyright (c) 1999 Alistair G. Crooks. All rights reserved.
@ -74,8 +74,6 @@ static cmd_t cmds[] = {
{ 0 }
};
extern char *__progname;
int
main(int argc, char **argv)
{
@ -86,7 +84,7 @@ main(int argc, char **argv)
for (cmdp = cmds ; cmdp->c_wc > 0 ; cmdp++) {
for (matched = i = 0 ; i < cmdp->c_wc && i < MaxCmdWords ; i++) {
if (argc > i) {
if (strcmp((i == 0) ? __progname : argv[i],
if (strcmp((i == 0) ? getprogname() : argv[i],
cmdp->c_word[i]) == 0) {
matched += 1;
} else {
@ -98,7 +96,7 @@ main(int argc, char **argv)
return (*cmdp->c_func)(argc - (matched - 1), argv + (matched - 1));
}
}
usermgmt_usage(__progname);
errx(EXIT_FAILURE, "Program `%s' not recognised", __progname);
usermgmt_usage(getprogname());
errx(EXIT_FAILURE, "Program `%s' not recognised", getprogname());
/* NOTREACHED */
}

6
usr.sbin/user/user.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: user.c,v 1.37 2001/02/13 21:27:03 lukem Exp $ */
/* $NetBSD: user.c,v 1.38 2001/02/19 23:22:49 cgd Exp $ */
/*
* Copyright (c) 1999 Alistair G. Crooks. All rights reserved.
@ -35,7 +35,7 @@
#ifndef lint
__COPYRIGHT("@(#) Copyright (c) 1999 \
The NetBSD Foundation, Inc. All rights reserved.");
__RCSID("$NetBSD: user.c,v 1.37 2001/02/13 21:27:03 lukem Exp $");
__RCSID("$NetBSD: user.c,v 1.38 2001/02/19 23:22:49 cgd Exp $");
#endif
#include <sys/types.h>
@ -1202,7 +1202,7 @@ find_group_info(char *name)
/* print out usage message, and then exit */
void
usermgmt_usage(char *prog)
usermgmt_usage(const char *prog)
{
if (strcmp(prog, "useradd") == 0) {
(void) fprintf(stderr, "Usage: %s -D [-b basedir] [-e expiry] "

4
usr.sbin/user/usermgmt.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: usermgmt.h,v 1.4 1999/12/24 09:08:51 agc Exp $ */
/* $NetBSD: usermgmt.h,v 1.5 2001/02/19 23:22:49 cgd Exp $ */
/*
* Copyright (c) 1999 Alistair G. Crooks. All rights reserved.
@ -45,6 +45,6 @@ int userinfo __P((int, char **));
int groupinfo __P((int, char **));
#endif
void usermgmt_usage __P((char *));
void usermgmt_usage __P((const char *));
#endif

7
usr.sbin/vipw/vipw.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: vipw.c,v 1.7 2000/12/06 14:04:25 tron Exp $ */
/* $NetBSD: vipw.c,v 1.8 2001/02/19 23:22:49 cgd Exp $ */
/*
* Copyright (c) 1987, 1993, 1994
@ -43,7 +43,7 @@ __COPYRIGHT("@(#) Copyright (c) 1987, 1993, 1994\n\
#if 0
static char sccsid[] = "@(#)vipw.c 8.3 (Berkeley) 4/2/94";
#else
__RCSID("$NetBSD: vipw.c,v 1.7 2000/12/06 14:04:25 tron Exp $");
__RCSID("$NetBSD: vipw.c,v 1.8 2001/02/19 23:22:49 cgd Exp $");
#endif
#endif /* not lint */
@ -147,8 +147,7 @@ copyfile(int from, int to)
static void
usage(void)
{
extern char *__progname;
(void)fprintf(stderr, "Usage: %s [-d directory]\n", __progname);
(void)fprintf(stderr, "Usage: %s [-d directory]\n", getprogname());
exit(1);
}

7
usr.sbin/wiconfig/wiconfig.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: wiconfig.c,v 1.10 2000/11/24 09:53:36 jdolecek Exp $ */
/* $NetBSD: wiconfig.c,v 1.11 2001/02/19 23:22:49 cgd Exp $ */
/*
* Copyright (c) 1997, 1998, 1999
@ -69,7 +69,7 @@
static const char copyright[] = "@(#) Copyright (c) 1997, 1998, 1999\
Bill Paul. All rights reserved.";
static const char rcsid[] =
"@(#) $Id: wiconfig.c,v 1.10 2000/11/24 09:53:36 jdolecek Exp $";
"@(#) $Id: wiconfig.c,v 1.11 2001/02/19 23:22:49 cgd Exp $";
#endif
struct wi_table {
@ -632,7 +632,6 @@ static void wi_dumpstats(iface)
static void
usage()
{
extern char *__progname;
fprintf(stderr,
"usage: %s interface "
@ -642,7 +641,7 @@ usage()
" [-m MAC address] [-d max data length] [-r RTS threshold]\n"
" [-f frequency] [-M 0|1] [-P 0|1] [-S max sleep duration]\n"
,
__progname);
getprogname());
exit(1);
}

5
usr.sbin/wsconscfg/wsconscfg.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: wsconscfg.c,v 1.7 2000/07/07 15:11:47 itojun Exp $ */
/* $NetBSD: wsconscfg.c,v 1.8 2001/02/19 23:22:49 cgd Exp $ */
/*
* Copyright (c) 1999
@ -51,11 +51,10 @@ int main __P((int, char**));
static void
usage()
{
extern char *__progname;
(void)fprintf(stderr,
"Usage: %s [-f wsdev] [-d [-F]] [-k] [-m] [-t type]"
"[-e emul] {vt | [kbd] | [mux]}\n", __progname);
"[-e emul] {vt | [kbd] | [mux]}\n", getprogname());
exit(1);
}

6
usr.sbin/wsfontload/wsfontload.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: wsfontload.c,v 1.5 2001/01/26 20:25:25 hubertf Exp $ */
/* $NetBSD: wsfontload.c,v 1.6 2001/02/19 23:22:50 cgd Exp $ */
/*
* Copyright (c) 1999
@ -34,6 +34,7 @@
#include <stdio.h>
#include <fcntl.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <sys/types.h>
@ -77,12 +78,11 @@ static struct {
static void
usage()
{
extern char *__progname;
(void)fprintf(stderr,
"Usage: %s [-f wsdev] [-w width] [-h height] [-e encoding]"
" [-N name] [-b] [-B] [fontfile]\n",
__progname);
getprogname());
exit(1);
}

7
usr.sbin/ypbind/ypbind.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ypbind.c,v 1.45 2001/01/11 01:47:55 lukem Exp $ */
/* $NetBSD: ypbind.c,v 1.46 2001/02/19 23:22:50 cgd Exp $ */
/*
* Copyright (c) 1992, 1993 Theo de Raadt <deraadt@fsa.ca>
@ -34,7 +34,7 @@
#include <sys/cdefs.h>
#ifndef LINT
__RCSID("$NetBSD: ypbind.c,v 1.45 2001/01/11 01:47:55 lukem Exp $");
__RCSID("$NetBSD: ypbind.c,v 1.46 2001/02/19 23:22:50 cgd Exp $");
#endif
#include <sys/param.h>
@ -159,7 +159,6 @@ static int direct_set __P((char *, int, struct _dom_binding *));
static void
usage()
{
extern char *__progname;
char *opt = "";
#ifdef DEBUG
opt = " [-d]";
@ -167,7 +166,7 @@ usage()
(void)fprintf(stderr,
"Usage: %s [-broadcast] [-insecure] [-ypset] [-ypsetme] %s\n",
__progname, opt);
getprogname(), opt);
exit(1);
}

8
usr.sbin/yppoll/yppoll.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: yppoll.c,v 1.8 2000/07/04 20:27:41 matt Exp $ */
/* $NetBSD: yppoll.c,v 1.9 2001/02/19 23:22:50 cgd Exp $ */
/*
* Copyright (c) 1992, 1993 Theo de Raadt <deraadt@fsa.ca>
@ -36,7 +36,7 @@
#include <sys/cdefs.h>
#ifndef lint
__RCSID("$NetBSD: yppoll.c,v 1.8 2000/07/04 20:27:41 matt Exp $");
__RCSID("$NetBSD: yppoll.c,v 1.9 2001/02/19 23:22:50 cgd Exp $");
#endif /* not lint */
#include <sys/param.h>
@ -61,8 +61,6 @@ int main __P((int, char *[]));
int get_remote_info __P((char *, char *, char *, int *, char **));
void usage __P((void));
extern char *__progname;
int
main(argc, argv)
int argc;
@ -194,6 +192,6 @@ usage()
{
fprintf(stderr, "usage: %s [-h host] [-d domainname] mapname\n",
__progname);
getprogname());
exit(1);
}

10
usr.sbin/ypserv/makedbm/makedbm.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: makedbm.c,v 1.16 1999/07/25 07:59:48 lukem Exp $ */
/* $NetBSD: makedbm.c,v 1.17 2001/02/19 23:22:50 cgd Exp $ */
/*
* Copyright (c) 1994 Mats O Jansson <moj@stacken.kth.se>
@ -33,7 +33,7 @@
#include <sys/cdefs.h>
#ifndef lint
__RCSID("$NetBSD: makedbm.c,v 1.16 1999/07/25 07:59:48 lukem Exp $");
__RCSID("$NetBSD: makedbm.c,v 1.17 2001/02/19 23:22:50 cgd Exp $");
#endif
#include <sys/param.h>
@ -57,8 +57,6 @@ __RCSID("$NetBSD: makedbm.c,v 1.16 1999/07/25 07:59:48 lukem Exp $");
#include "ypdb.h"
#include "ypdef.h"
extern char *__progname; /* from crt0.o */
int main __P((int, char *[]));
void usage __P((void));
int add_record __P((DBM *, char *, char *, int));
@ -373,8 +371,8 @@ void
usage()
{
fprintf(stderr, "usage: %s -u file\n", __progname);
fprintf(stderr, " %s [-lbs] %s\n", __progname,
fprintf(stderr, "usage: %s -u file\n", getprogname());
fprintf(stderr, " %s [-lbs] %s\n", getprogname(),
"[-i YP_INPUT_FILE] [-o YP_OUTPUT_FILE]");
fprintf(stderr, " %s infile outfile\n",
"[-d YP_DOMAIN_NAME] [-m YP_MASTER_NAME]");

10
usr.sbin/ypserv/mkalias/mkalias.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: mkalias.c,v 1.8 1999/06/07 03:06:09 mrg Exp $ */
/* $NetBSD: mkalias.c,v 1.9 2001/02/19 23:22:50 cgd Exp $ */
/*
* Copyright (c) 1997 Mats O Jansson <moj@stacken.kth.se>
@ -33,7 +33,7 @@
#include <sys/cdefs.h>
#ifndef lint
__RCSID("$NetBSD: mkalias.c,v 1.8 1999/06/07 03:06:09 mrg Exp $");
__RCSID("$NetBSD: mkalias.c,v 1.9 2001/02/19 23:22:50 cgd Exp $");
#endif
#include <sys/types.h>
@ -64,8 +64,6 @@ int main __P((int, char *[]));
void split_address __P((char *, int, char *, char *));
void usage __P((void));
extern char *__progname; /* from crt0.o */
void
split_address(address, len, user, host)
char *address;
@ -299,7 +297,7 @@ main(argc, argv)
status = ypdb_store(new_db, val, key, YPDB_INSERT);
if (status != 0) {
printf("%s: problem storing %*.*s %*.*s\n",
__progname,
getprogname(),
val.dsize, val.dsize, val.dptr,
key.dsize, key.dsize, key.dptr);
}
@ -356,6 +354,6 @@ usage()
{
fprintf(stderr,
"usage: %s [-e|-E [-d] [-u]] [-n] [-v] input [output]\n",
__progname);
getprogname());
exit(1);
}

10
usr.sbin/ypserv/mknetid/mknetid.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: mknetid.c,v 1.10 1999/07/25 09:01:04 lukem Exp $ */
/* $NetBSD: mknetid.c,v 1.11 2001/02/19 23:22:51 cgd Exp $ */
/*
* Copyright (c) 1996 Mats O Jansson <moj@stacken.kth.se>
@ -33,7 +33,7 @@
#include <sys/cdefs.h>
#ifndef lint
__RCSID("$NetBSD: mknetid.c,v 1.10 1999/07/25 09:01:04 lukem Exp $");
__RCSID("$NetBSD: mknetid.c,v 1.11 2001/02/19 23:22:51 cgd Exp $");
#endif
/*
@ -87,8 +87,6 @@ TAILQ_HEAD(user_list, user);
struct user_list root;
struct user_list hroot[HASHMAX];
extern char *__progname; /* from crt0.o */
int
main(argc, argv)
int argc;
@ -470,9 +468,9 @@ void
usage()
{
fprintf(stderr, "usage: %s %s\n", __progname,
fprintf(stderr, "usage: %s %s\n", getprogname(),
"[-d domain] [-q] [-p passwdfile] [-g groupfile]");
fprintf(stderr, " %s %s", __progname,
fprintf(stderr, " %s %s", getprogname(),
"[-g groupfile] [-h hostfile] [-m netidfile]");
exit(1);
}

7
usr.sbin/ypserv/revnetgroup/revnetgroup.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: revnetgroup.c,v 1.8 2000/07/07 15:11:48 itojun Exp $ */
/* $NetBSD: revnetgroup.c,v 1.9 2001/02/19 23:22:51 cgd Exp $ */
/*
* Copyright (c) 1995
@ -41,7 +41,7 @@
#include <sys/cdefs.h>
#ifndef lint
__RCSID("$NetBSD: revnetgroup.c,v 1.8 2000/07/07 15:11:48 itojun Exp $");
__RCSID("$NetBSD: revnetgroup.c,v 1.9 2001/02/19 23:22:51 cgd Exp $");
#endif
#include <ctype.h>
@ -76,9 +76,8 @@ struct member_entry *mtable[TABLESIZE];
void
usage()
{
extern char *__progname; /* from crt0.o */
fprintf (stderr,"usage: %s -u|-h [-f netgroup file]\n", __progname);
fprintf (stderr,"usage: %s -u|-h [-f netgroup file]\n", getprogname());
exit(1);
}

8
usr.sbin/ypserv/stdethers/stdethers.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: stdethers.c,v 1.12 1999/01/17 06:56:51 lukem Exp $ */
/* $NetBSD: stdethers.c,v 1.13 2001/02/19 23:22:52 cgd Exp $ */
/*
* Copyright (c) 1995 Mats O Jansson <moj@stacken.kth.se>
@ -33,7 +33,7 @@
#include <sys/cdefs.h>
#ifndef lint
__RCSID("$NetBSD: stdethers.c,v 1.12 1999/01/17 06:56:51 lukem Exp $");
__RCSID("$NetBSD: stdethers.c,v 1.13 2001/02/19 23:22:52 cgd Exp $");
#endif
#include <sys/types.h>
@ -55,8 +55,6 @@ __RCSID("$NetBSD: stdethers.c,v 1.12 1999/01/17 06:56:51 lukem Exp $");
int main __P((int, char *[]));
void usage __P((void));
extern char *__progname; /* from crt0.o */
int
main(argc, argv)
@ -104,6 +102,6 @@ void
usage()
{
fprintf(stderr, "usage: %s [file]\n", __progname);
fprintf(stderr, "usage: %s [file]\n", getprogname());
exit(1);
}

8
usr.sbin/ypserv/stdhosts/stdhosts.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: stdhosts.c,v 1.12 2000/07/30 02:25:08 itojun Exp $ */
/* $NetBSD: stdhosts.c,v 1.13 2001/02/19 23:22:52 cgd Exp $ */
/*
* Copyright (c) 1994 Mats O Jansson <moj@stacken.kth.se>
@ -33,7 +33,7 @@
#include <sys/cdefs.h>
#ifndef lint
__RCSID("$NetBSD: stdhosts.c,v 1.12 2000/07/30 02:25:08 itojun Exp $");
__RCSID("$NetBSD: stdhosts.c,v 1.13 2001/02/19 23:22:52 cgd Exp $");
#endif
#include <sys/types.h>
@ -55,8 +55,6 @@ __RCSID("$NetBSD: stdhosts.c,v 1.12 2000/07/30 02:25:08 itojun Exp $");
int main __P((int, char *[]));
void usage __P((void));
extern char *__progname; /* from crt0.o */
int
main(argc, argv)
int argc;
@ -138,6 +136,6 @@ void
usage()
{
fprintf(stderr, "usage: %s [-n] [file]\n", __progname);
fprintf(stderr, "usage: %s [-n] [file]\n", getprogname());
exit(1);
}

5
usr.sbin/ypserv/yppush/yppush.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: yppush.c,v 1.16 2001/01/11 01:54:08 lukem Exp $ */
/* $NetBSD: yppush.c,v 1.17 2001/02/19 23:22:52 cgd Exp $ */
/*
*
@ -87,7 +87,6 @@ struct yppush_info {
* global vars
*/
extern char *__progname; /* from crt0.o */
int verbo = 0; /* verbose */
/*
@ -289,7 +288,7 @@ void
usage()
{
fprintf(stderr, "usage: %s [-d domain] [-h host] [-v] map\n",
__progname);
getprogname());
exit(1);
}

11
usr.sbin/ypserv/ypserv/ypserv.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ypserv.c,v 1.13 2001/01/11 00:34:51 lukem Exp $ */
/* $NetBSD: ypserv.c,v 1.14 2001/02/19 23:22:52 cgd Exp $ */
/*
* Copyright (c) 1994 Mats O Jansson <moj@stacken.kth.se>
@ -33,7 +33,7 @@
#include <sys/cdefs.h>
#ifndef lint
__RCSID("$NetBSD: ypserv.c,v 1.13 2001/01/11 00:34:51 lukem Exp $");
__RCSID("$NetBSD: ypserv.c,v 1.14 2001/02/19 23:22:52 cgd Exp $");
#endif
#include <sys/types.h>
@ -85,8 +85,6 @@ int foreground;
int lflag;
#endif
extern char *__progname; /* from crt0.s */
int main __P((int, char *[]));
void usage __P((void));
@ -130,7 +128,8 @@ ypprog_2(struct svc_req *rqstp, SVCXPRT *transp)
#ifdef LIBWRAP
caller = svc_getrpccaller(transp)->buf;
request_init(&req, RQ_DAEMON, __progname, RQ_CLIENT_SIN, caller, NULL);
request_init(&req, RQ_DAEMON, getprogname(), RQ_CLIENT_SIN, caller,
NULL);
sock_methods(&req);
#endif
@ -474,7 +473,7 @@ usage()
#define USAGESTR "usage: %s [-d]\n"
#endif
fprintf(stderr, USAGESTR, __progname);
fprintf(stderr, USAGESTR, getprogname());
exit(1);
#undef USAGESTR

8
usr.sbin/ypserv/yptest/yptest.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: yptest.c,v 1.4 2000/07/04 20:27:41 matt Exp $ */
/* $NetBSD: yptest.c,v 1.5 2001/02/19 23:22:52 cgd Exp $ */
/*
* Copyright (c) 1994 Mats O Jansson <moj@stacken.kth.se>
@ -33,7 +33,7 @@
#include <sys/cdefs.h>
#ifndef lint
__RCSID("$NetBSD: yptest.c,v 1.4 2000/07/04 20:27:41 matt Exp $");
__RCSID("$NetBSD: yptest.c,v 1.5 2001/02/19 23:22:52 cgd Exp $");
#endif
#include <sys/types.h>
@ -51,8 +51,6 @@ __RCSID("$NetBSD: yptest.c,v 1.4 2000/07/04 20:27:41 matt Exp $");
int main __P((int, char *[]));
static int yptest_foreach __P((int, char *, int, char *, int, char *));
extern char *__progname; /* from crt0.o */
int
main(argc, argv)
int argc;
@ -66,7 +64,7 @@ main(argc, argv)
struct ypmaplist *ypml, *y;
if (argc != 1) {
fprintf(stderr, "usage: %s\n", __progname);
fprintf(stderr, "usage: %s\n", getprogname());
exit(1);
}

9
usr.sbin/ypserv/ypxfr/ypxfr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ypxfr.c,v 1.10 2001/01/11 00:35:49 lukem Exp $ */
/* $NetBSD: ypxfr.c,v 1.11 2001/02/19 23:22:53 cgd Exp $ */
/*
* Copyright (c) 1994 Mats O Jansson <moj@stacken.kth.se>
@ -33,7 +33,7 @@
#include <sys/cdefs.h>
#ifndef lint
__RCSID("$NetBSD: ypxfr.c,v 1.10 2001/01/11 00:35:49 lukem Exp $");
__RCSID("$NetBSD: ypxfr.c,v 1.11 2001/02/19 23:22:53 cgd Exp $");
#endif
#include <sys/types.h>
@ -61,8 +61,6 @@ __RCSID("$NetBSD: ypxfr.c,v 1.10 2001/01/11 00:35:49 lukem Exp $");
#include "ypdb.h"
#include "ypdef.h"
extern char *__progname; /* from crt0.o */
DBM *db;
static int ypxfr_foreach __P((int, char *, int, char *, int, char *));
@ -157,7 +155,8 @@ main(argc, argv)
if (need_usage) {
status = YPPUSH_BADARGS;
fprintf(stderr, "usage: %s [-cf] [-d domain] [-h host] %s\n",
__progname, "[-s domain] [-C tid prog ipadd port] mapname");
getprogname(),
"[-s domain] [-C tid prog ipadd port] mapname");
goto punt;
}

8
usr.sbin/ypset/ypset.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ypset.c,v 1.12 2000/04/14 06:26:55 simonb Exp $ */
/* $NetBSD: ypset.c,v 1.13 2001/02/19 23:22:53 cgd Exp $ */
/*
* Copyright (c) 1992, 1993 Theo de Raadt <deraadt@fsa.ca>
@ -34,7 +34,7 @@
#include <sys/cdefs.h>
#ifndef lint
__RCSID("$NetBSD: ypset.c,v 1.12 2000/04/14 06:26:55 simonb Exp $");
__RCSID("$NetBSD: ypset.c,v 1.13 2001/02/19 23:22:53 cgd Exp $");
#endif
#include <sys/param.h>
@ -53,8 +53,6 @@ __RCSID("$NetBSD: ypset.c,v 1.12 2000/04/14 06:26:55 simonb Exp $");
#include <rpcsvc/ypclnt.h>
#include <arpa/inet.h>
extern char *__progname;
int main __P((int, char *[]));
static void usage __P((void));
static void gethostaddr __P((const char *, struct in_addr *));
@ -170,6 +168,6 @@ static void
usage()
{
(void) fprintf(stderr, "usage: %s [-h host ] [-d domain] server\n",
__progname);
getprogname());
exit(1);
}