Module Name: src
Committed By: christos
Date: Tue Jun 16 22:54:11 UTC 2015
Modified Files:
src/usr.bin/cal: cal.c
src/usr.bin/cksum: cksum.c
src/usr.bin/fsplit: fsplit.c
src/usr.bin/kdump: kdump.c
src/usr.bin/mkcsmapper: yacc.y
src/usr.bin/mkdep: mkdep.c
src/usr.bin/mkesdb: yacc.y
src/usr.bin/mklocale: mklocaledb.c
src/usr.bin/netstat: vtw.c
src/usr.bin/printf: printf.c
src/usr.bin/rump_dhcpclient: main.c
src/usr.bin/sdpquery: command.c
src/usr.bin/su: su.c
src/usr.bin/talk: get_addrs.c
src/usr.bin/tip: remote.c tip.c
src/usr.bin/utoppya: utoppya.c
Log Message:
fix some error handling.
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/usr.bin/cal/cal.c
cvs rdiff -u -r1.47 -r1.48 src/usr.bin/cksum/cksum.c
cvs rdiff -u -r1.29 -r1.30 src/usr.bin/fsplit/fsplit.c
cvs rdiff -u -r1.118 -r1.119 src/usr.bin/kdump/kdump.c
cvs rdiff -u -r1.9 -r1.10 src/usr.bin/mkcsmapper/yacc.y
cvs rdiff -u -r1.43 -r1.44 src/usr.bin/mkdep/mkdep.c
cvs rdiff -u -r1.6 -r1.7 src/usr.bin/mkesdb/yacc.y
cvs rdiff -u -r1.3 -r1.4 src/usr.bin/mklocale/mklocaledb.c
cvs rdiff -u -r1.7 -r1.8 src/usr.bin/netstat/vtw.c
cvs rdiff -u -r1.36 -r1.37 src/usr.bin/printf/printf.c
cvs rdiff -u -r1.3 -r1.4 src/usr.bin/rump_dhcpclient/main.c
cvs rdiff -u -r1.4 -r1.5 src/usr.bin/sdpquery/command.c
cvs rdiff -u -r1.71 -r1.72 src/usr.bin/su/su.c
cvs rdiff -u -r1.11 -r1.12 src/usr.bin/talk/get_addrs.c
cvs rdiff -u -r1.19 -r1.20 src/usr.bin/tip/remote.c
cvs rdiff -u -r1.56 -r1.57 src/usr.bin/tip/tip.c
cvs rdiff -u -r1.5 -r1.6 src/usr.bin/utoppya/utoppya.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/cal/cal.c
diff -u src/usr.bin/cal/cal.c:1.28 src/usr.bin/cal/cal.c:1.29
--- src/usr.bin/cal/cal.c:1.28 Wed Jan 7 22:56:33 2015
+++ src/usr.bin/cal/cal.c Tue Jun 16 18:54:10 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: cal.c,v 1.28 2015/01/08 03:56:33 christos Exp $ */
+/* $NetBSD: cal.c,v 1.29 2015/06/16 22:54:10 christos Exp $ */
/*
* Copyright (c) 1989, 1993, 1994
@@ -42,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 19
#if 0
static char sccsid[] = "@(#)cal.c 8.4 (Berkeley) 4/2/94";
#else
-__RCSID("$NetBSD: cal.c,v 1.28 2015/01/08 03:56:33 christos Exp $");
+__RCSID("$NetBSD: cal.c,v 1.29 2015/06/16 22:54:10 christos Exp $");
#endif
#endif /* not lint */
@@ -377,7 +377,7 @@ monthrange(int month, int year, int befo
endmonth = (month + after) % 12;
if (startyear < 0 || endyear > 9999) {
- errx(1, "year should be in 1-9999\n");
+ errx(1, "year should be in 1-9999");
}
year = startyear;
Index: src/usr.bin/cksum/cksum.c
diff -u src/usr.bin/cksum/cksum.c:1.47 src/usr.bin/cksum/cksum.c:1.48
--- src/usr.bin/cksum/cksum.c:1.47 Sun Aug 31 03:05:33 2014
+++ src/usr.bin/cksum/cksum.c Tue Jun 16 18:54:10 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: cksum.c,v 1.47 2014/08/31 07:05:33 christos Exp $ */
+/* $NetBSD: cksum.c,v 1.48 2015/06/16 22:54:10 christos Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -81,7 +81,7 @@ __COPYRIGHT("@(#) Copyright (c) 1991, 19
#if 0
static char sccsid[] = "@(#)cksum.c 8.2 (Berkeley) 4/28/95";
#endif
-__RCSID("$NetBSD: cksum.c,v 1.47 2014/08/31 07:05:33 christos Exp $");
+__RCSID("$NetBSD: cksum.c,v 1.48 2015/06/16 22:54:10 christos Exp $");
#endif /* not lint */
#include <sys/types.h>
@@ -194,7 +194,7 @@ main(int argc, char **argv)
switch(ch) {
case 'a':
if (hash) {
- warnx("illegal use of -a option\n");
+ warnx("illegal use of -a option");
usage();
}
i = 0;
@@ -305,7 +305,7 @@ main(int argc, char **argv)
argc>0?argv[0]:"stdin");
while(fgets(buf, sizeof(buf), f) != NULL) {
- s=strrchr(buf, '\n');
+ s = strrchr(buf, '\n');
if (s)
*s = '\0';
Index: src/usr.bin/fsplit/fsplit.c
diff -u src/usr.bin/fsplit/fsplit.c:1.29 src/usr.bin/fsplit/fsplit.c:1.30
--- src/usr.bin/fsplit/fsplit.c:1.29 Wed Jan 23 15:39:46 2013
+++ src/usr.bin/fsplit/fsplit.c Tue Jun 16 18:54:10 2015
@@ -40,7 +40,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 19
#if 0
static char sccsid[] = "from: @(#)fsplit.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: fsplit.c,v 1.29 2013/01/23 20:39:46 riastradh Exp $");
+__RCSID("$NetBSD: fsplit.c,v 1.30 2015/06/16 22:54:10 christos Exp $");
#endif
#endif /* not lint */
@@ -264,7 +264,7 @@ get_name(char *name, int letters)
*ptr = '0';
}
if (ptr < name + letters) {
- errx(1, "Ran out of file names.\n");
+ errx(1, "Ran out of file names.");
}
}
}
Index: src/usr.bin/kdump/kdump.c
diff -u src/usr.bin/kdump/kdump.c:1.118 src/usr.bin/kdump/kdump.c:1.119
--- src/usr.bin/kdump/kdump.c:1.118 Wed Apr 30 07:51:51 2014
+++ src/usr.bin/kdump/kdump.c Tue Jun 16 18:54:10 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: kdump.c,v 1.118 2014/04/30 11:51:51 njoly Exp $ */
+/* $NetBSD: kdump.c,v 1.119 2015/06/16 22:54:10 christos Exp $ */
/*-
* Copyright (c) 1988, 1993
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 19
#if 0
static char sccsid[] = "@(#)kdump.c 8.4 (Berkeley) 4/28/95";
#else
-__RCSID("$NetBSD: kdump.c,v 1.118 2014/04/30 11:51:51 njoly Exp $");
+__RCSID("$NetBSD: kdump.c,v 1.119 2015/06/16 22:54:10 christos Exp $");
#endif
#endif /* not lint */
@@ -436,7 +436,7 @@ dumpheader(struct ktr_header *kth)
break;
default:
badversion:
- err(1, "Unsupported ktrace version %x\n",
+ err(1, "Unsupported ktrace version %x",
kth->ktr_version);
}
}
Index: src/usr.bin/mkcsmapper/yacc.y
diff -u src/usr.bin/mkcsmapper/yacc.y:1.9 src/usr.bin/mkcsmapper/yacc.y:1.10
--- src/usr.bin/mkcsmapper/yacc.y:1.9 Fri Sep 16 11:39:27 2011
+++ src/usr.bin/mkcsmapper/yacc.y Tue Jun 16 18:54:10 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: yacc.y,v 1.9 2011/09/16 15:39:27 joerg Exp $ */
+/* $NetBSD: yacc.y,v 1.10 2015/06/16 22:54:10 christos Exp $ */
%{
/*-
@@ -33,7 +33,7 @@
#include <sys/cdefs.h>
#if !defined(lint)
-__RCSID("$NetBSD: yacc.y,v 1.9 2011/09/16 15:39:27 joerg Exp $");
+__RCSID("$NetBSD: yacc.y,v 1.10 2015/06/16 22:54:10 christos Exp $");
#endif /* not lint */
#include <assert.h>
@@ -659,7 +659,7 @@ do_mkpv(FILE *in)
else
out = stdout;
- if (out==NULL)
+ if (out == NULL)
err(EXIT_FAILURE, "fopen");
ret = _pivot_factory_convert(out, in);
@@ -667,18 +667,15 @@ do_mkpv(FILE *in)
if (ret && output)
unlink(output); /* dump failure */
if (ret)
- errx(EXIT_FAILURE, "%s\n", strerror(ret));
+ errc(EXIT_FAILURE, ret, "");
}
__dead static void
usage(void)
{
- warnx("usage: \n"
- "\t%s [-d] [-o outfile] [infile]\n"
- "\t%s -m [-d] [-o outfile] [infile]\n"
- "\t%s -p [-d] [-o outfile] [infile]\n",
- getprogname(), getprogname(), getprogname());
- exit(1);
+ fprintf(stderr, "Usage: %s [-m|-p] [-d] [-o outfile] [infile]\n",
+ getprogname());
+ exit(EXIT_FAILURE);
}
int
Index: src/usr.bin/mkdep/mkdep.c
diff -u src/usr.bin/mkdep/mkdep.c:1.43 src/usr.bin/mkdep/mkdep.c:1.44
--- src/usr.bin/mkdep/mkdep.c:1.43 Tue Mar 5 16:57:47 2013
+++ src/usr.bin/mkdep/mkdep.c Tue Jun 16 18:54:10 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: mkdep.c,v 1.43 2013/03/05 21:57:47 christos Exp $ */
+/* $NetBSD: mkdep.c,v 1.44 2015/06/16 22:54:10 christos Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
#if !defined(lint)
__COPYRIGHT("@(#) Copyright (c) 1999 The NetBSD Foundation, Inc.\
All rights reserved.");
-__RCSID("$NetBSD: mkdep.c,v 1.43 2013/03/05 21:57:47 christos Exp $");
+__RCSID("$NetBSD: mkdep.c,v 1.44 2015/06/16 22:54:10 christos Exp $");
#endif /* not lint */
#include <sys/mman.h>
@@ -472,7 +472,7 @@ main(int argc, char **argv)
exit(EXIT_SUCCESS);
wrerror:
- err(EXIT_FAILURE, "unable to %s to file %s\n",
+ err(EXIT_FAILURE, "unable to %s to file %s",
aflag & O_TRUNC ? "write" : "append", filename);
}
Index: src/usr.bin/mkesdb/yacc.y
diff -u src/usr.bin/mkesdb/yacc.y:1.6 src/usr.bin/mkesdb/yacc.y:1.7
--- src/usr.bin/mkesdb/yacc.y:1.6 Fri Sep 16 11:39:27 2011
+++ src/usr.bin/mkesdb/yacc.y Tue Jun 16 18:54:10 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: yacc.y,v 1.6 2011/09/16 15:39:27 joerg Exp $ */
+/* $NetBSD: yacc.y,v 1.7 2015/06/16 22:54:10 christos Exp $ */
%{
/*-
@@ -33,7 +33,7 @@
#include <sys/cdefs.h>
#if !defined(lint)
-__RCSID("$NetBSD: yacc.y,v 1.6 2011/09/16 15:39:27 joerg Exp $");
+__RCSID("$NetBSD: yacc.y,v 1.7 2015/06/16 22:54:10 christos Exp $");
#endif /* not lint */
#include <assert.h>
@@ -276,7 +276,7 @@ do_mkdb(FILE *in)
else
out = stdout;
- if (out==NULL)
+ if (out == NULL)
err(EXIT_FAILURE, "fopen");
ret = _lookup_factory_convert(out, in);
@@ -284,17 +284,14 @@ do_mkdb(FILE *in)
if (ret && output)
unlink(output); /* dump failure */
if (ret)
- errx(EXIT_FAILURE, "%s\n", strerror(ret));
+ errc(EXIT_FAILURE, c, "");
}
__dead static void
usage(void)
{
- errx(EXIT_FAILURE,
- "usage:\n"
- "\t%s [-o outfile] [infile]\n"
- "\t%s -m [-o outfile] [infile]",
- getprogname(), getprogname());
+ fprintf("Usage: %s [-m] [-o outfile] [infile]\n", getprogname());
+ exit(EXIT_FAILURE);
}
int
Index: src/usr.bin/mklocale/mklocaledb.c
diff -u src/usr.bin/mklocale/mklocaledb.c:1.3 src/usr.bin/mklocale/mklocaledb.c:1.4
--- src/usr.bin/mklocale/mklocaledb.c:1.3 Thu Jul 4 07:36:17 2013
+++ src/usr.bin/mklocale/mklocaledb.c Tue Jun 16 18:54:10 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: mklocaledb.c,v 1.3 2013/07/04 11:36:17 joerg Exp $ */
+/* $NetBSD: mklocaledb.c,v 1.4 2015/06/16 22:54:10 christos Exp $ */
/*-
* Copyright (c)2008 Citrus Project,
@@ -37,7 +37,7 @@
#include <sys/cdefs.h>
#if !defined(lint)
-__RCSID("$NetBSD: mklocaledb.c,v 1.3 2013/07/04 11:36:17 joerg Exp $");
+__RCSID("$NetBSD: mklocaledb.c,v 1.4 2015/06/16 22:54:10 christos Exp $");
#endif /* not lint */
#include <assert.h>
@@ -252,17 +252,17 @@ mklocaledb(const char *type, FILE *reade
/*NOTREACHED*/
}
if (_db_factory_create(&df, &_db_hash_std, NULL))
- errx(1, "can't create db factory.\n");
+ errx(EXIT_FAILURE, "can't create db factory");
if (_db_factory_add32_by_s(df, category->vers_sym, category->version))
- errx(1, "can't store db.\n");
+ errx(EXIT_FAILURE, "can't store db");
token = &category->tokens[0];
while (token->key != NULL) {
line = fparseln(reader, NULL,
NULL, delim, FPARSELN_UNESCALL);
if (line == NULL)
- errx(1, "can't read line.\n");
+ errx(EXIT_FAILURE, "can't read line");
if ((*token->save)(df, token->key, (const char *)line))
- errx(1, "can't store db.\n");
+ errx(EXIT_FAILURE, "can't store db");
free(line);
++token;
}
@@ -270,11 +270,11 @@ mklocaledb(const char *type, FILE *reade
_DIAGASSERT(size > 0);
serialized = malloc(size);
if (serialized == NULL)
- errx(1, "can't malloc.\n");
+ errx(EXIT_FAILURE, "can't malloc");
_DIAGASSERT(serialized != NULL);
_region_init(&r, serialized, size);
if (_db_factory_serialize(df, category->magic, &r))
- errx(1, "can't serialize db.\n");
+ errx(EXIT_FAILURE, "can't serialize db");
fwrite(serialized, size, 1, writer);
_db_factory_free(df);
}
Index: src/usr.bin/netstat/vtw.c
diff -u src/usr.bin/netstat/vtw.c:1.7 src/usr.bin/netstat/vtw.c:1.8
--- src/usr.bin/netstat/vtw.c:1.7 Fri Oct 18 16:26:45 2013
+++ src/usr.bin/netstat/vtw.c Tue Jun 16 18:54:10 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: vtw.c,v 1.7 2013/10/18 20:26:45 christos Exp $ */
+/* $NetBSD: vtw.c,v 1.8 2015/06/16 22:54:10 christos Exp $ */
/*
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
#if 0
static char sccsid[] = "from: @(#)inet.c 8.4 (Berkeley) 4/20/94";
#else
-__RCSID("$NetBSD: vtw.c,v 1.7 2013/10/18 20:26:45 christos Exp $");
+__RCSID("$NetBSD: vtw.c,v 1.8 2015/06/16 22:54:10 christos Exp $");
#endif
#endif /* not lint */
@@ -130,7 +130,7 @@ snarf(const void *addr, void *buf, size_
cc = kvm_read(get_kvmd(), (unsigned long) addr, buf, len);
if (cc != len) {
- warnx("%s: short read at %p, len %zx cc %zx\n", __func__, addr,
+ warnx("%s: short read at %p, len %zx cc %zx", __func__, addr,
len, cc);
}
}
Index: src/usr.bin/printf/printf.c
diff -u src/usr.bin/printf/printf.c:1.36 src/usr.bin/printf/printf.c:1.37
--- src/usr.bin/printf/printf.c:1.36 Tue Jul 16 13:48:22 2013
+++ src/usr.bin/printf/printf.c Tue Jun 16 18:54:10 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: printf.c,v 1.36 2013/07/16 17:48:22 christos Exp $ */
+/* $NetBSD: printf.c,v 1.37 2015/06/16 22:54:10 christos Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -41,7 +41,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 19
#if 0
static char sccsid[] = "@(#)printf.c 8.2 (Berkeley) 3/22/95";
#else
-__RCSID("$NetBSD: printf.c,v 1.36 2013/07/16 17:48:22 christos Exp $");
+__RCSID("$NetBSD: printf.c,v 1.37 2015/06/16 22:54:10 christos Exp $");
#endif
#endif /* not lint */
@@ -553,7 +553,7 @@ mklong(const char *str, char ch)
len = strlen(str) + 2;
if (len > sizeof copy) {
- warnx("format %s too complex\n", str);
+ warnx("format %s too complex", str);
len = 4;
}
(void)memmove(copy, str, len - 3);
Index: src/usr.bin/rump_dhcpclient/main.c
diff -u src/usr.bin/rump_dhcpclient/main.c:1.3 src/usr.bin/rump_dhcpclient/main.c:1.4
--- src/usr.bin/rump_dhcpclient/main.c:1.3 Fri Sep 16 11:39:28 2011
+++ src/usr.bin/rump_dhcpclient/main.c Tue Jun 16 18:54:10 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.3 2011/09/16 15:39:28 joerg Exp $ */
+/* $NetBSD: main.c,v 1.4 2015/06/16 22:54:10 christos Exp $ */
/*-
* Copyright (c) 2011 Antti Kantee. All Rights Reserved.
@@ -52,7 +52,7 @@ __dead static void
usage(void)
{
- fprintf(stderr, "usage: %s ifname\n", getprogname());
+ fprintf(stderr, "Usage: %s ifname\n", getprogname());
exit(1);
}
@@ -102,7 +102,7 @@ send_discover(struct interface *ifp)
mlen = make_message(&dhcp, ifp, DHCP_DISCOVER);
ulen = make_udp_packet(&udp, (void *)dhcp, mlen, ia, ia);
if (send_raw_packet(ifp, ETHERTYPE_IP, udp, ulen) == -1)
- err(1, "sending discover failed");
+ err(EXIT_FAILURE, "sending discover failed");
}
static void
@@ -118,7 +118,7 @@ send_request(struct interface *ifp)
mlen = make_message(&dhcp, ifp, DHCP_REQUEST);
ulen = make_udp_packet(&udp, (void *)dhcp, mlen, ia, ia);
if (send_raw_packet(ifp, ETHERTYPE_IP, udp, ulen) == -1)
- err(1, "sending discover failed");
+ err(EXIT_FAILURE, "sending discover failed");
}
/* wait for 5s by default */
@@ -140,9 +140,9 @@ get_network(struct interface *ifp, uint8
for (;;) {
switch (rump_sys_poll(&pfd, 1, RESPWAIT)) {
case 0:
- errx(1, "timed out waiting for response");
+ errx(EXIT_FAILURE, "timed out waiting for response");
case -1:
- err(1, "poll failed");
+ err(EXIT_FAILURE, "poll failed");
default:
break;
}
@@ -197,9 +197,9 @@ get_offer(struct interface *ifp)
case DHCP_OFFER:
break;
case DHCP_NAK:
- errx(1, "got NAK from dhcp server");
+ errx(EXIT_FAILURE, "got NAK from dhcp server");
default:
- errx(1, "didn't receive offer");
+ errx(EXIT_FAILURE, "didn't receive offer");
}
ifp->state->offer = xzalloc(sizeof(*ifp->state->offer));
@@ -219,7 +219,7 @@ get_ack(struct interface *ifp)
get_network(ifp, &raw, &dhcp);
get_option_uint8(&type, dhcp, DHO_MESSAGETYPE);
if (type != DHCP_ACK)
- errx(1, "didn't receive ack");
+ errx(EXIT_FAILURE, "didn't receive ack");
ifp->state->new = ifp->state->offer;
get_lease(&ifp->state->lease, ifp->state->new);
@@ -238,15 +238,15 @@ main(int argc, char *argv[])
usage();
if (rumpclient_init() == -1)
- err(1, "init failed");
+ err(EXIT_FAILURE, "init failed");
if (init_sockets() == -1)
- err(1, "failed to init sockets");
+ err(EXIT_FAILURE, "failed to init sockets");
if ((ifp = init_interface(argv[1])) == NULL)
- err(1, "cannot init %s\n", argv[1]);
+ err(EXIT_FAILURE, "cannot init %s", argv[1]);
ifaces = ifp;
if (open_socket(ifp, ETHERTYPE_IP) == -1)
- err(1, "bpf");
+ err(EXIT_FAILURE, "bpf");
up_interface(ifp);
ifp->state = xzalloc(sizeof(*ifp->state));
@@ -261,7 +261,7 @@ main(int argc, char *argv[])
ifo->options = DHCPCD_GATEWAY | DHCPCD_HOSTNAME;
if (get_hwaddr(ifp) == -1)
- err(1, "failed to get hwaddr for %s", ifp->name);
+ err(EXIT_FAILURE, "failed to get hwaddr for %s", ifp->name);
send_discover(ifp);
get_offer(ifp);
Index: src/usr.bin/sdpquery/command.c
diff -u src/usr.bin/sdpquery/command.c:1.4 src/usr.bin/sdpquery/command.c:1.5
--- src/usr.bin/sdpquery/command.c:1.4 Tue Feb 8 13:14:00 2011
+++ src/usr.bin/sdpquery/command.c Tue Jun 16 18:54:10 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: command.c,v 1.4 2011/02/08 18:14:00 plunky Exp $ */
+/* $NetBSD: command.c,v 1.5 2015/06/16 22:54:10 christos Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: command.c,v 1.4 2011/02/08 18:14:00 plunky Exp $");
+__RCSID("$NetBSD: command.c,v 1.5 2015/06/16 22:54:10 christos Exp $");
#include <bluetooth.h>
#include <err.h>
@@ -127,7 +127,7 @@ do_sdp_record(int argc, const char **arg
for (; argc-- > 0; argv++) {
handle = strtoul(*argv, &ep, 0);
if (*argv[0] == '\0' || *ep != '\0' || handle > UINT32_MAX)
- errx(EXIT_FAILURE, "Invalid handle: %s\n", *argv);
+ errx(EXIT_FAILURE, "Invalid handle: %s", *argv);
rv = sdp_service_attribute(ss, (uint32_t)handle, NULL, &rsp);
if (!rv)
Index: src/usr.bin/su/su.c
diff -u src/usr.bin/su/su.c:1.71 src/usr.bin/su/su.c:1.72
--- src/usr.bin/su/su.c:1.71 Sat Mar 15 21:07:46 2014
+++ src/usr.bin/su/su.c Tue Jun 16 18:54:11 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: su.c,v 1.71 2014/03/16 01:07:46 dholland Exp $ */
+/* $NetBSD: su.c,v 1.72 2015/06/16 22:54:11 christos Exp $ */
/*
* Copyright (c) 1988 The Regents of the University of California.
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988\
#if 0
static char sccsid[] = "@(#)su.c 8.3 (Berkeley) 4/2/94";*/
#else
-__RCSID("$NetBSD: su.c,v 1.71 2014/03/16 01:07:46 dholland Exp $");
+__RCSID("$NetBSD: su.c,v 1.72 2015/06/16 22:54:11 christos Exp $");
#endif
#endif /* not lint */
@@ -231,7 +231,7 @@ main(int argc, char **argv)
pwd->pw_class = class;
}
if ((lc = login_getclass(pwd->pw_class)) == NULL)
- errx(EXIT_FAILURE, "Unknown class %s\n", pwd->pw_class);
+ errx(EXIT_FAILURE, "Unknown class %s", pwd->pw_class);
pw_warntime = (time_t)login_getcaptime(lc, "password-warn",
_PASSWORD_WARNDAYS * SECSPERDAY,
Index: src/usr.bin/talk/get_addrs.c
diff -u src/usr.bin/talk/get_addrs.c:1.11 src/usr.bin/talk/get_addrs.c:1.12
--- src/usr.bin/talk/get_addrs.c:1.11 Sat Dec 29 18:44:22 2012
+++ src/usr.bin/talk/get_addrs.c Tue Jun 16 18:54:11 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: get_addrs.c,v 1.11 2012/12/29 23:44:22 christos Exp $ */
+/* $NetBSD: get_addrs.c,v 1.12 2015/06/16 22:54:11 christos Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)get_addrs.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: get_addrs.c,v 1.11 2012/12/29 23:44:22 christos Exp $");
+__RCSID("$NetBSD: get_addrs.c,v 1.12 2015/06/16 22:54:11 christos Exp $");
#endif /* not lint */
#include "talk.h"
@@ -75,7 +75,7 @@ get_addrs(const char *my_machine_name, c
/* find the server's port */
sp = getservbyname("ntalk", "udp");
if (sp == 0)
- errx(EXIT_FAILURE, "%s/%s: service is not registered.\n",
+ errx(EXIT_FAILURE, "%s/%s: service is not registered.",
"ntalk", "udp");
daemon_port = sp->s_port;
}
Index: src/usr.bin/tip/remote.c
diff -u src/usr.bin/tip/remote.c:1.19 src/usr.bin/tip/remote.c:1.20
--- src/usr.bin/tip/remote.c:1.19 Mon Oct 21 10:47:46 2013
+++ src/usr.bin/tip/remote.c Tue Jun 16 18:54:11 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: remote.c,v 1.19 2013/10/21 14:47:46 christos Exp $ */
+/* $NetBSD: remote.c,v 1.20 2015/06/16 22:54:11 christos Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -40,7 +40,7 @@ __COPYRIGHT("@(#) Copyright (c) 1992, 19
#if 0
static char sccsid[] = "@(#)remote.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: remote.c,v 1.19 2013/10/21 14:47:46 christos Exp $");
+__RCSID("$NetBSD: remote.c,v 1.20 2015/06/16 22:54:11 christos Exp $");
#endif /* not lint */
#include "pathnames.h"
@@ -128,12 +128,12 @@ getremcap(char *host)
else
DU = cgetflag("du");
if (DV == NULL) {
- errx(3, "%s: missing device spec\n", host);
+ errx(3, "%s: missing device spec", host);
}
if (DU && CU == NULL)
CU = DV;
if (DU && PN == NULL) {
- errx(3, "%s: missing phone number\n", host);
+ errx(3, "%s: missing phone number", host);
}
HD = cgetflag("hd");
Index: src/usr.bin/tip/tip.c
diff -u src/usr.bin/tip/tip.c:1.56 src/usr.bin/tip/tip.c:1.57
--- src/usr.bin/tip/tip.c:1.56 Thu Jun 11 14:12:00 2015
+++ src/usr.bin/tip/tip.c Tue Jun 16 18:54:11 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tip.c,v 1.56 2015/06/11 18:12:00 gson Exp $ */
+/* $NetBSD: tip.c,v 1.57 2015/06/16 22:54:11 christos Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -42,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 19
#if 0
static char sccsid[] = "@(#)tip.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: tip.c,v 1.56 2015/06/11 18:12:00 gson Exp $");
+__RCSID("$NetBSD: tip.c,v 1.57 2015/06/16 22:54:11 christos Exp $");
#endif /* not lint */
/*
@@ -91,8 +91,7 @@ main(int argc, char *argv[])
tipusage();
}
if (!isatty(0)) {
- (void)fprintf(stderr, "%s: must be interactive\n", getprogname());
- exit(1);
+ errx(EXIT_FAILURE, must be interactive");
}
cmdlineBR = 0;
@@ -151,11 +150,10 @@ notnumber:
(void)signal(SIGTERM, cleanup);
if ((i = hunt(System)) == 0) {
- (void)printf("all ports busy\n");
- exit(3);
+ errx(3, "all ports busy");
}
if (i == -1) {
- errx(3, "link down\n");
+ errx(3, "link down");
}
setbuf(stdout, NULL);
@@ -180,7 +178,7 @@ notnumber:
}
}
if ((q = tip_connect()) != NULL) {
- errx(1, "\07%s\n[EOT]\n", q);
+ errx(1, "\07%s\n[EOT]", q);
}
if (!HW) {
if (ttysetup((speed_t)number(value(BAUDRATE))) != 0) {
Index: src/usr.bin/utoppya/utoppya.c
diff -u src/usr.bin/utoppya/utoppya.c:1.5 src/usr.bin/utoppya/utoppya.c:1.6
--- src/usr.bin/utoppya/utoppya.c:1.5 Mon Sep 5 14:11:53 2011
+++ src/usr.bin/utoppya/utoppya.c Tue Jun 16 18:54:11 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: utoppya.c,v 1.5 2011/09/05 18:11:53 joerg Exp $ */
+/* $NetBSD: utoppya.c,v 1.6 2015/06/16 22:54:11 christos Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -295,7 +295,7 @@ cmd_rename(int argc, char **argv)
;
if (strcmp(n, o) == 0)
- errx(EX_DATAERR, "'%s' and '%s' refer to the same file\n",
+ errx(EX_DATAERR, "'%s' and '%s' refer to the same file",
oldpath, newpath);
if (find_toppy_dirent(oldpath, &ud) == 0)
