errx?/warnx? audit. do not pass variable alone, use %s. idea from openbsd

This commit is contained in:
itojun 2000-07-07 15:10:32 +00:00
parent 82cbc88d2a
commit bbef2fbaac
20 changed files with 67 additions and 67 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: conv.c,v 1.8 1998/07/28 05:15:46 mycroft Exp $ */
/* $NetBSD: conv.c,v 1.9 2000/07/07 15:10:32 itojun Exp $ */
/*-
* Copyright (c) 1991, 1993, 1994
@ -42,7 +42,7 @@
#if 0
static char sccsid[] = "@(#)conv.c 8.3 (Berkeley) 4/2/94";
#else
__RCSID("$NetBSD: conv.c,v 1.8 1998/07/28 05:15:46 mycroft Exp $");
__RCSID("$NetBSD: conv.c,v 1.9 2000/07/07 15:10:32 itojun Exp $");
#endif
#endif /* not lint */
@ -101,10 +101,10 @@ def_close()
/* Build a smaller version (i.e. for a miniroot) */
/* These can not be called, but just in case... */
static char no_block[] = "unblock and -DNO_CONV?";
void block() { errx(1, no_block + 2); }
void block_close() { errx(1, no_block + 2); }
void unblock() { errx(1, no_block); }
void unblock_close() { errx(1, no_block); }
void block() { errx(1, "%s", no_block + 2); }
void block_close() { errx(1, "%s", no_block + 2); }
void unblock() { errx(1, "%s", no_block); }
void unblock_close() { errx(1, "%s", no_block); }
#else /* NO_CONV */
/*

View File

@ -1,4 +1,4 @@
/* $NetBSD: biff.c,v 1.6 1998/07/28 19:26:09 mycroft Exp $ */
/* $NetBSD: biff.c,v 1.7 2000/07/07 15:13:21 itojun Exp $ */
/*
* Copyright (c) 1980, 1993
@ -43,7 +43,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\
#if 0
static char sccsid[] = "@(#)biff.c 8.1 (Berkeley) 6/6/93";
#else
__RCSID("$NetBSD: biff.c,v 1.6 1998/07/28 19:26:09 mycroft Exp $");
__RCSID("$NetBSD: biff.c,v 1.7 2000/07/07 15:13:21 itojun Exp $");
#endif
#endif /* not lint */
@ -93,11 +93,11 @@ main(argc, argv)
switch(argv[0][0]) {
case 'n':
if (chmod(name, sb.st_mode & ~0100) < 0)
err(2, name);
err(2, "%s", name);
break;
case 'y':
if (chmod(name, sb.st_mode | 0100) < 0)
err(2, name);
err(2, "%s", name);
break;
default:
usage();

View File

@ -1,4 +1,4 @@
/* $NetBSD: chpass.c,v 1.18 1999/02/08 22:21:44 mjl Exp $ */
/* $NetBSD: chpass.c,v 1.19 2000/07/07 15:13:22 itojun Exp $ */
/*-
* Copyright (c) 1988, 1993, 1994
@ -43,7 +43,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 1993, 1994\n\
#if 0
static char sccsid[] = "@(#)chpass.c 8.4 (Berkeley) 4/2/94";
#else
__RCSID("$NetBSD: chpass.c,v 1.18 1999/02/08 22:21:44 mjl Exp $");
__RCSID("$NetBSD: chpass.c,v 1.19 2000/07/07 15:13:22 itojun Exp $");
#endif
#endif /* not lint */
@ -258,12 +258,12 @@ main(argc, argv)
tfd = pw_lock(0);
if (tfd < 0) {
if (errno != EEXIST)
err(1, _PATH_MASTERPASSWD_LOCK);
err(1, "%s", _PATH_MASTERPASSWD_LOCK);
warnx("The passwd file is busy, waiting...");
tfd = pw_lock(10);
if (tfd < 0) {
if (errno != EEXIST)
err(1, _PATH_MASTERPASSWD_LOCK);
err(1, "%s", _PATH_MASTERPASSWD_LOCK);
errx(1, "The passwd file is still busy, "
"try again later.");
}

View File

@ -1,4 +1,4 @@
/* $NetBSD: net.c,v 1.13 1999/07/02 06:01:23 itojun Exp $ */
/* $NetBSD: net.c,v 1.14 2000/07/07 15:13:22 itojun Exp $ */
/*
* Copyright (c) 1989, 1993
@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)net.c 8.4 (Berkeley) 4/28/95";
#else
__RCSID("$NetBSD: net.c,v 1.13 1999/07/02 06:01:23 itojun Exp $");
__RCSID("$NetBSD: net.c,v 1.14 2000/07/07 15:13:22 itojun Exp $");
#endif
#endif /* not lint */
@ -111,7 +111,7 @@ netfinger(name)
}
if (s < 0) {
if (emsg != NULL)
warn(emsg);
warn("%s", emsg);
return;
}

View File

@ -1,4 +1,4 @@
/* $NetBSD: util.c,v 1.15 1999/11/09 15:06:35 drochner Exp $ */
/* $NetBSD: util.c,v 1.16 2000/07/07 15:13:22 itojun Exp $ */
/*
* Copyright (c) 1989, 1993
@ -42,7 +42,7 @@
#if 0
static char sccsid[] = "@(#)util.c 8.3 (Berkeley) 4/28/95";
#else
__RCSID("$NetBSD: util.c,v 1.15 1999/11/09 15:06:35 drochner Exp $");
__RCSID("$NetBSD: util.c,v 1.16 2000/07/07 15:13:22 itojun Exp $");
#endif
#endif /* not lint */
@ -345,7 +345,7 @@ find_idle_and_ttywrite(w)
(void)snprintf(tbuf, sizeof(tbuf), "%s/%s", _PATH_DEV, w->tty);
if (stat(tbuf, &sb) < 0) {
warn(tbuf);
warn("%s", tbuf);
return;
}
w->idletime = now < sb.st_atime ? 0 : now - sb.st_atime;

View File

@ -1,4 +1,4 @@
/* $NetBSD: fetch.c,v 1.116 2000/06/15 13:08:25 lukem Exp $ */
/* $NetBSD: fetch.c,v 1.117 2000/07/07 15:13:23 itojun Exp $ */
/*-
* Copyright (c) 1997-2000 The NetBSD Foundation, Inc.
@ -41,7 +41,7 @@
#include <sys/cdefs.h>
#ifndef lint
__RCSID("$NetBSD: fetch.c,v 1.116 2000/06/15 13:08:25 lukem Exp $");
__RCSID("$NetBSD: fetch.c,v 1.117 2000/07/07 15:13:23 itojun Exp $");
#endif /* not lint */
/*
@ -728,7 +728,7 @@ fetch_url(const char *url, const char *proxyenv, char *proxyauth, char *wwwauth)
hints.ai_protocol = 0;
error = getaddrinfo(host, port, &hints, &res0);
if (error) {
warnx(gai_strerror(error));
warnx("%s", gai_strerror(error));
goto cleanup_fetch_url;
}
if (res0->ai_canonname)

View File

@ -1,4 +1,4 @@
/* $NetBSD: ftp.c,v 1.100 2000/06/11 15:15:52 lukem Exp $ */
/* $NetBSD: ftp.c,v 1.101 2000/07/07 15:13:24 itojun Exp $ */
/*-
* Copyright (c) 1996-2000 The NetBSD Foundation, Inc.
@ -103,7 +103,7 @@
#if 0
static char sccsid[] = "@(#)ftp.c 8.6 (Berkeley) 10/27/94";
#else
__RCSID("$NetBSD: ftp.c,v 1.100 2000/06/11 15:15:52 lukem Exp $");
__RCSID("$NetBSD: ftp.c,v 1.101 2000/07/07 15:13:24 itojun Exp $");
#endif
#endif /* not lint */
@ -202,7 +202,7 @@ hookup(char *host, char *port)
hints.ai_protocol = 0;
error = getaddrinfo(host, port, &hints, &res0);
if (error) {
warnx(gai_strerror(error));
warnx("%s", gai_strerror(error));
code = -1;
return (0);
}
@ -271,7 +271,7 @@ hookup(char *host, char *port)
break;
}
if (s < 0) {
warn(cause);
warn("%s", cause);
code = -1;
freeaddrinfo(res0);
return 0;
@ -342,7 +342,7 @@ hookup(char *host, char *port)
break;
}
if (s < 0) {
warn(cause);
warn("%s", cause);
code = -1;
return 0;
}

