1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
|
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
|
