X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=afs.c;h=6b86cb0aeeeb067afa9c12951c204e3b287e9873;hb=b2e6a24448a9e49e0766ab4f32163580eeff469e;hp=fd705b1fa824013c702df97eefdce420bb02022f;hpb=479c7a84ce41333662c6307c523843262fa4cb69;p=paraslash.git

diff --git a/afs.c b/afs.c
index fd705b1f..6b86cb0a 100644
--- a/afs.c
+++ b/afs.c
@@ -85,7 +85,6 @@ static struct signal_task signal_task_struct;
 static enum play_mode current_play_mode;
 static char *current_mop; /* mode or playlist specifier. NULL means dummy mooe */
 
-
 /**
  * A random number used to "authenticate" the connection.
  *
@@ -776,7 +775,7 @@ static void signal_pre_select(struct sched *s, struct task *t)
 	para_fd_set(st->fd, &s->rfds, &s->max_fileno);
 }
 
-static void signal_post_select(struct sched *s, struct task *t)
+static void afs_signal_post_select(struct sched *s, struct task *t)
 {
 	struct signal_task *st = container_of(t, struct signal_task, task);
 	if (getppid() == 1) {
@@ -805,14 +804,7 @@ static void register_signal_task(void)
 {
 	struct signal_task *st = &signal_task_struct;
 
-	if (signal(SIGPIPE, SIG_IGN) == SIG_ERR) {
-		PARA_EMERG_LOG("failed to ignore SIGPIPE\n");
-		exit(EXIT_FAILURE);
-	}
-	if (signal(SIGUSR1, SIG_IGN) == SIG_ERR) {
-		PARA_EMERG_LOG("failed to ignore SIGUSR1\n");
-		exit(EXIT_FAILURE);
-	}
+	para_sigaction(SIGPIPE, SIG_IGN);
 	st->fd = para_signal_init();
 	PARA_INFO_LOG("signal pipe: fd %d\n", st->fd);
 	para_install_sighandler(SIGINT);
@@ -820,7 +812,7 @@ static void register_signal_task(void)
 	para_install_sighandler(SIGHUP);
 
 	st->task.pre_select = signal_pre_select;
-	st->task.post_select = signal_post_select;
+	st->task.post_select = afs_signal_post_select;
 	sprintf(st->task.status, "signal task");
 	register_task(&st->task);
 }