summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--src/Makefile.am2
-rw-r--r--src/fileserv.c5
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
@@ -15,7 +15,7 @@ EXTRA_DIST=ftoc.sed defidx.html fileserv.conf
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
@@ -678,6 +678,8 @@ 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);
@@ -692,9 +694,6 @@ http_sentinel(int fd, struct sockaddr *server_addr)
sigaction(fatal_signals[i], &act, NULL);
while (1) {
- int status;
- pid_t child_pid;
-
if (pid == 0) {
if (state != RUNNING)
break;

Return to:

Send suggestions and report system problems to the System administrator.