aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWarren Dukes <warren.dukes@gmail.com>2004-04-11 04:15:14 +0000
committerWarren Dukes <warren.dukes@gmail.com>2004-04-11 04:15:14 +0000
commit30d9589cb324d7657fc971ceb6574eb2fd7c9f5e (patch)
treeb1cd83d36900e946d552e1956a09e1001d784d78
parent4844e05e65570a660773eb15090ad482b59fd85a (diff)
downloadmpd-30d9589cb324d7657fc971ceb6574eb2fd7c9f5e.tar.gz
mpd-30d9589cb324d7657fc971ceb6574eb2fd7c9f5e.tar.xz
mpd-30d9589cb324d7657fc971ceb6574eb2fd7c9f5e.zip
fix some snafoos
git-svn-id: https://svn.musicpd.org/mpd/trunk@678 09075e82-0dd4-0310-85a5-a0d7c8717e4f
Diffstat (limited to '')
-rw-r--r--src/directory.c2
-rw-r--r--src/playlist.c1
-rw-r--r--src/sig_handlers.c3
3 files changed, 2 insertions, 4 deletions
diff --git a/src/directory.c b/src/directory.c
index 17d91631c..ec4b1f19d 100644
--- a/src/directory.c
+++ b/src/directory.c
@@ -30,6 +30,7 @@
#include "interface.h"
#include "volume.h"
#include "mpd_types.h"
+#include "sig_handlers.h"
#include <string.h>
#include <sys/types.h>
@@ -130,6 +131,7 @@ int updateInit(FILE * fp) {
sigaction(SIGPIPE,&sa,NULL);
sigaction(SIGCHLD,&sa,NULL);
+ finishSigHandlers();
close(listenSocket);
freeAllInterfaces();
finishPlaylist();
diff --git a/src/playlist.c b/src/playlist.c
index 5d88ffa1d..1985612a1 100644
--- a/src/playlist.c
+++ b/src/playlist.c
@@ -141,7 +141,6 @@ void initPlaylist() {
}
void finishPlaylist() {
- clearPlaylist(stderr);
free(playlist.songs);
playlist.songs = NULL;
free(playlist.order);
diff --git a/src/sig_handlers.c b/src/sig_handlers.c
index c03f7e76b..e9d91a645 100644
--- a/src/sig_handlers.c
+++ b/src/sig_handlers.c
@@ -63,9 +63,6 @@ void initSigHandlers() {
sigaction(SIGPIPE,&sa,NULL);
sa.sa_handler = usr1SigHandler;
sigaction(SIGUSR1,&sa,NULL);
- sigaddset(&sa.sa_mask,SIGTERM);
- sigaddset(&sa.sa_mask,SIGHUP);
- sigaddset(&sa.sa_mask,SIGCHLD);
sa.sa_handler = chldSigHandler;
sigaction(SIGCHLD,&sa,NULL);
sa.sa_handler = hupSigHandler;