Don't try to execute scripts unless they exist.

[tinc] / src / process.c

diff --git a/src/process.c b/src/process.c
index cd1b96e..0b17d7a 100644 (file)
--- a/src/process.c
+++ b/src/process.c
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: process.c,v 1.1.2.33 2002/02/10 21:57:54 guus Exp $
+    $Id: process.c,v 1.1.2.38 2002/03/24 16:22:59 guus Exp $
 */
 
 #include "config.h"
@@ -30,6 +30,7 @@
 #include <syslog.h>
 #include <sys/ioctl.h>
 #include <sys/types.h>
+#include <sys/stat.h>
 #include <sys/wait.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -65,7 +66,7 @@ extern int do_purge;
 
 void memory_full(int size)
 {
-  syslog(LOG_ERR, _("Memory exhausted (couldn't allocate %d bytes), exiting."), size);
+  syslog(LOG_ERR, _("Memory exhausted (couldn't allocate %d bytes), exitting."), size);
   cp_trace();
   exit(1);
 }
@@ -81,6 +82,7 @@ int fcloseall(void)
   fclose(stdin);
   fclose(stdout);
   fclose(stderr);
+  return 0;
 }
 #endif
 
@@ -144,8 +146,15 @@ cp
   errno = 0;    /* No error, sometimes errno is only changed on error */
   /* ESRCH is returned when no process with that pid is found */
   if(kill(pid, signal) && errno == ESRCH)
-    fprintf(stderr, _("Removing stale lock file.\n"));
-  remove_pid(pidfilename);
+    {
+      if(netname)
+        fprintf(stderr, _("The tincd for net `%s' is no longer running. "), netname);
+      else
+        fprintf(stderr, _("The tincd is no longer running. "));
+
+      fprintf(stderr, _("Removing stale lock file.\n"));
+      remove_pid(pidfilename);
+    }
 cp
   return 0;
 }
@@ -252,11 +261,16 @@ int execute_script(const char *name)
 {
   pid_t pid;
   int status;
+  struct stat s;
 cp
+  /* First check if there is a script */
+
+  if(stat(name, &s))
+    return 0;
+
   if((pid = fork()) < 0)
     {
-      syslog(LOG_ERR, _("System call `%s' failed: %m"),
-            "fork");
+      syslog(LOG_ERR, _("System call `%s' failed: %s"), "fork", strerror(errno));
       return -1;
     }
 
@@ -291,7 +305,7 @@ cp
         }
       else
         {
-          syslog(LOG_ERR, _("System call `%s' failed: %m"), "waitpid");
+          syslog(LOG_ERR, _("System call `%s' failed: %s"), "waitpid", strerror(errno));
           return -1;
         }
     }
@@ -307,7 +321,7 @@ cp
 */
 
 RETSIGTYPE
-sigterm_handler(int a, siginfo_t *info, void *b)
+sigterm_handler(int a)
 {
   if(debug_lvl > DEBUG_NOTHING)
     syslog(LOG_NOTICE, _("Got TERM signal"));
@@ -316,7 +330,7 @@ sigterm_handler(int a, siginfo_t *info, void *b)
 }
 
 RETSIGTYPE
-sigquit_handler(int a, siginfo_t *info, void *b)
+sigquit_handler(int a)
 {
   if(debug_lvl > DEBUG_NOTHING)
     syslog(LOG_NOTICE, _("Got QUIT signal"));
@@ -324,28 +338,27 @@ sigquit_handler(int a, siginfo_t *info, void *b)
 }
 
 RETSIGTYPE
-sigsegv_square(int a, siginfo_t *info, void *b)
+fatal_signal_square(int a)
 {
-  syslog(LOG_ERR, _("Got another SEGV signal: not restarting"));
+  syslog(LOG_ERR, _("Got another fatal signal %d (%s): not restarting."), a, strsignal(a));
   cp_trace();
   exit(1);
 }
 
 RETSIGTYPE
