X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=logger.c;h=b8aae3d28d9b0bf518c3dc492db3e98954f8dca0;hb=3a6da8c183142a2681a2382b63e970f457cf807b;hp=5ef622dc31e593a0f09492d1b3c4d48190e92d54;hpb=1c5b2589d1287008899c07f45541286fe8c37508;p=oweals%2Fbusybox.git diff --git a/logger.c b/logger.c index 5ef622dc3..b8aae3d28 100644 --- a/logger.c +++ b/logger.c @@ -1,7 +1,8 @@ +/* vi: set sw=4 ts=4: */ /* * Mini logger implementation for busybox * - * Copyright (C) 1999 by Lineo, inc. + * Copyright (C) 1999,2000,2001 by Lineo, inc. * Written by Erik Andersen , * * This program is free software; you can redistribute it and/or modify @@ -20,19 +21,15 @@ * */ -#include "internal.h" #include -#include -#include #include -#include #include -#include #include -#include #include -#include +#include +#include +#include "busybox.h" #if !defined BB_SYSLOGD #define SYSLOG_NAMES @@ -40,156 +37,159 @@ #else /* We have to do this since the header file defines static - * structues. Argh.... bad libc, bad, bad... + * structures. Argh.... bad libc, bad, bad... */ #include + typedef struct _code { - char *c_name; - int c_val; + char *c_name; + int c_val; } CODE; extern CODE prioritynames[]; extern CODE facilitynames[]; #endif -static const char logger_usage[] = - "logger [OPTION]... [MESSAGE]\n\n" - "Write MESSAGE to the system log. If MESSAGE is '-', log stdin.\n\n" - "Options:\n" - "\t-s\tLog to stderr as well as the system log.\n" - "\t-p\tEnter the message with the specified priority.\n" - "\t\tThis may be numerical or a ``facility.level'' pair.\n"; - - /* Decode a symbolic name to a numeric value * this function is based on code * Copyright (c) 1983, 1993 * The Regents of the University of California. All rights reserved. + * + * Original copyright notice is retained at the end of this file. */ -static int -decode(char* name, CODE* codetab) +static int decode(char *name, CODE * codetab) { - CODE *c; + CODE *c; - if (isdigit(*name)) - return (atoi(name)); - for (c = codetab; c->c_name; c++) { - if (!strcasecmp(name, c->c_name)) { - return (c->c_val); + if (isdigit(*name)) + return (atoi(name)); + for (c = codetab; c->c_name; c++) { + if (!strcasecmp(name, c->c_name)) { + return (c->c_val); + } } - } - return (-1); + return (-1); } /* Decode a symbolic name to a numeric value * this function is based on code * Copyright (c) 1983, 1993 * The Regents of the University of California. All rights reserved. + * + * Original copyright notice is retained at the end of this file. */ -static int -pencode(char* s) +static int pencode(char *s) { - char *save; - int lev, fac=LOG_USER; - - for (save = s; *s && *s != '.'; ++s); - if (*s) { - *s = '\0'; - fac = decode(save, facilitynames); - if (fac < 0) { - fprintf(stderr, "unknown facility name: %s\n", save); - exit( FALSE); + char *save; + int lev, fac = LOG_USER; + + for (save = s; *s && *s != '.'; ++s); + if (*s) { + *s = '\0'; + fac = decode(save, facilitynames); + if (fac < 0) + error_msg_and_die("unknown facility name: %s", save); + *s++ = '.'; + } else { + s = save; } - *s++ = '.'; - } - else { - s = save; - } - lev = decode(s, prioritynames); - if (lev < 0) { - fprintf(stderr, "unknown priority name: %s\n", save); - exit( FALSE); - } - return ((lev & LOG_PRIMASK) | (fac & LOG_FACMASK)); + lev = decode(s, prioritynames); + if (lev < 0) + error_msg_and_die("unknown priority name: %s", save); + return ((lev & LOG_PRIMASK) | (fac & LOG_FACMASK)); } extern int logger_main(int argc, char **argv) { - struct sockaddr_un sunx; - int fd, pri = LOG_USER|LOG_NOTICE; - int fromStdinFlag=FALSE; - int toStdErrFlag=FALSE; - int stopLookingAtMeLikeThat=FALSE; - char *message, buf[1024], buf1[1024]; - time_t now; - size_t addrLength; - - /* Parse any options */ - while (--argc > 0 && **(++argv) == '-') { - if (*((*argv)+1) == '\0') { - fromStdinFlag=TRUE; - } - stopLookingAtMeLikeThat=FALSE; - while (*(++(*argv)) && stopLookingAtMeLikeThat==FALSE) { - switch (**argv) { - case 's': - toStdErrFlag = TRUE; - break; - case 'p': - if (--argc == 0) { - usage(logger_usage); + int pri = LOG_USER | LOG_NOTICE; + int option = 0; + int c, i, len, opt; + char *message=NULL, buf[1024], name[128]; + + /* Fill out the name string early (may be overwritten later) */ + my_getpwuid(name, geteuid()); + + /* Parse any options */ + while ((opt = getopt(argc, argv, "p:st:")) > 0) { + switch (opt) { + case 's': + option |= LOG_PERROR; + break; + case 'p': + pri = pencode(optarg); + break; + case 't': + strncpy(name, optarg, sizeof(name)); + break; + default: + show_usage(); } - pri = pencode(*(++argv)); - stopLookingAtMeLikeThat=TRUE; - break; - default: - usage(logger_usage); - } - } - } - - if (fromStdinFlag==TRUE) { - /* read from stdin */ - int i=0; - char c; - while ((c = getc(stdin)) != EOF && i=1) { - message=*argv; + + if (optind == argc) { + /* read from stdin */ + i = 0; + while ((c = getc(stdin)) != EOF && i < sizeof(buf)) { + buf[i++] = c; + } + buf[i++] = '\0'; + message = buf; } else { - fprintf(stderr, "No message\n"); - exit( FALSE); + len = 1; /* for the '\0' */ + message=xcalloc(1, 1); + for (i = optind; i < argc; i++) { + len += strlen(argv[i]); + len += 1; /* for the space between the args */ + message = xrealloc(message, len); + strcat(message, argv[i]); + strcat(message, " "); + } + message[strlen(message)-1] = '\0'; } - } - memset(&sunx, 0, sizeof(sunx)); - sunx.sun_family = AF_UNIX; /* Unix domain socket */ - strncpy(sunx.sun_path, _PATH_LOG, sizeof(sunx.sun_path)); - if ((fd = socket(PF_UNIX, SOCK_STREAM, 0)) < 0 ) { - perror("Couldn't obtain descriptor for socket " _PATH_LOG); - exit( FALSE); - } - - addrLength = sizeof(sunx.sun_family) + strlen(sunx.sun_path); + /*openlog(name, option, (pri | LOG_FACMASK)); + syslog(pri, "%s", message); + closelog();*/ + syslog_msg_with_name(name,(pri | LOG_FACMASK),pri,message); + return EXIT_SUCCESS; +} - if (connect(fd, (struct sockaddr *) &sunx, addrLength)) { - perror("Could not connect to socket " _PATH_LOG); - exit( FALSE); - } - time(&now); - snprintf (buf, sizeof(buf), "<%d>%.15s %s", pri, ctime(&now)+4, message); - - if (toStdErrFlag==TRUE) - fprintf(stderr, "%s\n", buf); +/*- + * Copyright (c) 1983, 1993 + * The Regents of the University of California. All rights reserved. + * + * This is the original license statement for the decode and pencode functions. + * + * 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. + * + * 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. + */ - write( fd, buf, sizeof(buf)); - close(fd); - exit( TRUE); -}