X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=logger.c;h=b8aae3d28d9b0bf518c3dc492db3e98954f8dca0;hb=3a6da8c183142a2681a2382b63e970f457cf807b;hp=bd9eed9f6555fa67323e36024eb1dc00ae6f164b;hpb=3180413e7643dcb9ae38a617bf531557f64b3c57;p=oweals%2Fbusybox.git diff --git a/logger.c b/logger.c index bd9eed9f6..b8aae3d28 100644 --- a/logger.c +++ b/logger.c @@ -2,7 +2,7 @@ /* * Mini logger implementation for busybox * - * Copyright (C) 1999,2000 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 @@ -21,13 +21,15 @@ * */ -#include "busybox.h" #include #include #include #include #include +#include +#include +#include "busybox.h" #if !defined BB_SYSLOGD #define SYSLOG_NAMES @@ -35,9 +37,10 @@ #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; @@ -50,6 +53,8 @@ extern CODE facilitynames[]; * 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) { @@ -70,6 +75,8 @@ static int decode(char *name, CODE * codetab) * 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) { @@ -81,14 +88,14 @@ static int pencode(char *s) *s = '\0'; fac = decode(save, facilitynames); if (fac < 0) - fatalError("unknown facility name: %s\n", save); + error_msg_and_die("unknown facility name: %s", save); *s++ = '.'; } else { s = save; } lev = decode(s, prioritynames); if (lev < 0) - fatalError("unknown priority name: %s\n", save); + error_msg_and_die("unknown priority name: %s", save); return ((lev & LOG_PRIMASK) | (fac & LOG_FACMASK)); } @@ -97,63 +104,92 @@ extern int logger_main(int argc, char **argv) { int pri = LOG_USER | LOG_NOTICE; int option = 0; - int fromStdinFlag = FALSE; - int stopLookingAtMeLikeThat = FALSE; + int c, i, len, opt; char *message=NULL, buf[1024], name[128]; - /* Fill out the name string early (may be overwritten later */ + /* Fill out the name string early (may be overwritten later) */ my_getpwuid(name, geteuid()); /* Parse any options */ - while (--argc > 0 && **(++argv) == '-') { - if (*((*argv) + 1) == '\0') { - fromStdinFlag = TRUE; - } - stopLookingAtMeLikeThat = FALSE; - while (*(++(*argv)) && stopLookingAtMeLikeThat == FALSE) { - switch (**argv) { + while ((opt = getopt(argc, argv, "p:st:")) > 0) { + switch (opt) { case 's': option |= LOG_PERROR; break; case 'p': - if (--argc == 0) { - usage(logger_usage); - } - pri = pencode(*(++argv)); - stopLookingAtMeLikeThat = TRUE; + pri = pencode(optarg); break; case 't': - if (--argc == 0) { - usage(logger_usage); - } - strncpy(name, *(++argv), sizeof(name)); - stopLookingAtMeLikeThat = TRUE; + strncpy(name, optarg, sizeof(name)); break; default: - usage(logger_usage); - } + show_usage(); } } - if (fromStdinFlag == TRUE) { + if (optind == argc) { /* read from stdin */ - int c; - unsigned int i = 0; - + i = 0; while ((c = getc(stdin)) != EOF && i < sizeof(buf)) { buf[i++] = c; } + buf[i++] = '\0'; message = buf; } else { - if (argc >= 1) - message = *argv; - else - fatalError("No message\n"); + 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'; } - openlog(name, option, (pri | LOG_FACMASK)); - syslog(pri, message); - closelog(); - + /*openlog(name, option, (pri | LOG_FACMASK)); + syslog(pri, "%s", message); + closelog();*/ + syslog_msg_with_name(name,(pri | LOG_FACMASK),pri,message); return EXIT_SUCCESS; } + + +/*- + * 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. + */ + + +