tcpudp: trivial build fix

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

diff --git a/sysklogd/logger.c b/sysklogd/logger.c
index 8901bd79f6b4cc778190b5da9889332a027b1549..090750173188810b52f8eb347528d1aab237a969 100644 (file)
--- a/sysklogd/logger.c
+++ b/sysklogd/logger.c
@@ -7,33 +7,33 @@
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#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 CONFIG_SYSLOGD
-
+#include "libbb.h"
+#ifndef CONFIG_SYSLOGD
 #define SYSLOG_NAMES
-#include <sys/syslog.h>
-
+#define SYSLOG_NAMES_CONST
+#include <syslog.h>
 #else
-#include <sys/syslog.h>
-#  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[];
+/* brokenness alert. Everybody except dietlibc get's this wrong by neither
+ * providing a typedef nor an extern for facilitynames and prioritynames
+ * in syslog.h.
+ */
+# include <syslog.h>
+# ifndef __dietlibc__
+/* We have to do this since the header file does neither provide a sane type
+ * for this structure nor extern definitions.  Argh.... bad libc, bad, bad...
+ */
+typedef struct _code {
+       char *c_name; /* FIXME: this should be const char *const c_name ! */
+       int c_val;
+} CODE;
+#  ifdef __UCLIBC__
+extern const CODE prioritynames[];
+extern const CODE facilitynames[];
+#  else
+extern CODE prioritynames[];
+extern CODE facilitynames[];
 #  endif
+# endif
 #endif
 
 /* Decode a symbolic name to a numeric value
@@ -43,9 +43,9 @@
  *
  * 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);
@@ -70,72 +70,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));
 }
 
 
+int logger_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int logger_main(int argc, char **argv)
 {
-       unsigned opt;
-       char *opt_p, *opt_t;
-       int pri = LOG_USER | LOG_NOTICE;
-       int option = 0;
-       int c, i;
-       char buf[1024], name[128];
+       char *str_p, *str_t;
+       int i = 0;
+       char name[80];
 
        /* Fill out the name string early (may be overwritten later) */
-       bb_getpwuid(name, geteuid(), sizeof(name));
+       bb_getpwuid(name, sizeof(name), geteuid());
+       str_t = name;
 
        /* Parse any options */
-       opt = getopt32(argc, argv, "p:st:", &opt_p, &opt_t);
-       if (opt & 0x1) pri = pencode(opt_p); // -p
-       if (opt & 0x2) option |= LOG_PERROR; // -s
-       if (opt & 0x4) safe_strncpy(name, opt_t, sizeof(name)); // -t
-
-       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);
+       getopt32(argv, "p:st:", &str_p, &str_t);
+
+       if (option_mask32 & 0x2) /* -s */
+               i |= LOG_PERROR;
+       //if (option_mask32 & 0x4) /* -t */
+       openlog(str_t, i, 0);
+       i = LOG_USER | LOG_NOTICE;
+       if (option_mask32 & 0x1) /* -p */
+               i = pencode(str_p);
+
+       argc -= optind;
+       argv += optind;
+       if (!argc) {
+#define strbuf bb_common_bufsiz1
+               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();