/*
* Mini logger implementation for busybox
*
- * Copyright (C) 1999,2000 by Lineo, inc.
- * Written by Erik Andersen <andersen@lineo.com>, <andersee@debian.org>
+ * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
*
* 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
*
*/
-#include "busybox.h"
#include <stdio.h>
#include <unistd.h>
#include <sys/types.h>
#include <fcntl.h>
#include <ctype.h>
+#include <string.h>
+#include <stdlib.h>
-#if !defined BB_SYSLOGD
+#include "busybox.h"
+#if !defined CONFIG_SYSLOGD
#define SYSLOG_NAMES
#include <sys/syslog.h>
#else
-/* We have to do this since the header file defines static
- * structues. Argh.... bad libc, bad, bad...
- */
#include <sys/syslog.h>
-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)
{
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)
{
if (*s) {
*s = '\0';
fac = decode(save, facilitynames);
- if (fac < 0) {
- errorMsg("unknown facility name: %s\n", save);
- exit(FALSE);
- }
+ if (fac < 0)
+ bb_error_msg_and_die("unknown facility name: %s", save);
*s++ = '.';
} else {
s = save;
}
lev = decode(s, prioritynames);
- if (lev < 0) {
- errorMsg("unknown priority name: %s\n", save);
- exit(FALSE);
- }
+ if (lev < 0)
+ bb_error_msg_and_die("unknown priority name: %s", save);
return ((lev & LOG_PRIMASK) | (fac & LOG_FACMASK));
}
{
int pri = LOG_USER | LOG_NOTICE;
int option = 0;
- int fromStdinFlag = FALSE;
- int stopLookingAtMeLikeThat = FALSE;
- char *message=NULL, buf[1024], name[128];
+ int c, i, opt;
+ char buf[1024], name[128];
- /* Fill out the name string early (may be overwritten later */
- my_getpwuid(name, geteuid());
+ /* Fill out the name string early (may be overwritten later) */
+ my_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) {
+ 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;
+ safe_strncpy(name, optarg, sizeof(name));
break;
default:
- usage(logger_usage);
- }
+ bb_show_usage();
}
}
- 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;
+ openlog(name, option, 0);
+ 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);
+ }
+ } while (c != EOF);
} else {
- if (argc >= 1) {
- message = *argv;
- } else {
- errorMsg("No message\n");
- exit(FALSE);
+ 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);
}
- openlog(name, option, (pri | LOG_FACMASK));
- syslog(pri, message);
closelog();
-
- return(TRUE);
+ 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. <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.
+ */
+
+
+
projects / oweals / busybox.git / blobdiff