/*
- * Copyright (C) 1997-2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1997-2008 Andre Noll <maan@systemlinux.org>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
mmd->sender_cmd_data.cmd_num = -1;
return;
err_out:
- PARA_EMERG_LOG("%s", PARA_STRERROR(-ret));
+ PARA_EMERG_LOG("%s", para_strerror(-ret));
exit(EXIT_FAILURE);
}
static void setup_signal_handling(void)
{
- int ret = 0;
-
- signal_pipe = para_signal_init();
+ signal_pipe = para_signal_init(); /* always successful */
PARA_NOTICE_LOG("setting up signal handlers\n");
- ret += para_install_sighandler(SIGINT);
- ret += para_install_sighandler(SIGTERM);
- ret += para_install_sighandler(SIGHUP);
- ret += para_install_sighandler(SIGCHLD);
- ret += para_install_sighandler(SIGUSR1);
- signal(SIGPIPE, SIG_IGN);
- if (ret != 5) {
- PARA_EMERG_LOG("%s", "could not install signal handlers\n");
- exit(EXIT_FAILURE);
- }
+ if (para_install_sighandler(SIGINT) < 0)
+ goto err;
+ if (para_install_sighandler(SIGTERM) < 0)
+ goto err;
+ if (para_install_sighandler(SIGHUP) < 0)
+ goto err;
+ if (para_install_sighandler(SIGCHLD) < 0)
+ goto err;
+ if (signal(SIGPIPE, SIG_IGN) == SIG_ERR)
+ goto err;
+ if (signal(SIGUSR1, SIG_IGN) == SIG_ERR)
+ goto err;
add_close_on_fork_list(signal_pipe);
+ return;
+err:
+ PARA_EMERG_LOG("could not install signal handlers\n");
+ exit(EXIT_FAILURE);
}
static unsigned init_network(void)
add_close_on_fork_list(fd); /* child doesn't need the listener */
return fd;
err:
- PARA_EMERG_LOG("%s\n", PARA_STRERROR(-ret));
+ PARA_EMERG_LOG("%s\n", para_strerror(-ret));
exit(EXIT_FAILURE);
}