diff options
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/fileserv.c | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 444cefc..d871c86 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -12,10 +12,10 @@ AM_CPPFLAGS = -I $(top_srcdir)/mimetypes -DSYSCONFDIR=\"$(sysconfdir)\" EXTRA_DIST=ftoc.sed defidx.html fileserv.conf .html.h: $(AM_V_GEN)sed -f $(srcdir)/ftoc.sed $< > $@ install-data-local: @if [ ! -r $(DESTDIR)$(sysconfdir)/fileserv.conf ]; then :; \ - test -z "$(DESTDIR)$(sysconfdir)" || $(mkdir_p) "$(DESTDIR)$(sysconfdir)" + test -z "$(DESTDIR)$(sysconfdir)" || $(mkdir_p) "$(DESTDIR)$(sysconfdir)"; \ ${INSTALL} -m 644 fileserv.conf \ $(DESTDIR)$(sysconfdir)/fileserv.conf; \ fi diff --git a/src/fileserv.c b/src/fileserv.c index dbe2eb2..fb9811d 100644 --- a/src/fileserv.c +++ b/src/fileserv.c @@ -675,12 +675,14 @@ sigalrm(int sig) static void http_sentinel(int fd, struct sockaddr *server_addr) { pid_t pid = 0; int i; struct sigaction act; + pid_t child_pid = 0; + int status; act.sa_flags = 0; sigemptyset(&act.sa_mask); act.sa_handler = sigalrm; sigaction(SIGALRM, &act, NULL); @@ -689,15 +691,12 @@ http_sentinel(int fd, struct sockaddr *server_addr) sigaddset(&act.sa_mask, fatal_signals[i]); act.sa_handler = sigterm; for (i = 0; fatal_signals[i]; i++) sigaction(fatal_signals[i], &act, NULL); while (1) { - int status; - pid_t child_pid; - if (pid == 0) { if (state != RUNNING) break; pid = fork(); if (pid == -1) { error("fork: %s", strerror(errno)); |