View File

@ -1,4 +1,4 @@
/* $NetBSD: ktrace.c,v 1.18 2000/07/03 02:51:21 matt Exp $ */
/* $NetBSD: ktrace.c,v 1.19 2000/07/07 15:13:24 itojun Exp $ */
/*-
* Copyright (c) 1988, 1993
@ -43,7 +43,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 1993\n\
#if 0
static char sccsid[] = "@(#)ktrace.c 8.2 (Berkeley) 4/28/95";
#else
__RCSID("$NetBSD: ktrace.c,v 1.18 2000/07/03 02:51:21 matt Exp $");
__RCSID("$NetBSD: ktrace.c,v 1.19 2000/07/07 15:13:24 itojun Exp $");
#endif
#endif /* not lint */
@ -212,7 +212,7 @@ main(argc, argv)
if (outfile && strcmp(outfile, "-")) {
if ((fd = open(outfile, O_CREAT | O_WRONLY |
(append ? 0 : O_TRUNC), DEFFILEMODE)) < 0)
err(1, outfile);
err(1, "%s", outfile);
(void)close(fd);
}
@ -356,6 +356,6 @@ do_ktrace(tracefile, ops, trpoints, pid)
} else
ret = ktrace(tracefile, ops, trpoints, pid);
if (ret < 0)
err(1, tracefile);
err(1, "%s", tracefile);
return 1;
}

