X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=sysklogd%2Flogger.c;h=c5e17c2e5c9b224073c538a608082a252bc06c96;hb=62a6983a818ce701b924f84bf23716c4fbff170a;hp=1ed6dc639289076bc0dadd3691a53fd515a65089;hpb=f57c944e09417edcbcd69f2b01b937cadef39db2;p=oweals%2Fbusybox.git diff --git a/sysklogd/logger.c b/sysklogd/logger.c index 1ed6dc639..c5e17c2e5 100644 --- a/sysklogd/logger.c +++ b/sysklogd/logger.c @@ -2,55 +2,38 @@ /* * Mini logger implementation for busybox * - * Copyright (C) 1999,2000 by Lineo, inc. - * Written by Erik Andersen , - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Copyright (C) 1999-2004 by Erik Andersen * + * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ #include "busybox.h" -#include -#include -#include -#include -#include -#if !defined BB_SYSLOGD +#if !defined CONFIG_SYSLOGD #define SYSLOG_NAMES #include #else -/* We have to do this since the header file defines static - * structues. Argh.... bad libc, bad, bad... - */ #include -typedef struct _code { - char *c_name; - int c_val; -} CODE; -extern CODE prioritynames[]; -extern CODE facilitynames[]; +# ifndef __dietlibc__ + /* We have to do this since the header file defines static + * structures. Argh.... bad libc, bad, bad... + */ + typedef struct _code { + char *c_name; + int c_val; + } CODE; + extern CODE prioritynames[]; + extern CODE facilitynames[]; +# endif #endif -/* Decode a symbolic name to a numeric value +/* 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) @@ -58,17 +41,17 @@ static int decode(char *name, CODE * codetab) CODE *c; if (isdigit(*name)) - return (atoi(name)); + return atoi(name); for (c = codetab; c->c_name; c++) { if (!strcasecmp(name, c->c_name)) { - return (c->c_val); + return c->c_val; } } - return (-1); + return -1; } -/* Decode a symbolic name to a numeric value +/* 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. @@ -80,85 +63,72 @@ static int pencode(char *s) char *save; int lev, fac = LOG_USER; - for (save = s; *s && *s != '.'; ++s); + 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\n", save); + bb_error_msg_and_die("unknown %s name: %s", "facility", save); *s++ = '.'; } else { s = save; } lev = decode(s, prioritynames); if (lev < 0) - error_msg_and_die("unknown priority name: %s\n", save); + bb_error_msg_and_die("unknown %s name: %s", "priority", save); return ((lev & LOG_PRIMASK) | (fac & LOG_FACMASK)); } -extern int logger_main(int argc, char **argv) +int logger_main(int argc, char **argv) { - int pri = LOG_USER | LOG_NOTICE; - int option = 0; - int fromStdinFlag = FALSE; - int stopLookingAtMeLikeThat = FALSE; - char *message=NULL, buf[1024], name[128]; + char *opt_p, *opt_t; + int i = 0; + RESERVE_CONFIG_BUFFER(name, 80); - /* Fill out the name string early (may be overwritten later */ - my_getpwuid(name, geteuid()); + /* Fill out the name string early (may be overwritten later) */ + bb_getpwuid(name, geteuid(), sizeof(name)); /* Parse any options */ - while (--argc > 0 && **(++argv) == '-') { - if (*((*argv) + 1) == '\0') { - fromStdinFlag = TRUE; - } - stopLookingAtMeLikeThat = FALSE; - while (*(++(*argv)) && stopLookingAtMeLikeThat == FALSE) { - switch (**argv) { - case 's': - option |= LOG_PERROR; - break; - case 'p': - if (--argc == 0) { - usage(logger_usage); - } - pri = pencode(*(++argv)); - stopLookingAtMeLikeThat = TRUE; - break; - case 't': - if (--argc == 0) { - usage(logger_usage); - } - strncpy(name, *(++argv), sizeof(name)); - stopLookingAtMeLikeThat = TRUE; - break; - default: - usage(logger_usage); + getopt32(argc, argv, "p:st:", &opt_p, &opt_t); + + if (option_mask32 & 0x2) /* -s */ + i |= LOG_PERROR; + if (option_mask32 & 0x4) /* -t */ + safe_strncpy(name, opt_t, sizeof(name)); + openlog(name, i, 0); + if (ENABLE_FEATURE_CLEAN_UP) + RELEASE_CONFIG_BUFFER(name); + i = LOG_USER | LOG_NOTICE; + if (option_mask32 & 0x1) /* -p */ + i = pencode(opt_p); + + argc -= optind; + argv += optind; + if (!argc) { + while (fgets(bb_common_bufsiz1, BUFSIZ, stdin)) { + if (bb_common_bufsiz1[0] + && NOT_LONE_CHAR(bb_common_bufsiz1, '\n') + ) { + /* Neither "" nor "\n" */ + syslog(i, "%s", bb_common_bufsiz1); } } - } - - if (fromStdinFlag == TRUE) { - /* read from stdin */ - int c; - unsigned int i = 0; - - while ((c = getc(stdin)) != EOF && i < sizeof(buf)) { - buf[i++] = c; - } - message = buf; } else { - if (argc >= 1) - message = *argv; - else - error_msg_and_die("No message\n"); + char *message = NULL; + int len = 1; /* for NUL */ + int pos = 0; + do { + len += strlen(*argv) + 1; + message = xrealloc(message, len); + sprintf(message + pos, " %s", *argv), + pos = len; + } while (*++argv); + syslog(i, "%s", message + 1); /* skip leading " " */ } - openlog(name, option, (pri | LOG_FACMASK)); - syslog(pri, "%s", message); closelog(); - return EXIT_SUCCESS; } @@ -178,8 +148,8 @@ extern int logger_main(int argc, char **argv) * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * 3. + * 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 @@ -197,6 +167,3 @@ extern int logger_main(int argc, char **argv) * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ - - -