daemon.c: fix arg parsing bugs

Allow --init-timeout and --timeout to be specified without falling
through to usage().

Make sure openlog() is called even if implied by --inetd, or messages
will be sent to wherever LOG_USER ends up.

Signed-off-by: Andreas Ericsson <ae@op5.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/daemon.c b/daemon.c
index e18475229885d28b39970f9619d0e89d66a8199b..2b81152d7145c796374ec35d4c61676da42cb992 100644 (file)
--- a/daemon.c
+++ b/daemon.c
@@ -594,6 +594,7 @@ int main(int argc, char **argv)
                }
                if (!strcmp(arg, "--inetd")) {
                        inetd_mode = 1;
                }
                if (!strcmp(arg, "--inetd")) {
                        inetd_mode = 1;

+                       log_syslog = 1;

                        continue;
                }
                if (!strcmp(arg, "--verbose")) {
                        continue;
                }
                if (!strcmp(arg, "--verbose")) {


@@ -602,7 +603,6 @@ int main(int argc, char **argv)
                }
                if (!strcmp(arg, "--syslog")) {
                        log_syslog = 1;
                }
                if (!strcmp(arg, "--syslog")) {
                        log_syslog = 1;

-                       openlog("git-daemon", 0, LOG_DAEMON);

                        continue;
                }
                if (!strcmp(arg, "--export-all")) {
                        continue;
                }
                if (!strcmp(arg, "--export-all")) {


@@ -611,9 +611,11 @@ int main(int argc, char **argv)
                }
                if (!strncmp(arg, "--timeout=", 10)) {
                        timeout = atoi(arg+10);
                }
                if (!strncmp(arg, "--timeout=", 10)) {
                        timeout = atoi(arg+10);

+                       continue;

                }
                if (!strncmp(arg, "--init-timeout=", 15)) {
                        init_timeout = atoi(arg+15);
                }
                if (!strncmp(arg, "--init-timeout=", 15)) {
                        init_timeout = atoi(arg+15);

+                       continue;

                }
                if (!strcmp(arg, "--")) {
                        ok_paths = &argv[i+1];
                }
                if (!strcmp(arg, "--")) {
                        ok_paths = &argv[i+1];


@@ -626,9 +628,11 @@ int main(int argc, char **argv)
                usage(daemon_usage);
        }
 
                usage(daemon_usage);
        }
 

+       if (log_syslog)
+               openlog("git-daemon", 0, LOG_DAEMON);
+

        if (inetd_mode) {
                fclose(stderr); //FIXME: workaround
        if (inetd_mode) {
                fclose(stderr); //FIXME: workaround

-               log_syslog = 1;

                return execute();
        }
 
                return execute();
        }