diff options
| author |   ericj <ericj@openbsd.org> | 2001-12-06 03:12:30 +0000 |
|---|---|---|
| committer | ericj <ericj@openbsd.org> | 2001-12-06 03:12:30 +0000 |
| commit | 222c0752cf9cad087f625780525f33075ede6084 (patch) | |
| tree | 730fb8450de0f8060ca3e3ce494592db88b988f7 /usr.sbin/lpr/common_source/common.c | |
| parent | A FILE * is not a file name, dammit. (diff) | |
| download | wireguard-openbsd-222c0752cf9cad087f625780525f33075ede6084.tar.xz wireguard-openbsd-222c0752cf9cad087f625780525f33075ede6084.zip | |
use err/warn and friends instead of printf/exit.
also, remove fatal2() which is just errx anyway.
millert@ ok
Diffstat (limited to 'usr.sbin/lpr/common_source/common.c')
| -rw-r--r-- | usr.sbin/lpr/common_source/common.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.sbin/lpr/common_source/common.c b/usr.sbin/lpr/common_source/common.c index 592f4eef608..bb1468459e4 100644 --- a/usr.sbin/lpr/common_source/common.c +++ b/usr.sbin/lpr/common_source/common.c @@ -1,4 +1,4 @@ -/* $OpenBSD: common.c,v 1.13 2001/11/23 03:58:17 deraadt Exp $ */ +/* $OpenBSD: common.c,v 1.14 2001/12/06 03:12:30 ericj Exp $ */ /* * Copyright (c) 1983, 1993 @@ -42,7 +42,7 @@ #if 0 static const char sccsid[] = "@(#)common.c 8.5 (Berkeley) 4/28/95"; #else -static const char rcsid[] = "$OpenBSD: common.c,v 1.13 2001/11/23 03:58:17 deraadt Exp $"; +static const char rcsid[] = "$OpenBSD: common.c,v 1.14 2001/12/06 03:12:30 ericj Exp $"; #endif #endif /* not lint */ @@ -112,7 +112,6 @@ long XS; /* flags to set for local mode */ char line[BUFSIZ]; char *bp; /* pointer into printcap buffer. */ -char *name; /* program name */ char *printer; /* printer name */ /* host machine name */ char host[MAXHOSTNAMELEN]; @@ -421,6 +420,7 @@ fatal(msg, va_alist) va_dcl #endif { + extern char *__progname; va_list ap; #ifdef __STDC__ va_start(ap, msg); @@ -429,7 +429,7 @@ fatal(msg, va_alist) #endif if (from != host) (void)printf("%s: ", host); - (void)printf("%s: ", name); + (void)printf("%s: ", __progname); if (printer) (void)printf("%s: ", printer); (void)vprintf(msg, ap); |