diff options
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/sig_handlers.c | 3 | ||||
| -rw-r--r-- | src/signal_check.c | 55 | ||||
| -rw-r--r-- | src/signal_check.h | 27 |
4 files changed, 0 insertions, 87 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 501bfe4e5..6bb12fda6 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -62,7 +62,6 @@ mpd_headers = \ playlist.h \ playlist_save.h \ replay_gain.h \ - signal_check.h \ sig_handlers.h \ song.h \ song_print.h \ @@ -144,7 +143,6 @@ mpd_SOURCES = \ playlist_save.c \ replay_gain.c \ sig_handlers.c \ - signal_check.c \ song.c \ song_print.c \ song_save.c \ diff --git a/src/sig_handlers.c b/src/sig_handlers.c index 660107200..7713cb21a 100644 --- a/src/sig_handlers.c +++ b/src/sig_handlers.c @@ -18,7 +18,6 @@ */ #include "sig_handlers.h" -#include "signal_check.h" #include "log.h" #include "main.h" #include "event_pipe.h" @@ -69,6 +68,4 @@ void initSigHandlers(void) event_pipe_register(PIPE_EVENT_RELOAD, handle_reload_event); sa.sa_handler = reload_signal_handler; x_sigaction(SIGHUP, &sa); - - signal_handle(SIGUSR1); } diff --git a/src/signal_check.c b/src/signal_check.c deleted file mode 100644 index b584a2585..000000000 --- a/src/signal_check.c +++ /dev/null @@ -1,55 +0,0 @@ -/* the Music Player Daemon (MPD) - * Copyright (C) 2003-2007 by Warren Dukes (warren.dukes@gmail.com) - * (c)2004 by mackstann - * This project's homepage is: http://www.musicpd.org - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "signal_check.h" - -#include <signal.h> -#include <stddef.h> -#include <errno.h> - -static volatile sig_atomic_t caught_signals[NSIG]; - -static void mpd_signal_handler(int sig) -{ - caught_signals[sig] = 1; -} - -static void set_signal_handler(int sig, void (*handler) (int)) -{ - struct sigaction act; - act.sa_flags = 0; - sigemptyset(&act.sa_mask); - act.sa_handler = handler; - while (sigaction(sig, &act, NULL) && errno == EINTR) ; -} - -void signal_handle(int sig) -{ - set_signal_handler(sig, mpd_signal_handler); -} - -int signal_is_pending(int sig) -{ - return caught_signals[sig]; -} - -void signal_clear(int sig) -{ - caught_signals[sig] = 0; -} diff --git a/src/signal_check.h b/src/signal_check.h deleted file mode 100644 index 118b3d730..000000000 --- a/src/signal_check.h +++ /dev/null @@ -1,27 +0,0 @@ -/* the Music Player Daemon (MPD) - * Copyright (C) 2003-2007 by Warren Dukes (warren.dukes@gmail.com) - * (c)2004 by mackstann - * This project's homepage is: http://www.musicpd.org - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef MPD_SIGNAL_CHECK_H -#define MPD_SIGNAL_CHECK_H - -void signal_handle(int sig); -int signal_is_pending(int sig); -void signal_clear(int sig); - -#endif /* SIGNAL_CHECK_H */ |