diff options
| author |   dholland <dholland@NetBSD.org> | 2009-03-14 20:14:56 +0000 |
|---|---|---|
| committer | dholland <dholland@NetBSD.org> | 2009-03-14 20:14:56 +0000 |
| commit | 5e8d1f0902b592fc872212ecccaca23c8ce85231 (patch) | |
| tree | 550914a1c512d85a606c5d422c35a4eb479e1520 /sail | |
| parent | 5f78478123fb43569990e33601eaf8887d71e6db (diff) | |
| download | bsdgames-darwin-5e8d1f0902b592fc872212ecccaca23c8ce85231.tar.gz bsdgames-darwin-5e8d1f0902b592fc872212ecccaca23c8ce85231.tar.zst bsdgames-darwin-5e8d1f0902b592fc872212ecccaca23c8ce85231.zip | |
Don't use perror()
Diffstat (limited to 'sail')
| -rw-r--r-- | sail/lo_main.c | 11 | ||||
| -rw-r--r-- | sail/pl_1.c | 5 | ||||
| -rw-r--r-- | sail/pl_main.c | 6 |
3 files changed, 10 insertions, 12 deletions
diff --git a/sail/lo_main.c b/sail/lo_main.c index c86daf7a..b4902990 100644 --- a/sail/lo_main.c +++ b/sail/lo_main.c @@ -1,4 +1,4 @@ -/* $NetBSD: lo_main.c,v 1.15 2009/03/14 18:41:21 dholland Exp $ */ +/* $NetBSD: lo_main.c,v 1.16 2009/03/14 20:14:56 dholland Exp $ */ /* * Copyright (c) 1983, 1993 @@ -34,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)lo_main.c 8.2 (Berkeley) 4/28/95"; #else -__RCSID("$NetBSD: lo_main.c,v 1.15 2009/03/14 18:41:21 dholland Exp $"); +__RCSID("$NetBSD: lo_main.c,v 1.16 2009/03/14 20:14:56 dholland Exp $"); #endif #endif /* not lint */ @@ -44,6 +44,7 @@ __RCSID("$NetBSD: lo_main.c,v 1.15 2009/03/14 18:41:21 dholland Exp $"); * -l force a long listing (print out real usernames) */ +#include <err.h> #include <stdio.h> #include <stdlib.h> #include <pwd.h> @@ -67,8 +68,7 @@ lo_main(void) struct ship *ship; if ((fp = fopen(_PATH_LOGFILE, "r")) == 0) { - perror(_PATH_LOGFILE); - exit(1); + err(1, "%s", _PATH_LOGFILE); } switch (fread(&npeople, sizeof npeople, 1, fp)) { case 0: @@ -77,8 +77,7 @@ lo_main(void) case 1: break; default: - perror(_PATH_LOGFILE); - exit(1); + err(1, "%s", _PATH_LOGFILE); } while (fread(&log, sizeof log, 1, fp) == 1 && log.l_name[0] != '\0') { diff --git a/sail/pl_1.c b/sail/pl_1.c index 5e261056..8bb4b832 100644 --- a/sail/pl_1.c +++ b/sail/pl_1.c @@ -1,4 +1,4 @@ -/* $NetBSD: pl_1.c,v 1.19 2007/12/15 19:44:43 perry Exp $ */ +/* $NetBSD: pl_1.c,v 1.20 2009/03/14 20:14:56 dholland Exp $ */ /* * Copyright (c) 1983, 1993 @@ -34,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)pl_1.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: pl_1.c,v 1.19 2007/12/15 19:44:43 perry Exp $"); +__RCSID("$NetBSD: pl_1.c,v 1.20 2009/03/14 20:14:56 dholland Exp $"); #endif #endif /* not lint */ @@ -92,7 +92,6 @@ leave(int conditions) printf("The driver died.\n"); break; case LEAVE_FORK: - perror("fork"); break; case LEAVE_SYNC: printf("Synchronization error\n."); diff --git a/sail/pl_main.c b/sail/pl_main.c index e13136a7..701d2d94 100644 --- a/sail/pl_main.c +++ b/sail/pl_main.c @@ -1,4 +1,4 @@ -/* $NetBSD: pl_main.c,v 1.23 2009/03/14 19:36:42 dholland Exp $ */ +/* $NetBSD: pl_main.c,v 1.24 2009/03/14 20:14:56 dholland Exp $ */ /* * Copyright (c) 1983, 1993 @@ -34,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)pl_main.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: pl_main.c,v 1.23 2009/03/14 19:36:42 dholland Exp $"); +__RCSID("$NetBSD: pl_main.c,v 1.24 2009/03/14 20:14:56 dholland Exp $"); #endif #endif /* not lint */ @@ -191,7 +191,7 @@ reprint: longjmp(restart, MODE_DRIVER); /*NOTREACHED*/ case -1: - perror("fork"); + warn("fork"); leave(LEAVE_FORK); break; default: |