Changeset 745 for trunk/server/lib/util/fault.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• lib/util/fault.c (modified) (4 diffs)

trunk/server/lib/util/fault.c

@@ -52 +52 @@
 #endif
         void *backtrace_stack[BACKTRACE_STACK_SIZE];
-        size_t backtrace_size;
+        int backtrace_size;
         char **backtrace_strings;
 
@@ -126 +126 @@
                 char cmdstring[200];
                 safe_strcpy(cmdstring, panic_action, sizeof(cmdstring));
-                snprintf(pidstr, sizeof(pidstr), "%u", getpid());
+                snprintf(pidstr, sizeof(pidstr), "%d", (int) getpid());
                 all_string_sub(cmdstring, "%PID%", pidstr, sizeof(cmdstring));
                 if (progname) {
@@ -146 +146 @@
 
 #ifdef SIGABRT
-        CatchSignal(SIGABRT,SIGNAL_CAST SIG_DFL);
+        CatchSignal(SIGABRT, SIG_DFL);
 #endif
         abort();
@@ -188 +188 @@
 _PUBLIC_ void fault_setup(const char *pname)
 {
-        if (progname == NULL) {
-                progname = pname;
-        }
+        if (progname != NULL) {
+                return;
+        }
+        progname = pname;
 #ifdef SIGSEGV
-        CatchSignal(SIGSEGV,SIGNAL_CAST sig_fault);
+        CatchSignal(SIGSEGV, sig_fault);
 #endif
 #ifdef SIGBUS
-        CatchSignal(SIGBUS,SIGNAL_CAST sig_fault);
+        CatchSignal(SIGBUS, sig_fault);
 #endif
 #ifdef SIGABRT
-        CatchSignal(SIGABRT,SIGNAL_CAST sig_fault);
+        CatchSignal(SIGABRT, sig_fault);
 #endif
 #ifdef SIGFPE
-        CatchSignal(SIGFPE,SIGNAL_CAST sig_fault);
-#endif
-}
+        CatchSignal(SIGFPE, sig_fault);
+#endif
+}
+
+/**
+   disable setting up fault handlers
+**/
+_PUBLIC_ void fault_setup_disable(void)
+{
+        progname = "fault disabled";
+}
+
 
 /**