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

nuke perror.

This commit is contained in:
christos 2006-11-03 20:21:16 +00:00
parent 95c7627c87
commit 1d83cc5b6c
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/libc/net/rcmd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: rcmd.c,v 1.63 2005/12/02 11:33:26 yamt Exp $ */
/* $NetBSD: rcmd.c,v 1.64 2006/11/03 20:21:16 christos Exp $ */
/*
* Copyright (c) 1983, 1993, 1994
@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)rcmd.c 8.3 (Berkeley) 3/26/94";
#else
__RCSID("$NetBSD: rcmd.c,v 1.63 2005/12/02 11:33:26 yamt Exp $");
__RCSID("$NetBSD: rcmd.c,v 1.64 2006/11/03 20:21:16 christos Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@ -267,9 +267,8 @@ resrcmd(res, ahost, rport, locuser, remuser, cmd, fd2p)
if (getnameinfo(r->ai_addr, r->ai_addrlen,
hbuf, sizeof(hbuf), NULL, 0, niflags) != 0)
strlcpy(hbuf, "(invalid)", sizeof(hbuf));
warnx("rcmd: connect to address %s", hbuf);
errno = oerrno;
perror(0);
warn("rcmd: connect to address %s", hbuf);
r = r->ai_next;
hbuf[0] = '\0';
if (getnameinfo(r->ai_addr, r->ai_addrlen,

15
lib/libc/time/zdump.c
View File

@ -1,9 +1,9 @@
/* $NetBSD: zdump.c,v 1.14 2003/10/29 20:43:27 kleink Exp $ */
/* $NetBSD: zdump.c,v 1.15 2006/11/03 20:23:19 christos Exp $ */
#include <sys/cdefs.h>
#ifndef lint
#ifndef NOID
__RCSID("$NetBSD: zdump.c,v 1.14 2003/10/29 20:43:27 kleink Exp $");
__RCSID("$NetBSD: zdump.c,v 1.15 2006/11/03 20:23:19 christos Exp $");
#endif /* !defined NOID */
#endif /* !defined lint */
@ -15,11 +15,12 @@ static char elsieid[] = "@(#)zdump.c 7.31";
** You can use this code to help in verifying other implementations.
*/
#include "stdio.h" /* for stdout, stderr, perror */
#include "stdio.h" /* for stdout, stderr */
#include "string.h" /* for strcpy */
#include "sys/types.h" /* for time_t */
#include "time.h" /* for struct tm */
#include "stdlib.h" /* for exit, malloc, atoi */
#include <err.h>
#ifndef MAX_STRING_LENGTH
#define MAX_STRING_LENGTH 1024
@ -206,8 +207,8 @@ _("%s: usage is %s [ --version ] [ -v ] [ -c cutoff ] zonename ...\n"),
sizeof *fakeenv));
if (fakeenv == NULL ||
(fakeenv[0] = (char *) malloc(longest + 4)) == NULL) {
(void) perror(progname);
(void) exit(EXIT_FAILURE);
err(EXIT_FAILURE, "Can't allocated %zu bytes",
longest + 4);
}
to = 0;
(void)strcpy(fakeenv[to++], "TZ="); /* XXX strcpy is safe */
@ -268,9 +269,7 @@ _("%s: usage is %s [ --version ] [ -v ] [ -c cutoff ] zonename ...\n"),
show(argv[i], t, TRUE);
}
if (fflush(stdout) || ferror(stdout)) {
(void) fprintf(stderr, "%s: ", argv[0]);
(void) perror(_("Error writing standard output"));
(void) exit(EXIT_FAILURE);
err(EXIT_FAILURE, "Error writing standard output");
}
exit(EXIT_SUCCESS);