diff options
author | Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> | 2019-06-02 10:41:21 -0500 |
---|---|---|
committer | Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> | 2019-06-02 10:41:21 -0500 |
commit | 64e7c98da14a562076ccef7ddb258200f1ea6196 (patch) | |
tree | f61cbd9014f2e4f4d590e2c3b8bed4f6d1ac683d | |
parent | 1ea005b61455a6862ed62206d90bd50bd1e6ec31 (diff) | |
download | userland-64e7c98da14a562076ccef7ddb258200f1ea6196.tar.gz userland-64e7c98da14a562076ccef7ddb258200f1ea6196.tar.bz2 userland-64e7c98da14a562076ccef7ddb258200f1ea6196.tar.xz userland-64e7c98da14a562076ccef7ddb258200f1ea6196.zip |
usr.bin/logger; removed; it is available in util-linux
-rw-r--r-- | usr.bin/logger/logger.1 | 117 | ||||
-rw-r--r-- | usr.bin/logger/logger.c | 203 |
2 files changed, 0 insertions, 320 deletions
diff --git a/usr.bin/logger/logger.1 b/usr.bin/logger/logger.1 deleted file mode 100644 index da47b68..0000000 --- a/usr.bin/logger/logger.1 +++ /dev/null @@ -1,117 +0,0 @@ -.\" $NetBSD: logger.1,v 1.15 2012/05/13 17:08:31 njoly Exp $ -.\" -.\" Copyright (c) 1983, 1990, 1993 -.\" The Regents of the University of California. All rights reserved. -.\" -.\" 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. 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. -.\" -.\" @(#)logger.1 8.1 (Berkeley) 6/6/93 -.\" -.Dd April 26, 2012 -.Dt LOGGER 1 -.Os -.Sh NAME -.Nm logger -.Nd make entries in the system log -.Sh SYNOPSIS -.Nm -.Op Fl cins -.Op Fl d Ar SD -.Op Fl f Ar file -.Op Fl m Ar msgid -.Op Fl p Ar pri -.Op Fl t Ar tag -.Op Ar message ... -.Sh DESCRIPTION -.Nm -provides a shell command interface to the -.Xr syslog 3 -system log module. -.Pp -Options: -.Pp -.Bl -tag -width "messageXX" -.It Fl c -Log to console -.Dv ( LOG_CONS ) . -.It Fl d Ar sd -Log this in the structured data (SD) field. -.Po -.Ar sd -has to be passed as one argument and will require careful quoting when used from -the shell. -.Pc -.It Fl f Ar file -Log the specified file. -.It Fl i -Log the process id of the logger process -with each line -.Dv ( LOG_PID ) . -.It Fl m Ar msgid -The MSGID used for the message. -.It Fl n -Open log file immediately -.Dv ( LOG_NDELAY ) . -.It Fl p Ar pri -Enter the message with the specified priority. -The priority may be specified numerically or as a -.Dq facility.level -pair. -For example, -.Dq \-p local3.info -logs the message(s) as -.Ar info Ns rmational -level in the -.Ar local3 -facility. -The default is -.Dq user.notice . -.It Fl s -Log the message to standard error, as well as the system log -.Dv ( LOG_PERROR ) . -.It Fl t Ar tag -Mark every line in the log with the specified -.Ar tag . -.It Ar message -Write the message to log; if not specified, and the -.Fl f -flag is not provided, standard input is logged. -.El -.Sh EXIT STATUS -.Ex -std logger -.Sh EXAMPLES -.Bd -literal -offset indent -compact -logger System rebooted - -logger \-p local0.notice \-t HOSTIDM \-f /dev/idmc -.Ed -.Sh SEE ALSO -.Xr syslog 3 , -.Xr syslogd 8 -.Sh STANDARDS -The -.Nm -utility conforms to -.St -p1003.2-92 . diff --git a/usr.bin/logger/logger.c b/usr.bin/logger/logger.c deleted file mode 100644 index b87aa5d..0000000 --- a/usr.bin/logger/logger.c +++ /dev/null @@ -1,203 +0,0 @@ -/* $NetBSD: logger.c,v 1.17 2012/04/27 06:30:48 wiz Exp $ */ - -/* - * Copyright (c) 1983, 1993 - * The Regents of the University of California. All rights reserved. - * - * 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. 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. - */ - -#include <sys/cdefs.h> -#ifndef lint -__COPYRIGHT("@(#) Copyright (c) 1983, 1993\ - The Regents of the University of California. All rights reserved."); -#endif /* not lint */ - -#ifndef lint -#if 0 -static char sccsid[] = "@(#)logger.c 8.1 (Berkeley) 6/6/93"; -#endif -__RCSID("$NetBSD: logger.c,v 1.17 2012/04/27 06:30:48 wiz Exp $"); -#endif /* not lint */ - -#include <errno.h> -#include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <ctype.h> -#include <string.h> -#include <err.h> - -#define SYSLOG_NAMES -#include <syslog.h> - -static int decode(const char *, const CODE *); -static int pencode(char *); -__dead static void usage(void); - -/* - * logger -- read and log utility - * - * Reads from an input and arranges to write the result on the system - * log. - */ -int -main(int argc, char *argv[]) -{ - int ch, logflags, pri; - const char *tag; - const char *sd = "-"; - const char *msgid = "-"; - char buf[1024]; - - tag = NULL; - pri = LOG_NOTICE; - logflags = 0; - while ((ch = getopt(argc, argv, "cd:f:im:np:st:")) != -1) - switch((char)ch) { - case 'c': /* log to console */ - logflags |= LOG_CONS; - break; - case 'd': /* structured data field */ - sd = optarg; - break; - case 'f': /* file to log */ - if (freopen(optarg, "r", stdin) == NULL) - err(EXIT_FAILURE, "%s", optarg); - break; - case 'i': /* log process id also */ - logflags |= LOG_PID; - break; - case 'm': /* msgid field */ - msgid = optarg; - break; - case 'n': /* open log file immediately */ - logflags |= LOG_NDELAY; - break; - case 'p': /* priority */ - pri = pencode(optarg); - break; - case 's': /* log to standard error */ - logflags |= LOG_PERROR; - break; - case 't': /* tag */ - tag = optarg; - break; - case '?': - default: - usage(); - } - argc -= optind; - argv += optind; - - /* setup for logging */ - openlog(tag != NULL ? tag : getlogin(), logflags, 0); - (void)fclose(stdout); - - /* log input line if appropriate */ - if (argc > 0) { - char *p, *endp; - size_t len; - - for (p = buf, endp = buf + sizeof(buf) - 2; *argv != NULL;) { - len = strlen(*argv); - if (p + len > endp && p > buf) { - syslogp(pri, msgid, sd, "%s", buf); - p = buf; - } - if (len > sizeof(buf) - 1) - syslogp(pri, msgid, sd, "%s", *argv++); - else { - if (p != buf) - *p++ = ' '; - memmove(p, *argv++, len); - *(p += len) = '\0'; - } - } - if (p != buf) - syslogp(pri, msgid, sd, "%s", buf); - } else /* TODO: allow syslog-protocol messages from file/stdin - * but that will require parsing the line to split - * it into three fields. - */ - while (fgets(buf, sizeof(buf), stdin) != NULL) - syslogp(pri, msgid, sd, "%s", buf); - - exit(EXIT_SUCCESS); - /* NOTREACHED */ -} - -/* - * Decode a symbolic name to a numeric value - */ -static int -pencode(char *s) -{ - char *save; - int fac, lev; - - for (save = s; *s != '\0' && *s != '.'; ++s) - ; - if (*s != '\0') { - *s = '\0'; - fac = decode(save, facilitynames); - if (fac < 0) - errx(EXIT_FAILURE, "unknown facility name: %s", save); - *s++ = '.'; - } else { - fac = 0; - s = save; - } - lev = decode(s, prioritynames); - if (lev < 0) - errx(EXIT_FAILURE, "unknown priority name: %s", s); - return ((lev & LOG_PRIMASK) | (fac & LOG_FACMASK)); -} - -static int -decode(const char *name, const CODE *codetab) -{ - const CODE *c; - - if (isdigit((unsigned char)*name)) - return (atoi(name)); - - for (c = codetab; c->c_name != NULL; c++) - if (strcasecmp(name, c->c_name) == 0) - return (c->c_val); - - return (-1); -} - -static void -usage(void) -{ - - (void)fprintf(stderr, - "Usage: %s [-cins] [-d SD] [-f file] [-m msgid] " - "[-p pri] [-t tag] [message ...]\n", - getprogname()); - exit(EXIT_FAILURE); -} |