summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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
15 15
16install-data-local: 16install-data-local:
17 @if [ ! -r $(DESTDIR)$(sysconfdir)/fileserv.conf ]; then :; \ 17 @if [ ! -r $(DESTDIR)$(sysconfdir)/fileserv.conf ]; then :; \
18 test -z "$(DESTDIR)$(sysconfdir)" || $(mkdir_p) "$(DESTDIR)$(sysconfdir)" 18 test -z "$(DESTDIR)$(sysconfdir)" || $(mkdir_p) "$(DESTDIR)$(sysconfdir)"; \
19 ${INSTALL} -m 644 fileserv.conf \ 19 ${INSTALL} -m 644 fileserv.conf \
20 $(DESTDIR)$(sysconfdir)/fileserv.conf; \ 20 $(DESTDIR)$(sysconfdir)/fileserv.conf; \
21 fi 21 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)
678 pid_t pid = 0; 678 pid_t pid = 0;
679 int i; 679 int i;
680 struct sigaction act; 680 struct sigaction act;
681 pid_t child_pid = 0;
682 int status;
681 683
682 act.sa_flags = 0; 684 act.sa_flags = 0;
683 sigemptyset(&act.sa_mask); 685 sigemptyset(&act.sa_mask);
@@ -692,9 +694,6 @@ http_sentinel(int fd, struct sockaddr *server_addr)
692 sigaction(fatal_signals[i], &act, NULL); 694 sigaction(fatal_signals[i], &act, NULL);
693 695
694 while (1) { 696 while (1) {
695 int status;
696 pid_t child_pid;
697
698 if (pid == 0) { 697 if (pid == 0) {
699 if (state != RUNNING) 698 if (state != RUNNING)
700 break; 699 break;

Return to:

Send suggestions and report system problems to the System administrator.