54 lines
1.1 KiB
Diff
54 lines
1.1 KiB
Diff
Upstream-Status: Inappropriate [other]
|
|
Upstream is not making further releases of this software.
|
|
|
|
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
|
|
|
|
# Patch origin: nfs-server source RPM from openSUSE 10.3
|
|
|
|
--- nfs-server/failsafe.c 2002/11/07 17:12:46 1.1
|
|
+++ nfs-server/failsafe.c 2002/11/07 17:15:16
|
|
@@ -10,8 +10,12 @@
|
|
#include "logging.h"
|
|
#include "signals.h"
|
|
#include <sys/wait.h>
|
|
+#ifdef HAVE_STRSIGNAL
|
|
+#include <string.h>
|
|
+#else
|
|
|
|
static const char * get_signame(int signo);
|
|
+#endif
|
|
|
|
void
|
|
failsafe(int level, int ncopies)
|
|
@@ -111,9 +115,17 @@
|
|
pid, running? "Continue" : "Exit");
|
|
} else {
|
|
Dprintf(L_WARNING, "failsafe: "
|
|
+#ifdef HAVE_STRSIGNAL
|
|
+ "child %d terminated by: %s. "
|
|
+#else
|
|
"child %d terminated by %s. "
|
|
+#endif
|
|
"Restarting.",
|
|
+#ifdef HAVE_STRSIGNAL
|
|
+ pid, strsignal(signo));
|
|
+#else
|
|
pid, get_signame(signo));
|
|
+#endif
|
|
child = -1; /* Restart */
|
|
}
|
|
} else if (WIFEXITED(status)) {
|
|
@@ -159,6 +171,7 @@
|
|
/* NOP */
|
|
}
|
|
|
|
+#ifndef HAVE_STRSIGNAL
|
|
static const char *
|
|
get_signame(int signo)
|
|
{
|
|
@@ -199,3 +212,4 @@
|
|
sprintf(namebuf, "signal #%d", signo);
|
|
return namebuf;
|
|
}
|
|
+#endif
|