X-Git-Url: https://git.subgeniuskitty.com/unix-history/.git/blobdiff_plain/1c15e88899094343f75aeba04122cd96a96b428e..ad7871609881e73855d0b04da49b486cd93efca7:/usr/src/usr.bin/logger/logger.c diff --git a/usr/src/usr.bin/logger/logger.c b/usr/src/usr.bin/logger/logger.c index 413636a6da..3fd3b6b203 100644 --- a/usr/src/usr.bin/logger/logger.c +++ b/usr/src/usr.bin/logger/logger.c @@ -1,54 +1,77 @@ /* - * Copyright (c) 1983 Regents of the University of California. - * All rights reserved. + * Copyright (c) 1983, 1993 + * The Regents of the University of California. All rights reserved. * - * Redistribution and use in source and binary forms are permitted - * provided that: (1) source distributions retain this entire copyright - * notice and comment, and (2) distributions including binaries display - * the following acknowledgement: ``This product includes software - * developed by the University of California, Berkeley and its contributors'' - * in the documentation or other materials provided with the distribution - * and in all advertising materials mentioning features or use of this - * software. Neither the name of the University nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the University of + * California, Berkeley and its contributors. + * 4. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. */ #ifndef lint -char copyright[] = -"@(#) Copyright (c) 1983 Regents of the University of California.\n\ - All rights reserved.\n"; +static char copyright[] = +"@(#) Copyright (c) 1983, 1993\n\ + The Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ #ifndef lint -static char sccsid[] = "@(#)logger.c 6.14 (Berkeley) 6/1/90"; +static char sccsid[] = "@(#)logger.c 8.1 (Berkeley) 6/6/93"; #endif /* not lint */ +#include +#include +#include #include -#include #include +#include -/* -** LOGGER -- read and log utility -** -** This routine reads from an input and arranges to write the -** result on the system log, along with a useful tag. -*/ +#define SYSLOG_NAMES +#include + +int decode __P((char *, CODE *)); +int pencode __P((char *)); +void usage __P((void)); +/* + * logger -- read and log utility + * + * Reads from an input and arranges to write the result on the system + * log. + */ +int main(argc, argv) int argc; - char **argv; + char *argv[]; { - extern char *optarg; - extern int errno, optind; - int pri = LOG_NOTICE; - int ch, logflags = 0; - char *tag, buf[1024], *getlogin(), *strerror(); + int ch, logflags, pri; + char *tag, buf[1024]; tag = NULL; + pri = LOG_NOTICE; + logflags = 0; while ((ch = getopt(argc, argv, "f:ip:st:")) != EOF) switch((char)ch) { case 'f': /* file to log */ @@ -103,22 +126,16 @@ main(argc, argv) } if (p != buf) syslog(pri, "%s", buf); - exit(0); - } - - /* main loop */ - while (fgets(buf, sizeof(buf), stdin) != NULL) - syslog(pri, "%s", buf); - + } else + while (fgets(buf, sizeof(buf), stdin) != NULL) + syslog(pri, "%s", buf); exit(0); } -#define SYSLOG_NAMES -#include - /* * Decode a symbolic name to a numeric value */ +int pencode(s) register char *s; { @@ -129,8 +146,11 @@ pencode(s) if (*s) { *s = '\0'; fac = decode(save, facilitynames); - if (fac < 0) - bailout("unknown facility name: ", save); + if (fac < 0) { + (void)fprintf(stderr, + "logger: unknown facility name: %s.\n", save); + exit(1); + } *s++ = '.'; } else { @@ -138,12 +158,15 @@ pencode(s) s = save; } lev = decode(s, prioritynames); - if (lev < 0) - bailout("unknown priority name: ", save); + if (lev < 0) { + (void)fprintf(stderr, + "logger: unknown priority name: %s.\n", save); + exit(1); + } return ((lev & LOG_PRIMASK) | (fac & LOG_FACMASK)); } - +int decode(name, codetab) char *name; CODE *codetab; @@ -160,16 +183,10 @@ decode(name, codetab) return (-1); } -bailout(msg, arg) - char *msg, *arg; -{ - fprintf(stderr, "logger: %s%s\n", msg, arg); - exit(1); -} - +void usage() { - fputs("logger: [-i] [-f file] [-p pri] [-t tag] [ message ... ]\n", - stderr); + (void)fprintf(stderr, + "logger: [-is] [-f file] [-p pri] [-t tag] [ message ... ]\n"); exit(1); }