Changeset 65

Timestamp:

06/06/2006 11:26:22 AM (2 years ago)

Author:

moo

Message:

signal handling fix

Files:

• trunk/xcache.c (modified) (4 diffs)

trunk/xcache.c

@@ -1722 +1722 @@
 /* signal handler */
 static void (*original_sigsegv_handler)(int) = NULL;
-static void xcache_sigsegv_handler(int dummy) /* {{{ */
-{
-    if (original_sigsegv_handler == xcache_sigsegv_handler) {
+static void xcache_sigsegv_handler(int sig) /* {{{ */
+{
+    if (original_sigsegv_handler != xcache_sigsegv_handler) {
         signal(SIGSEGV, original_sigsegv_handler);
     }
@@ -1733 +1733 @@
         chdir(xc_coredump_dir);
     }
-    if (original_sigsegv_handler != xcache_sigsegv_handler) {
-        original_sigsegv_handler(dummy);
-    }
+    raise(sig);
 }
 /* }}} */
@@ -1902 +1900 @@
     }
 
-    original_sigsegv_handler = signal(SIGSEGV, xcache_sigsegv_handler);
+    if (xc_coredump_dir && xc_coredump_dir[0]) {
+        original_sigsegv_handler = signal(SIGSEGV, xcache_sigsegv_handler);
+    }
 
     xc_init_constant(module_number TSRMLS_CC);
@@ -1940 +1940 @@
 #endif
 
-    signal(SIGSEGV, original_sigsegv_handler);
+    if (xc_coredump_dir && xc_coredump_dir[0]) {
+        signal(SIGSEGV, original_sigsegv_handler);
+    }
     if (xc_coredump_dir) {
         pefree(xc_coredump_dir, 1);