* archival/bunzip2.c (bunzip2_main): Do not remove files if writing to standard

[oweals/busybox.git] / sysklogd / logger.c

diff --git a/sysklogd/logger.c b/sysklogd/logger.c
index 2c460cc077741cd21307140d1d4e4b8ddf49c542..380bde5ca8a2dce2725c90410d8c8ea217b2d818 100644 (file)
--- a/sysklogd/logger.c
+++ b/sysklogd/logger.c
@@ -2,8 +2,8 @@
 /*
  * 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,2000 by Lineo, inc. and Erik Andersen
+ * Copyright (C) 1999,2000,2001 by Erik Andersen <andersee@debian.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
@@ -21,29 +21,33 @@
  *
  */
 
-#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 
@@ -85,14 +89,14 @@ static int pencode(char *s)
                *s = '\0';
                fac = decode(save, facilitynames);
                if (fac < 0)
-                       fatalError("unknown facility name: %s\n", save);
+                       error_msg_and_die("unknown facility name: %s", save);
                *s++ = '.';
        } else {
                s = save;
        }
        lev = decode(s, prioritynames);
        if (lev < 0)
-               fatalError("unknown priority name: %s\n", save);
+               error_msg_and_die("unknown priority name: %s", save);
        return ((lev & LOG_PRIMASK) | (fac & LOG_FACMASK));
 }
 
@@ -101,64 +105,58 @@ extern int logger_main(int argc, char **argv)
 {
        int pri = LOG_USER | LOG_NOTICE;
        int option = 0;
-       int fromStdinFlag = FALSE;
-       int stopLookingAtMeLikeThat = FALSE;
+       int c, i, len, opt;
        char *message=NULL, buf[1024], name[128];
 
-       /* Fill out the name string early (may be overwritten later */
+       /* Fill out the name string early (may be overwritten later) */
        my_getpwuid(name, geteuid());
 
        /* 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;
+                               strncpy(name, optarg, sizeof(name));
                                break;
                        default:
-                               usage(logger_usage);
-                       }
+                               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, (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);
+                       }
+               } while (c != EOF);
        } else {
-               if (argc >= 1)
-                       message = *argv;
-               else
-                       fatalError("No message\n");
+               len = 1; /* for the '\0' */
+               message=xcalloc(1, 1);
+               for (i = optind; i < argc; i++) {
+                       len += strlen(argv[i]);
+                       len += 1;  /* for the space between the args */
+                       message = xrealloc(message, len);
+                       strcat(message, argv[i]);
+                       strcat(message, " ");
+               }
+               message[strlen(message)-1] = '\0';
+               syslog(pri, "%s", message);
        }
 
-       openlog(name, option, (pri | LOG_FACMASK));
-       syslog(pri, message);
        closelog();
-
        return EXIT_SUCCESS;
 }