View File

@ -1,4 +1,4 @@
/* $NetBSD: modstat.c,v 1.14 1999/08/16 03:02:46 simonb Exp $ */
/* $NetBSD: modstat.c,v 1.15 2000/07/07 15:13:25 itojun Exp $ */
/*
* Copyright (c) 1993 Terrence R. Lambert.
@ -34,7 +34,7 @@
#include <sys/cdefs.h>
#ifndef lint
__RCSID("$NetBSD: modstat.c,v 1.14 1999/08/16 03:02:46 simonb Exp $");
__RCSID("$NetBSD: modstat.c,v 1.15 2000/07/07 15:13:25 itojun Exp $");
#endif
#include <sys/param.h>
@ -174,7 +174,7 @@ main(argc, argv)
*/
(void)setegid(egid);
if ((devfd = open(_PATH_LKM, O_RDONLY, 0)) == -1)
err(2, _PATH_LKM);
err(2, "%s", _PATH_LKM);
/* get rid of our privileges now */
setgid(getgid());

View File

@ -1,4 +1,4 @@
/* $NetBSD: tcopy.c,v 1.9 1998/10/08 02:15:14 wsanchez Exp $ */
/* $NetBSD: tcopy.c,v 1.10 2000/07/07 15:13:25 itojun Exp $ */
/*
* Copyright (c) 1985, 1987, 1993, 1995
@ -43,7 +43,7 @@ __COPYRIGHT("@(#) Copyright (c) 1985, 1987, 1993\n\
#if 0
static char sccsid[] = "@(#)tcopy.c 8.3 (Berkeley) 1/23/95";
#endif
__RCSID("$NetBSD: tcopy.c,v 1.9 1998/10/08 02:15:14 wsanchez Exp $");
__RCSID("$NetBSD: tcopy.c,v 1.10 2000/07/07 15:13:25 itojun Exp $");
#endif /* not lint */
#include <sys/types.h>
@ -133,7 +133,7 @@ main(argc, argv)
inf = argv[0];
if ((outp = open(argv[1], op == VERIFY ? O_RDONLY :
op == COPY ? O_WRONLY : O_RDWR, DEFFILEMODE)) < 0) {
err(3, argv[1]);
err(3, "%s", argv[1]);
}
break;
default:
@ -141,7 +141,7 @@ main(argc, argv)
}
if ((inp = open(inf, O_RDONLY, 0)) < 0)
err(1, inf);
err(1, "%s", inf);
buff = getspace(maxblk);

View File

