test/run_ntp_server: quit on SIGINT or SIGTERM

Clean up the process before exiting.

4 files changed, 104 insertions, 1 deletions

diff --git a/Makefile.am b/Makefile.am
index 7047eb10e..6f9963a16 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1013,6 +1013,7 @@ test_run_ntp_server_CPPFLAGS = $(AM_CPPFLAGS)
 test_run_ntp_server_LDADD = $(MPD_LIBS) \
 	$(GLIB_LIBS)
 test_run_ntp_server_SOURCES = test/run_ntp_server.c \
+	test/signals.c test/signals.h \
 	src/ntp_server.c src/ntp_server.h
 
 test_run_filter_CPPFLAGS = $(AM_CPPFLAGS)
diff --git a/test/run_ntp_server.c b/test/run_ntp_server.c
index bdee1fdcb..7268fa94c 100644
--- a/test/run_ntp_server.c
+++ b/test/run_ntp_server.c
@@ -19,6 +19,7 @@
 
 #include "config.h"
 #include "ntp_server.h"
+#include "signals.h"
 
 #include <glib.h>
 
@@ -38,6 +39,14 @@
 #include <arpa/inet.h>
 #endif
 
+static bool quit = false;
+
+void
+on_quit(void)
+{
+	quit = true;
+}
+
 static int bind_host(int sd, char *hostname, unsigned long ulAddr,
 		     unsigned short *port)
 {
@@ -113,6 +122,8 @@ open_udp_socket(char *hostname, unsigned short *port)
 int
 main(G_GNUC_UNUSED int argc, G_GNUC_UNUSED char **argv)
 {
+	signals_init();
+
 	struct ntp_server ntp;
 	ntp_server_init(&ntp);
 
@@ -123,7 +134,7 @@ main(G_GNUC_UNUSED int argc, G_GNUC_UNUSED char **argv)
 		return EXIT_FAILURE;
 	}
 
-	while (true) {
+	while (!quit) {
 		struct timeval tv = {
 			.tv_sec = 1,
 			.tv_usec = 0,
diff --git a/test/signals.c b/test/signals.c
new file mode 100644
index 000000000..5f5d336f3
--- /dev/null
+++ b/test/signals.c
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2003-2011 The Music Player Daemon Project
+ * 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include "config.h"
+#include "signals.h"
+#ifndef WIN32
+
+#include "mpd_error.h"
+
+#include <glib.h>
+
+#include <signal.h>
+#include <errno.h>
+#include <string.h>
+
+static void
+quit_signal_handler(G_GNUC_UNUSED int signum)
+{
+	on_quit();
+}
+
+static void
+x_sigaction(int signum, const struct sigaction *act)
+{
+	if (sigaction(signum, act, NULL) < 0)
+		MPD_ERROR("sigaction() failed: %s", strerror(errno));
+}
+
+#endif
+
+void
+signals_init(void)
+{
+#ifndef WIN32
+	struct sigaction sa;
+
+	sa.sa_flags = 0;
+	sigemptyset(&sa.sa_mask);
+	sa.sa_handler = SIG_IGN;
+	x_sigaction(SIGPIPE, &sa);
+
+	sa.sa_handler = quit_signal_handler;
+	x_sigaction(SIGINT, &sa);
+	x_sigaction(SIGTERM, &sa);
+#endif
+}
diff --git a/test/signals.h b/test/signals.h
new file mode 100644
index 000000000..e524d35e2
--- /dev/null
+++ b/test/signals.h
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2003-2011 The Music Player Daemon Project
+ * 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef MPD_SIGNALS_H
+#define MPD_SIGNALS_H
+
+void
+on_quit(void);
+
+void
+signals_init(void);
+
+#endif