fleshed out a bit more... just wanted to put the current

[oweals/busybox.git] / syslogd.c

diff --git a/syslogd.c b/syslogd.c
index 24c721f8eb4c9915a8f41025184622ecb70396c7..0be9ded06cac9c589efb2ffb182867b5fd2b97b3 100644 (file)
--- a/syslogd.c
+++ b/syslogd.c
@@ -164,7 +164,6 @@ static void domark(int sig)
 {
     if (MarkInterval > 0) {
        logMessage(LOG_SYSLOG|LOG_INFO, "-- MARK --");
-       signal(SIGALRM, domark);
        alarm(MarkInterval);
     }
 }
@@ -338,11 +337,13 @@ extern int syslogd_main(int argc, char **argv)
 #ifdef BB_KLOGD
     int startKlogd = TRUE;
 #endif
+    int stopDoingThat = FALSE;
     char *p;
     char **argv1=argv;
     
     while (--argc > 0 && **(++argv1) == '-') {
-       while (*(++(*argv1))) {
+       stopDoingThat = FALSE;
+       while (stopDoingThat == FALSE && *(++(*argv1))) {
            switch (**argv1) {
            case 'm':
                if (--argc == 0) {
@@ -363,6 +364,7 @@ extern int syslogd_main(int argc, char **argv)
                    usage(syslogd_usage);
                }
                logFilePath = *(++argv1);
+               stopDoingThat = TRUE;
                break;
            default:
                usage(syslogd_usage);