@ -1,4 +1,4 @@
/* $NetBSD: dkstats.c,v 1.8 2000/06/04 16:10:17 thorpej Exp $ */
/* $NetBSD: dkstats.c,v 1.9 2000/07/07 15:13:25 itojun Exp $ */
/*
* Copyright (c) 1996 John M. Vinopal
@ -83,8 +83,8 @@ int *dk_select;
char **dr_name;
#define KVM_ERROR(_string) { \
warnx((_string)); \
errx(1, kvm_geterr(kd)); \
warnx("%s", (_string)); \
errx(1, "%s", kvm_geterr(kd)); \
}
/*

View File

@ -1,4 +1,4 @@
/* $NetBSD: eehandlers.c,v 1.6 1997/10/18 08:40:40 lukem Exp $ */
/* $NetBSD: eehandlers.c,v 1.7 2000/07/07 15:11:44 itojun Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@ -78,14 +78,14 @@ static int doio __P((struct keytabent *, u_char *, ssize_t, int));
}
#define FAILEDREAD(kt) { \
warnx(err_str); \
warnx("%s", err_str); \
warnx("failed to read field `%s'", (kt)->kt_keyword); \
++eval; \
return; \
}
#define FAILEDWRITE(kt) { \
warnx(err_str); \
warnx("%s", err_str); \
warnx("failed to update field `%s'", (kt)->kt_keyword); \
++eval; \
return; \

View File

@ -1,4 +1,4 @@
/* $NetBSD: main.c,v 1.8 1997/10/18 08:40:49 lukem Exp $ */
/* $NetBSD: main.c,v 1.9 2000/07/07 15:11:45 itojun Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@ -40,7 +40,7 @@
#ifndef lint
__COPYRIGHT(
"@(#) Copyright (c) 1996 The NetBSD Foundation, Inc. All rights reserved.");
__RCSID("$NetBSD: main.c,v 1.8 1997/10/18 08:40:49 lukem Exp $");
__RCSID("$NetBSD: main.c,v 1.9 2000/07/07 15:11:45 itojun Exp $");
#endif
#include <sys/param.h>
@ -271,7 +271,7 @@ action(line)
* the generic op_handler.
*/
if ((cp = op_handler(keyword, arg)) != NULL)
warnx(cp);
warnx("%s", cp);
return;
} else
#endif /* __sparc__ */

View File

@ -1,4 +1,4 @@
/* $NetBSD: netgroup_mkdb.c,v 1.9 1999/11/28 04:40:21 lukem Exp $ */
/* $NetBSD: netgroup_mkdb.c,v 1.10 2000/07/07 15:11:46 itojun Exp $ */
/*
* Copyright (c) 1994 Christos Zoulas
@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
#ifndef lint
__RCSID("$NetBSD: netgroup_mkdb.c,v 1.9 1999/11/28 04:40:21 lukem Exp $");
__RCSID("$NetBSD: netgroup_mkdb.c,v 1.10 2000/07/07 15:11:46 itojun Exp $");
#endif
#include <sys/types.h>
@ -168,7 +168,7 @@ main(argc, argv)
db = dbopen(buf, O_RDWR | O_CREAT | O_EXCL,
(S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH), DB_HASH, NULL);
if (!db)
err(1, buf);
err(1, "%s", buf);
ng_write(db, ndb, _NG_KEYBYNAME);
ng_rwrite(db, udb, _NG_KEYBYUSER);
@ -215,7 +215,7 @@ ng_load(fname)
/* Open the netgroup file */
if ((fp = fopen(fname, "r")) == NULL)
err(1, fname);
err(1, "%s", fname);
db = dbopen(NULL, O_RDWR | O_CREAT | O_EXCL, 0, DB_HASH, NULL);

View File

