X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=sysklogd%2Flogger.c;h=c5e17c2e5c9b224073c538a608082a252bc06c96;hb=62a6983a818ce701b924f84bf23716c4fbff170a;hp=252cfc494e24237bec18e283db686cd1534aa888;hpb=cb81e6484d1f50ec2761f6294722407b14add525;p=oweals%2Fbusybox.git diff --git a/sysklogd/logger.c b/sysklogd/logger.c index 252cfc494..c5e17c2e5 100644 --- a/sysklogd/logger.c +++ b/sysklogd/logger.c @@ -2,33 +2,13 @@ /* * Mini logger implementation for busybox * - * Copyright (C) 1999-2003 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 -#include -#include -#include -#include -#include -#include - #include "busybox.h" + #if !defined CONFIG_SYSLOGD #define SYSLOG_NAMES @@ -49,11 +29,11 @@ # 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) @@ -61,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. @@ -83,81 +63,69 @@ 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) - bb_error_msg_and_die("unknown facility name: %s", save); + bb_error_msg_and_die("unknown %s name: %s", "facility", save); *s++ = '.'; } else { s = save; } lev = decode(s, prioritynames); if (lev < 0) - bb_error_msg_and_die("unknown priority name: %s", 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 c, i, opt; - char 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()); + bb_getpwuid(name, geteuid(), sizeof(name)); /* 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': - safe_strncpy(name, optarg, sizeof(name)); - break; - default: - bb_show_usage(); - } - } - - openlog(name, option, (pri | LOG_FACMASK)); - if (optind == argc) { - do { - /* read from stdin */ - i = 0; - while ((c = getc(stdin)) != EOF && c != '\n' && - i < (sizeof(buf)-1)) { - buf[i++] = c; - } - if (i > 0) { - buf[i++] = '\0'; - syslog(pri, "%s", buf); + 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); } - } while (c != EOF); + } } else { char *message = NULL; - int len = argc - optind; /* for the space between the args - and '\0' */ - opt = len; - argv += optind; - for (i = 0; i < opt; i++) { - len += strlen(*argv); + int len = 1; /* for NUL */ + int pos = 0; + do { + len += strlen(*argv) + 1; message = xrealloc(message, len); - if(!i) - message[0] = 0; - else - strcat(message, " "); - strcat(message, *argv); - argv++; - } - syslog(pri, "%s", message); + sprintf(message + pos, " %s", *argv), + pos = len; + } while (*++argv); + syslog(i, "%s", message + 1); /* skip leading " " */ } closelog(); @@ -180,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 @@ -199,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. */ - - -