Changeset c9e72d1

Timestamp:

Nov 22, 2003, 11:33:00 AM (19 years ago)

Author:

Erik Nygren <nygren@mit.edu>

Branches:

master, barnowl_perlaim, debian, owl, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

1e34e40

Parents:

f1645da

Message:

	Catch SIGPIPE and print an error rather than crashing.
	        [It's possible that this may have some portability
		issues under Solaris and we may need to add some
		configure stuff around SA_SIGINFO...]

Files:

• ChangeLog (modified) (1 diff)
• global.c (modified) (2 diffs)
• owl.c (modified) (3 diffs)
• owl.h (modified) (3 diffs)

ChangeLog

@@ -1 +1 @@
 $Id$
 
-2.0.13-pre-1
+2.0.13-pre-2
         Changed startup message for new mailing list
         blist now prints AIM info even if .anyone is unreadable
+        Catch SIGPIPE and print an error rather than crashing.
+                [It's possible that this may have some portability 
+                issues under Solaris and we may need to add some 
+                configure stuff around SA_SIGINFO...]
         
 2.0.12

global.c

@@ -105 +105 @@
 
   owl_errqueue_init(&(g->errqueue));
+
+  g->got_err_signal=0;
 }
 
@@ -844 +846 @@
   return(&(g->errqueue));
 }
+
+void owl_global_set_errsignal(owl_global *g, int signum, siginfo_t *siginfo)
+{
+  g->got_err_signal = signum;
+  if (siginfo) {
+    g->err_signal_info = *siginfo;
+  } else {
+    memset(&(g->err_signal_info), 0, sizeof(siginfo_t));
+  }
+}
+
+int owl_global_get_errsignal_and_clear(owl_global *g, siginfo_t *siginfo)
+{
+  int signum;
+  if (siginfo && g->got_err_signal) {
+    *siginfo = g->err_signal_info;
+  } 
+  signum = g->got_err_signal;
+  g->got_err_signal = 0;
+  return signum;
+}
+

owl.c

@@ -118 +118 @@
   /* signal handler */
   owl_function_debugmsg("startup: setting up signal handler");
-  sigact.sa_handler=sig_handler;
+  /*sigact.sa_handler=sig_handler;*/
+  sigact.sa_sigaction=sig_handler;
   sigemptyset(&sigact.sa_mask);
-  sigact.sa_flags=0;
+  sigact.sa_flags=SA_SIGINFO;
   sigaction(SIGWINCH, &sigact, NULL);
   sigaction(SIGALRM, &sigact, NULL);
+  sigaction(SIGPIPE, &sigact, NULL);
 
   /* screen init */
@@ -589 +591 @@
 #endif   
 
+    /* Log any error signals */
+    {
+      siginfo_t si;
+      int signum;
+      if ((signum = owl_global_get_errsignal_and_clear(&g, &si)) > 0) {
+        owl_function_error("Got unexpected signal: %d %s  (code: %d  fd: %d  band: %d  errno: %d)", 
+                           signum, signum==SIGPIPE?"SIGPIPE":"",
+                           si.si_code, si.si_fd, si.si_band, si.si_errno);
+      }
+    }
+
   }
 }
 
-void sig_handler(int sig) {
+void sig_handler(int sig, siginfo_t *si, void *data) {
   if (sig==SIGWINCH) {
     /* we can't inturrupt a malloc here, so it just sets a flag
@@ -598 +611 @@
      */
     owl_function_resize();
-  }
+  } else if (sig==SIGPIPE) {
+    /* Set a flag and some info that we got the sigpipe
+     * so we can record that we got it and why... */
+    owl_global_set_errsignal(&g, sig, si);
+  }
+
 }
 

owl.h

@@ -8 +8 @@
 #include <regex.h>
 #include <time.h>
+#include <signal.h>
 #include <libfaim/aim.h>
 #include "config.h"
@@ -19 +20 @@
 static const char owl_h_fileIdent[] = "$Id$";
 
-#define OWL_VERSION         2.0.13-pre-1
-#define OWL_VERSION_STRING "2.0.13-pre-1"
+#define OWL_VERSION         2.0.13-pre-2
+#define OWL_VERSION_STRING "2.0.13-pre-2"
 
 /* Feature that is being tested to redirect stderr through a pipe. 
@@ -486 +487 @@
   int havezephyr;
   int haveaim;
+  int got_err_signal;       /* 1 if we got an unexpected signal */
+  siginfo_t err_signal_info; 
 } owl_global;