Move sed over to the generic llist_t for append. Saves about 90 bytes.

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

diff --git a/sysklogd/klogd.c b/sysklogd/klogd.c
index c908b593c717e55d6e3e9484c5178e3fea648067..6dc5457af80dd152069c756c4b3a903a02e90767 100644 (file)
--- a/sysklogd/klogd.c
+++ b/sysklogd/klogd.c
@@ -4,7 +4,7 @@
  *
  * Copyright (C) 2001 by Gennady Feldman <gfeldman@gena01.com>.
  * Changes: Made this a standalone busybox module which uses standalone
- *                                     syslog() client interface.
+ *                                     syslog() client interface.
  *
  * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
  *
@@ -14,20 +14,7 @@
  *
  * Maintainer: Gennady Feldman <gfeldman@gena01.com> as of Mar 12, 2001
  *
- * 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
- *
+ * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
  */
 
 #include <stdio.h>
@@ -51,7 +38,7 @@ static void klogd_signal(int sig)
        exit(EXIT_SUCCESS);
 }
 
-static void doKlogd(const int console_log_level) __attribute__ ((noreturn));
+static void doKlogd(const int console_log_level) ATTRIBUTE_NORETURN;
 static void doKlogd(const int console_log_level)
 {
        int priority = LOG_INFO;
@@ -74,7 +61,7 @@ static void doKlogd(const int console_log_level)
        if (console_log_level != -1)
                klogctl(8, NULL, console_log_level);
 
-       syslog(LOG_NOTICE, "klogd started: " BB_BANNER);
+       syslog(LOG_NOTICE, "klogd started: %s", BB_BANNER);
 
        while (1) {
                /* Use kernel syscalls */
@@ -113,42 +100,28 @@ static void doKlogd(const int console_log_level)
        }
 }
 
-extern int klogd_main(int argc, char **argv)
+#define OPT_LEVEL        1
+#define OPT_FOREGROUND   2
+
+int klogd_main(int argc, char **argv)
 {
-       /* no options, no getopt */
-       int opt;
-       int doFork = TRUE;
-       unsigned char console_log_level = -1;
+       unsigned long opt;
+       char *c_arg;
+       int console_log_level = -1;
 
        /* do normal option parsing */
-       while ((opt = getopt(argc, argv, "c:n")) > 0) {
-               switch (opt) {
-               case 'c':
-                       if ((optarg == NULL) || (optarg[1] != '\0')) {
-                               bb_show_usage();
-                       }
-                       /* Valid levels are between 1 and 8 */
-                       console_log_level = *optarg - '1';
-                       if (console_log_level > 7) {
-                               bb_show_usage();
-                       }
-                       console_log_level++;
-
-                       break;
-               case 'n':
-                       doFork = FALSE;
-                       break;
-               default:
-                       bb_show_usage();
-               }
+       opt = bb_getopt_ulflags (argc, argv, "c:n", &c_arg);
+
+       if (opt & OPT_LEVEL) {
+               /* Valid levels are between 1 and 8 */
+               console_log_level = bb_xgetlarg(c_arg, 10, 1, 8);
        }
 
-       if (doFork) {
+       if (!(opt & OPT_FOREGROUND)) {
 #if defined(__uClinux__)
                vfork_daemon_rexec(0, 1, argc, argv, "-n");
 #else /* __uClinux__ */
-               if (daemon(0, 1) < 0)
-                       bb_perror_msg_and_die("daemon");
+               bb_xdaemon(0, 1);
 #endif /* __uClinux__ */
        }
        doKlogd(console_log_level);