Delete dead code from lib.misc.c.

Author: meisterT

lib/lib.misc.c

@@ -24,27 +24,6 @@
 
 const int def_stdio_fd[3] = { STDIN_FILENO, STDOUT_FILENO, STDERR_FILENO };
 
-void _alert(const char *libdir, const char *msgtype, const char *description)
-{
-	static char none[1] = "";
-	char *cmd;
-	int silenced __attribute__((unused));
-
-	if ( description==NULL ) description = none;
-
-	cmd = allocstr("%s/alert '%s' '%s' &",libdir,msgtype,description);
-	logmsg(LOG_INFO,"executing '%s'",cmd);
-
-	/* Assign return value to temp variable to remove compiler
-	 * warnings. We're already trying to generate a warning; there's
-	 * no sense in generating another warning when this gives an
-	 * error.
-	 */
-	silenced = system(cmd);
-
-	free(cmd);
-}
-
 int execute(const char *cmd, const char **args, int nargs, int stdio_fd[3], int err2out)
 {
 	pid_t pid, child_pid;
@@ -143,112 +122,6 @@ int execute(const char *cmd, const char **args, int nargs, int stdio_fd[3], int
 	return -1;
 }
 
-int exitsignalled;
-
-void sig_handler(int sig)
-{
-	logmsg(LOG_DEBUG, "Signal %d received", sig);
-
-	switch ( sig ) {
-	case SIGTERM:
-	case SIGHUP:
-	case SIGINT:
-		exitsignalled = 1;
-		break;
-	}
-}
-
-void initsignals()
-{
-	struct sigaction sa;
-	sigset_t newmask, oldmask;
-
-	exitsignalled = 0;
-
-	/* unmask all signals */
-	memset(&newmask, 0, sizeof(newmask));
-	if ( sigprocmask(SIG_SETMASK, &newmask, &oldmask)!=0 ) {
-		error(errno,"unmasking signals");
-	}
-
-	logmsg(LOG_DEBUG, "Installing signal handlers");
-
-	sa.sa_handler = &sig_handler;
-	sa.sa_mask = newmask;
-	sa.sa_flags = 0;
-
-	if ( sigaction(SIGTERM,&sa,NULL)!=0 ) error(errno,"installing signal handler");
-	if ( sigaction(SIGHUP ,&sa,NULL)!=0 ) error(errno,"installing signal handler");
-	if ( sigaction(SIGINT ,&sa,NULL)!=0 ) error(errno,"installing signal handler");
-}
-
-
-char *pidfile;
-
-/* Function to remove PID file at process exit. */
-void remove_pidfile()
-{
-	unlink(pidfile);
-}
-
-void daemonize(const char *_pidfile)
-{
-	pid_t pid;
-	int fd, maxfd;
-	char str[15];
-
-	switch ( pid = fork() ) {
-	case -1: error(errno, "cannot fork daemon");
-	case  0: break;     /* child process: do nothing here. */
-	default: _exit(0);  /* parent process: exit. */
-	}
-
-	/* Check and write PID to file */
-	if ( _pidfile!=NULL ) {
-		pidfile = strdup(_pidfile);
-		if ( (fd=open(pidfile, O_RDWR|O_CREAT|O_EXCL, 0640))<0 ) {
-			error(errno, "cannot create pidfile '%s'", pidfile);
-		}
-		sprintf(str, "%d\n", pid);
-		if ( write(fd, str, strlen(str))<(ssize_t)strlen(str) ) {
-			error(errno, "failed writing PID to file");
-		}
-		if ( close(fd)!=0 ) error(errno, "closing pidfile '%s'", pidfile);
-		atexit(remove_pidfile);
-	}
-
-	/* Notify user with daemon PID before detaching from TTY. */
-	logmsg(LOG_NOTICE, "daemonizing with PID = %d", pid);
-
-	/* Reopen std{in,out,err} file descriptors to /dev/null.
-	   Closing them gives error when the daemon or a child process
-	   tries to read/write to them. */
-	if ( freopen("/dev/null", "r", stdin )!=NULL ||
-	     freopen("/dev/null", "w", stdout)!=NULL ||
-	     freopen("/dev/null", "w", stderr)!=NULL ) {
-		error(errno, "cannot reopen stdio files to /dev/null");
-	}
-
-	/* Close all other file descriptors. */
-	maxfd = sysconf(_SC_OPEN_MAX);
-	for(fd=3; fd<maxfd; fd++) close(fd);
-
-	/* Start own process group, detached from any tty */
-	if ( setsid()<0 ) error(errno, "cannot set daemon process group");
-}
-
-char *stripendline(char *str)
-{
-	size_t i, j;
-
-	for(i=0, j=0; str[i]!=0; i++) {
-		if ( ! (str[i]=='\n' || str[i]=='\r') ) str[j++] = str[i];
-	}
-
-	str[j] = 0;
-
-	return str;
-}
 
 void version(const char *prog, const char *vers)
 {

lib/lib.misc.h

@@ -17,12 +17,6 @@ extern "C" {
  * LIBDIR as defined in calling program. */
 #define alert(msgtype,description) _alert(LIBDIR,msgtype,description)
 
-void _alert(const char *libdir, const char *msgtype, const char *description)
-    __attribute__((nonnull (1, 2)));
-/* Execute 'alert' plugin program to perform user configurable action
- * on important system events. See default alert script for more details.
- */
-
 int execute(const char *, const char **, int, int[3], int)
     __attribute__((nonnull (1, 2)));
 /* Execute a subprocess using fork and execvp and optionally perform
@@ -53,28 +47,6 @@ int execute(const char *, const char **, int, int[3], int)
  * with the process-ID of the child command.
  */
 
-void initsignals();
-/* Installs a signal handler to gracefully terminate daemon programs
- * upon receiving TERMINATE, HANGUP and INTERRUPT signals which sets
- * 'extern int exitsignalled = 1'. The sleep() call will automatically
- * return on receiving a signal.
- */
-
-void daemonize(const char *);
-/* Forks and detaches the current process to run as a daemon. Similar
- * to the daemon() call present in Linux and *BSD, but implemented here,
- * because it is not specified by POSIX, SUSv2 or SVr4.
- *
- * Arguments:
- * char *pidfile    pidfile to check for running instances and write PID;
- *                    set to NULL to not use a pidfile.
- *
- * Either returns successfully or exits with an error.
- */
-
-char *stripendline(char *) __attribute__((nonnull (1)));
-/* Removes end-of-line characters (CR and LF) from string. Returns the
- * original pointer to the modified string. */
 
 void version(const char *, const char *) __attribute__((nonnull (1, 2)));
 /* Print standard program name and version, with disclaimer and GPL