summaryrefslogtreecommitdiffstats
path: root/usr.sbin/pkg_install/lib/msg.c
diff options
context:
space:
mode:
authorjkh <jkh@FreeBSD.org>1998-09-11 07:26:58 +0000
committerjkh <jkh@FreeBSD.org>1998-09-11 07:26:58 +0000
commitdad2df585cf830423608e2027120a5a34082d64a (patch)
tree9c49a1ce1161dfa3570080dd96d4c7194c4a8320 /usr.sbin/pkg_install/lib/msg.c
parent806b06993b8d6cf5a89015512afb8bd253173403 (diff)
downloadFreeBSD-src-dad2df585cf830423608e2027120a5a34082d64a.zip
FreeBSD-src-dad2df585cf830423608e2027120a5a34082d64a.tar.gz
correct usage of cleanup() everywhere - this became bogus when the warnx/errx
stuff was added and nobody seems to have noticed. :) Noticed by: Josh MacDonald <jmacd@paris.CS.Berkeley.EDU>
Diffstat (limited to 'usr.sbin/pkg_install/lib/msg.c')
-rw-r--r--usr.sbin/pkg_install/lib/msg.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.sbin/pkg_install/lib/msg.c b/usr.sbin/pkg_install/lib/msg.c
index 3c2d199..a580d8a 100644
--- a/usr.sbin/pkg_install/lib/msg.c
+++ b/usr.sbin/pkg_install/lib/msg.c
@@ -1,6 +1,6 @@
#ifndef lint
static const char rcsid[] =
- "$Id: msg.c,v 1.9 1997/10/08 07:48:09 charnier Exp $";
+ "$Id: msg.c,v 1.10 1997/10/13 15:03:55 jkh Exp $";
#endif
/*
@@ -31,8 +31,8 @@ static const char rcsid[] =
void
upchuck(const char *err)
{
- warn("fatal error during execution: %s", err);
cleanup(0);
+ errx(1, "fatal error during execution: %s", err);
}
/*
@@ -53,8 +53,8 @@ y_or_n(Boolean def, const char *msg, ...)
*/
tty = fopen("/dev/tty", "r");
if (!tty) {
- warnx("can't open /dev/tty!");
cleanup(0);
+ errx(2, "can't open /dev/tty!");
}
while (ch != 'Y' && ch != 'N') {
vfprintf(stderr, msg, args);
OpenPOWER on IntegriCloud