From 4aca87515a5083ae0e31ce3177189fd43b6d05ac Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Sat, 3 Jan 2015 13:58:15 +0100 Subject: patch to Vanilla Tomato 1.28 --- release/src/router/busybox/sysklogd/logger.c | 168 ++++++++++----------------- 1 file changed, 60 insertions(+), 108 deletions(-) (limited to 'release/src/router/busybox/sysklogd/logger.c') diff --git a/release/src/router/busybox/sysklogd/logger.c b/release/src/router/busybox/sysklogd/logger.c index 252cfc49..759981c7 100644 --- a/release/src/router/busybox/sysklogd/logger.c +++ b/release/src/router/busybox/sysklogd/logger.c @@ -2,76 +2,42 @@ /* * 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 - +/* + * Done in syslogd_and_logger.c: +#include "libbb.h" #define SYSLOG_NAMES -#include - -#else -#include -# 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 +#define SYSLOG_NAMES_CONST +#include +*/ -/* 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) +static int decode(char *name, const CODE *codetab) { - CODE *c; + const 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,87 +49,76 @@ 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)); } +#define strbuf bb_common_bufsiz1 -extern int logger_main(int argc, char **argv) +int logger_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; +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 *str_p, *str_t; + int opt; + int i = 0; /* Fill out the name string early (may be overwritten later) */ - my_getpwuid(name, geteuid()); + str_t = uid2uname_utoa(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': - 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); + opt = getopt32(argv, "p:st:", &str_p, &str_t); + + if (opt & 0x2) /* -s */ + i |= LOG_PERROR; + //if (opt & 0x4) /* -t */ + openlog(str_t, i, 0); + i = LOG_USER | LOG_NOTICE; + if (opt & 0x1) /* -p */ + i = pencode(str_p); + + argc -= optind; + argv += optind; + if (!argc) { + while (fgets(strbuf, COMMON_BUFSIZE, stdin)) { + if (strbuf[0] + && NOT_LONE_CHAR(strbuf, '\n') + ) { + /* Neither "" nor "\n" */ + syslog(i, "%s", strbuf); } - } 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); - message = xrealloc(message, len); - if(!i) - message[0] = 0; - else - strcat(message, " "); - strcat(message, *argv); - argv++; - } - syslog(pri, "%s", message); + int len = 0; + int pos = 0; + do { + len += strlen(*argv) + 1; + message = xrealloc(message, len + 1); + sprintf(message + pos, " %s", *argv), + pos = len; + } while (*++argv); + syslog(i, "%s", message + 1); /* skip leading " " */ } closelog(); return EXIT_SUCCESS; } +/* Clean up. Needed because we are included from syslogd_and_logger.c */ +#undef strbuf /*- * Copyright (c) 1983, 1993 @@ -180,8 +135,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 +154,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. */ - - - -- cgit v1.2.3-54-g00ecf