X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=server.c;h=479b6b2de25dd114b8f26adef8db3bbb9c0e317a;hp=f86fb8b26b6111d2acacaeccceb108424441f616;hb=f3a22620ec1091b6a56152eacd9fcf5560b7bf1d;hpb=a6e79f02b6eab623425686f8f3cab5bc942e77d4

diff --git a/server.c b/server.c
index f86fb8b2..479b6b2d 100644
--- a/server.c
+++ b/server.c
@@ -23,8 +23,8 @@
  *
  * The gory details, listed by topic:
  *
- * 	- Audio format handlers: \ref mp3_afh.c, \ref ogg_afh.c \ref aac_afh.c,
- * 	- Decoders: \ref mp3dec.c, \ref \ref oggdec.c, \ref aacdec.c,
+ * 	- Audio format handlers: \ref mp3_afh.c, \ref ogg_afh.c, \ref aac_afh.c,
+ * 	- Decoders: \ref mp3dec.c, \ref oggdec.c, \ref aacdec.c,
  *	- Volume normalizer: \ref compress.c,
  *	- Output: \ref alsa_write.c, \ref osx_write.c,
  * 	- http: \ref http_recv.c, \ref http_send.c,
@@ -199,7 +199,6 @@ static void shm_init(void)
 	mmd->events = 0;
 	mmd->num_connects = 0;
 	mmd->active_connections = 0;
-	strcpy(mmd->afd.path, "(none)");
 	mmd->vss_status_flags = VSS_NEXT;
 	mmd->new_vss_status_flags = VSS_NEXT;
 	mmd->sender_cmd_data.cmd_num = -1;
@@ -287,7 +286,8 @@ static void setup_signal_handling(void)
 	int ret = 0;
 
 	signal_pipe = para_signal_init();
-	PARA_NOTICE_LOG("%s", "setting up signal handlers\n");
+
+	PARA_NOTICE_LOG("setting up signal handlers\n");
 	ret += para_install_sighandler(SIGINT);
 	ret += para_install_sighandler(SIGTERM);
 	ret += para_install_sighandler(SIGHUP);
@@ -298,6 +298,7 @@ static void setup_signal_handling(void)
 		PARA_EMERG_LOG("%s", "could not install signal handlers\n");
 		exit(EXIT_FAILURE);
 	}
+	add_close_on_fork_list(signal_pipe);
 }
 
 static unsigned init_network(void)
@@ -310,6 +311,7 @@ static unsigned init_network(void)
 	ret = mark_fd_nonblock(fd);
 	if (ret < 0)
 		goto err;
+	add_close_on_fork_list(fd); /* child doesn't need the listener */
 	return fd;
 err:
 	PARA_EMERG_LOG("%s\n", PARA_STRERROR(-ret));
@@ -557,7 +559,7 @@ genocide:
 	}
 	alarm(ALARM_TIMEOUT);
 	close_listed_fds();
-	close(sockfd); /* child doesn't need the listener */
+	para_signal_shutdown();
 	/*
 	 * put info on who we are serving into argv[0] to make
 	 * client ip visible in top/ps