-sigsegv_handler(int a, siginfo_t *info, void *b)
+fatal_signal_handler(int a)
 {
   struct sigaction act;
-  syslog(LOG_ERR, _("Got SEGV signal"));
+  syslog(LOG_ERR, _("Got fatal signal %d (%s)"), a, strsignal(a));
   cp_trace();
 
   if(do_detach)
     {
       syslog(LOG_NOTICE, _("Trying to re-execute in 5 seconds..."));
 
-      act.sa_handler = NULL;
+      act.sa_handler = fatal_signal_square;
       act.sa_mask = emptysigset;
-      act.sa_flags = SA_SIGINFO;
-      act.sa_sigaction = sigsegv_square;
+      act.sa_flags = 0;
       sigaction(SIGSEGV, &act, NULL);
 
       close_network_connections();
@@ -361,7 +374,7 @@ sigsegv_handler(int a, siginfo_t *info, void *b)
 }
 
 RETSIGTYPE
-sighup_handler(int a, siginfo_t *info, void *b)
+sighup_handler(int a)
 {
   if(debug_lvl > DEBUG_NOTHING)
     syslog(LOG_NOTICE, _("Got HUP signal"));
@@ -369,7 +382,7 @@ sighup_handler(int a, siginfo_t *info, void *b)
 }
 
 RETSIGTYPE
-sigint_handler(int a, siginfo_t *info, void *b)
+sigint_handler(int a)
 {
   if(saved_debug_lvl)
     {
@@ -388,7 +401,7 @@ sigint_handler(int a, siginfo_t *info, void *b)
 }
 
 RETSIGTYPE
-sigalrm_handler(int a, siginfo_t *info, void *b)
+sigalrm_handler(int a)
 {
   if(debug_lvl > DEBUG_NOTHING)
     syslog(LOG_NOTICE, _("Got ALRM signal"));
@@ -396,13 +409,13 @@ sigalrm_handler(int a, siginfo_t *info, void *b)
 }
 
 RETSIGTYPE
-sigusr1_handler(int a, siginfo_t *info, void *b)
+sigusr1_handler(int a)
 {
   dump_connections();
 }
 
 RETSIGTYPE
-sigusr2_handler(int a, siginfo_t *info, void *b)
+sigusr2_handler(int a)
 {
   dump_device_stats();
   dump_nodes();
@@ -411,21 +424,21 @@ sigusr2_handler(int a, siginfo_t *info, void *b)
 }
 
 RETSIGTYPE
-sigwinch_handler(int a, siginfo_t *info, void *b)
+sigwinch_handler(int a)
 {
   extern int do_purge;
   do_purge = 1;
 }
 
 RETSIGTYPE
-unexpected_signal_handler(int a, siginfo_t *info, void *b)
+unexpected_signal_handler(int a)
 {
   syslog(LOG_WARNING, _("Got unexpected signal %d (%s)"), a, strsignal(a));
   cp_trace();
 }
 
 RETSIGTYPE
-ignore_signal_handler(int a, siginfo_t *info, void *b)
+ignore_signal_handler(int a)
 {
   if(debug_lvl >= DEBUG_SCARY_THINGS)
   {
@@ -436,12 +449,14 @@ ignore_signal_handler(int a, siginfo_t *info, void *b)
 
 struct {
   int signal;
-  void (*handler)(int, siginfo_t *, void *);
+  void (*handler)(int);
 } sighandlers[] = {
   { SIGHUP, sighup_handler },
   { SIGTERM, sigterm_handler },
   { SIGQUIT, sigquit_handler },
-  { SIGSEGV, sigsegv_handler },
+  { SIGSEGV, fatal_signal_handler },
+  { SIGBUS, fatal_signal_handler },
+  { SIGILL, fatal_signal_handler },
   { SIGPIPE, ignore_signal_handler },
   { SIGINT, sigint_handler },
   { SIGUSR1, sigusr1_handler },
@@ -461,28 +476,28 @@ setup_signals(void)
   sigemptyset(&emptysigset);
   act.sa_handler = NULL;
   act.sa_mask = emptysigset;
-  act.sa_flags = SA_SIGINFO;
+  act.sa_flags = 0;
 
   /* Set a default signal handler for every signal, errors will be
      ignored. */
   for(i = 0; i < NSIG; i++) 
     {
       if(!do_detach)
-        act.sa_sigaction = (void(*)(int, siginfo_t *, void *))SIG_DFL;
+        act.sa_handler = SIG_DFL;
       else
-        act.sa_sigaction = unexpected_signal_handler;
+        act.sa_handler = unexpected_signal_handler;
       sigaction(i, &act, NULL);
     }
 
   /* If we didn't detach, allow coredumps */
   if(!do_detach)
-    sighandlers[3].handler = (void(*)(int, siginfo_t *, void *))SIG_DFL;
+    sighandlers[3].handler = SIG_DFL;
 
   /* Then, for each known signal that we want to catch, assign a
      handler to the signal, with error checking this time. */
   for(i = 0; sighandlers[i].signal; i++)
     {
-      act.sa_sigaction = sighandlers[i].handler;
+      act.sa_handler = sighandlers[i].handler;
       if(sigaction(sighandlers[i].signal, &act, NULL) < 0)
        fprintf(stderr, _("Installing signal handler for signal %d (%s) failed: %s\n"),
                sighandlers[i].signal, strsignal(sighandlers[i].signal), strerror(errno));