@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 2000\n\
Copyright (c) 1991, 1993, 1994\n\
The Regents of the University of California. All rights reserved.\n");
__SCCSID("from: @(#)pwd_mkdb.c 8.5 (Berkeley) 4/20/94");
__RCSID("$NetBSD: pwd_mkdb.c,v 1.17 2000/01/23 19:59:33 mycroft Exp $");
__RCSID("$NetBSD: pwd_mkdb.c,v 1.18 2000/07/07 15:11:46 itojun Exp $");
#endif /* not lint */
#include <sys/param.h>
@ -503,7 +503,7 @@ error(name)
char *name;
{
warn(name);
warn("%s", name);
cleanup();
#ifdef think_about_this_a_while_longer
fputs("NOTE: possible inconsistencies between text files and databases\n", stderr);

View File

@ -1,4 +1,4 @@
/* $NetBSD: quotaon.c,v 1.14 2000/07/04 20:27:39 matt Exp $ */
/* $NetBSD: quotaon.c,v 1.15 2000/07/07 15:11:46 itojun 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.14 2000/07/04 20:27:39 matt Exp $");
__RCSID("$NetBSD: quotaon.c,v 1.15 2000/07/07 15:11:46 itojun Exp $");
#endif
#endif /* not lint */
@ -176,7 +176,7 @@ quotaonoff(fs, offmode, type, qfpathname)
return (1);
if (offmode) {
if (quotactl(fs->fs_file, QCMD(Q_QUOTAOFF, type), 0, 0) < 0) {
warn(fs->fs_file);
warn("%s", fs->fs_file);
return (1);
}
if (vflag)

View File

@ -1,4 +1,4 @@
/* $NetBSD: rdate.c,v 1.10 2000/02/05 22:14:20 kleink Exp $ */
/* $NetBSD: rdate.c,v 1.11 2000/07/07 15:11:47 itojun Exp $ */
/*
* Copyright (c) 1994 Christos Zoulas
@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
#ifndef lint
__RCSID("$NetBSD: rdate.c,v 1.10 2000/02/05 22:14:20 kleink Exp $");
__RCSID("$NetBSD: rdate.c,v 1.11 2000/07/07 15:11:47 itojun Exp $");
#endif/* lint */
#include <sys/types.h>
@ -142,7 +142,7 @@ main(argc, argv)
break;
}
if (s < 0)
err(1, emsg);
err(1, "%s", emsg);
if (read(s, &tim, sizeof(time_t)) != sizeof(time_t))
err(1, "Could not read data");

View File

@ -1,4 +1,4 @@
/* $NetBSD: yppasswdd_mkpw.c,v 1.5 2000/07/04 20:27:39 matt Exp $ */
/* $NetBSD: yppasswdd_mkpw.c,v 1.6 2000/07/07 15:11:47 itojun Exp $ */
/*
* Copyright (c) 1996 Jason R. Thorpe <thorpej@NetBSD.ORG>
@ -108,7 +108,7 @@ make_passwd(argp, rqstp, transp)
pfd = open(_PATH_MASTERPASSWD, O_RDONLY, 0);
if (pfd < 0) {
pw_abort();
warnx(_PATH_MASTERPASSWD);
warnx("%s", _PATH_MASTERPASSWD);
RETURN(1);
}

View File

@ -1,4 +1,4 @@
/* $NetBSD: wsconscfg.c,v 1.6 2000/07/04 20:27:40 matt Exp $ */
/* $NetBSD: wsconscfg.c,v 1.7 2000/07/07 15:11:47 itojun Exp $ */
/*
* Copyright (c) 1999
@ -120,7 +120,7 @@ main(argc, argv)
wsfd = open(wsdev, O_RDWR, 0);
if (wsfd < 0)
err(2, wsdev);
err(2, "%s", wsdev);
if (kbd) {
if (mux)

View File

@ -1,4 +1,4 @@
/* $NetBSD: revnetgroup.c,v 1.7 1999/07/25 09:01:05 lukem Exp $ */
/* $NetBSD: revnetgroup.c,v 1.8 2000/07/07 15:11:48 itojun Exp $ */
/*
* Copyright (c) 1995
@ -41,7 +41,7 @@
#include <sys/cdefs.h>
#ifndef lint
__RCSID("$NetBSD: revnetgroup.c,v 1.7 1999/07/25 09:01:05 lukem Exp $");
__RCSID("$NetBSD: revnetgroup.c,v 1.8 2000/07/07 15:11:48 itojun Exp $");
#endif
#include <ctype.h>
@ -129,7 +129,7 @@ main(argc, argv)
if (strcmp(netgroup, "-")) {
if ((fp = fopen(netgroup, "r")) == NULL) {
err(1,netgroup);
err(1, "%s", netgroup);
}
} else {
fp = stdin;