X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;ds=sidebyside;f=sysklogd%2Flogger.c;h=5a7027731481c90598dabdd36ba257eb81912d18;hb=257a77568ab452244de55d4cd35ba39541fce2a7;hp=bd9eed9f6555fa67323e36024eb1dc00ae6f164b;hpb=3180413e7643dcb9ae38a617bf531557f64b3c57;p=oweals%2Fbusybox.git diff --git a/sysklogd/logger.c b/sysklogd/logger.c index bd9eed9f6..5a7027731 100644 --- a/sysklogd/logger.c +++ b/sysklogd/logger.c @@ -2,158 +2,165 @@ /* * 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 source tree. */ -#include "busybox.h" -#include -#include -#include -#include -#include - -#if !defined BB_SYSLOGD +//usage:#define logger_trivial_usage +//usage: "[OPTIONS] [MESSAGE]" +//usage:#define logger_full_usage "\n\n" +//usage: "Write MESSAGE (or stdin) to syslog\n" +//usage: "\n -s Log to stderr as well as the system log" +//usage: "\n -t TAG Log using the specified tag (defaults to user name)" +//usage: "\n -p PRIO Priority (numeric or facility.level pair)" +//usage: +//usage:#define logger_example_usage +//usage: "$ logger \"hello\"\n" +/* + * Done in syslogd_and_logger.c: +#include "libbb.h" #define SYSLOG_NAMES -#include +#define SYSLOG_NAMES_CONST +#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[]; -#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) +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. + * + * Original copyright notice is retained at the end of this file. */ 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) - fatalError("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) - fatalError("unknown priority name: %s\n", 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 UNUSED_PARAM, 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 *str_p, *str_t; + int opt; + int i = 0; - /* Fill out the name string early (may be overwritten later */ - my_getpwuid(name, geteuid()); + /* Fill out the name string early (may be overwritten later) */ + str_t = uid2uname_utoa(geteuid()); /* 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); + 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); + + argv += optind; + if (!argv[0]) { + while (fgets(strbuf, COMMON_BUFSIZE, stdin)) { + if (strbuf[0] + && NOT_LONE_CHAR(strbuf, '\n') + ) { + /* Neither "" nor "\n" */ + syslog(i, "%s", strbuf); } } - } - - 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 - fatalError("No message\n"); + char *message = NULL; + 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 " " */ } - openlog(name, option, (pri | LOG_FACMASK)); - syslog(pri, message); closelog(); - return EXIT_SUCCESS; } + +/* Clean up. Needed because we are included from syslogd_and_logger.c */ +#undef strbuf + +/*- + * 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. BSD Advertising Clause omitted per the July 22, 1999 licensing change + * ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change + * + * 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. + */