- add libbb function str_tolower to convert a string to lowercase.

[oweals/busybox.git] / init / init.c

diff --git a/init/init.c b/init/init.c
index 698563228ad54a2a5490078bfa37b8984e749f91..8c32b7791b2e67a7671b1b40119e735e916d2c12 100644 (file)
--- a/init/init.c
+++ b/init/init.c
@@ -16,7 +16,7 @@
 #include <sys/wait.h>
 #include <sys/reboot.h>
 
-#if ENABLE_SYSLOGD
+#if ENABLE_FEATURE_INIT_SYSLOG
 # include <sys/syslog.h>
 #endif
 
@@ -84,7 +84,7 @@ struct init_action {
 /* Static variables */
 static struct init_action *init_action_list = NULL;
 
-#if !ENABLE_SYSLOGD
+#if !ENABLE_FEATURE_INIT_SYSLOG
 static const char *log_console = VC_5;
 #endif
 #if !ENABLE_DEBUG_INIT
@@ -144,7 +144,7 @@ static void message(int device, const char *fmt, ...)
        __attribute__ ((format(printf, 2, 3)));
 static void message(int device, const char *fmt, ...)
 {
-#if !ENABLE_SYSLOGD
+#if !ENABLE_FEATURE_INIT_SYSLOG
        static int log_fd = -1;
 #endif
 
@@ -159,7 +159,7 @@ static void message(int device, const char *fmt, ...)
        msg[sizeof(msg) - 2] = '\0';
        l = strlen(msg);
 
-#if ENABLE_SYSLOGD
+#if ENABLE_FEATURE_INIT_SYSLOG
        /* Log the message to syslogd */
        if (device & L_LOG) {
                /* don't out "\r" */
@@ -285,7 +285,7 @@ static void console_init(void)
                 * if TERM is set to linux (the default) */
                if (!s || strcmp(s, "linux") == 0)
                        putenv((char*)"TERM=vt102");
-#if !ENABLE_SYSLOGD
+#if !ENABLE_FEATURE_INIT_SYSLOG
                log_console = NULL;
 #endif
        } else if (!s)
@@ -880,8 +880,7 @@ static void reload_signal(int sig ATTRIBUTE_UNUSED)
        /* remove unused entrys */
        for (a = init_action_list; a; a = tmp) {
                tmp = a->next;
-               if (a->action & (ONCE | SYSINIT | WAIT ) &&
-                               a->pid == 0 ) {
+               if ((a->action & (ONCE | SYSINIT | WAIT)) && a->pid == 0) {
                        delete_init_action(a);
                }
        }