shell: unify endofname() in hush and ash

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

diff --git a/sysklogd/logger.c b/sysklogd/logger.c
index e2d07460597e1fa4810919e33aacc6bbc9ff692f..ff15191923067983a2a57911ea24f3b08a38ca56 100644 (file)
--- a/sysklogd/logger.c
+++ b/sysklogd/logger.c
@@ -4,30 +4,16 @@
  *
  * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
+/*
+ * Done in syslogd_and_logger.c:
 #include "libbb.h"
-
-#if !defined CONFIG_SYSLOGD
-
 #define SYSLOG_NAMES
-#include <sys/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[];
-#  endif
-#endif
+#define SYSLOG_NAMES_CONST
+#include <syslog.h>
+*/
 
 /* Decode a symbolic name to a numeric value
  * this function is based on code
@@ -36,9 +22,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);
@@ -80,33 +66,31 @@ static int pencode(char *s)
        return ((lev & LOG_PRIMASK) | (fac & LOG_FACMASK));
 }
 
+#define strbuf bb_common_bufsiz1
 
 int logger_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int logger_main(int argc, char **argv)
+int logger_main(int argc UNUSED_PARAM, char **argv)
 {
        char *str_p, *str_t;
+       int opt;
        int i = 0;
-       char name[80];
 
        /* Fill out the name string early (may be overwritten later) */
-       bb_getpwuid(name, sizeof(name), geteuid());
-       str_t = name;
+       str_t = uid2uname_utoa(geteuid());
 
        /* Parse any options */
-       getopt32(argv, "p:st:", &str_p, &str_t);
+       opt = getopt32(argv, "p:st:", &str_p, &str_t);
 
-       if (option_mask32 & 0x2) /* -s */
+       if (opt & 0x2) /* -s */
                i |= LOG_PERROR;
-       //if (option_mask32 & 0x4) /* -t */
+       //if (opt & 0x4) /* -t */
        openlog(str_t, i, 0);
        i = LOG_USER | LOG_NOTICE;
-       if (option_mask32 & 0x1) /* -p */
+       if (opt & 0x1) /* -p */
                i = pencode(str_p);
 
-       argc -= optind;
        argv += optind;
-       if (!argc) {
-#define strbuf bb_common_bufsiz1
+       if (!argv[0]) {
                while (fgets(strbuf, COMMON_BUFSIZE, stdin)) {
                        if (strbuf[0]
                         && NOT_LONE_CHAR(strbuf, '\n')
@@ -132,6 +116,8 @@ int logger_main(int argc, char **argv)
        return EXIT_SUCCESS;
 }
 
+/* Clean up. Needed because we are included from syslogd_and_logger.c */
+#undef strbuf
 
 /*-
  * Copyright (c) 1983, 1993