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
54
55
56
57
58
59
60
61
|
$NetBSD: patch-at,v 1.2 2003/10/05 04:25:15 taca Exp $
--- yatd/entry.c.orig 2001-07-09 12:32:52.000000000 +0900
+++ yatd/entry.c
@@ -431,7 +431,7 @@ int main (argc, argv)
Msg2Cli(SUCCESS, "%.512s @%.256s",
szGreeting , SysData.szMyHost);
#else
- Msg2Cli(SUCCESS, "%.512s <%u.%u@%.256s>",
+ Msg2Cli(SUCCESS, "%.512s <%u.%ld@%.256s>",
szGreeting,
SysData.pid, SysData.timeStart, SysData.szMyHost);
#endif
@@ -560,34 +560,30 @@ int main (argc, argv)
#ifdef HAVE_SIGACTION
static void signal_handler(int signum){
- CONST char * pMsg;
int codeErr;
/* sigaction - handler is not re-entrant */
- /*
+#if 0
static int fSigHandled = 0;
if (fSigHandled){
return ;
}
fSigHandled = 1;
SigBlock();
- */
+#endif
- pMsg = NULL;
syslog( LOG_DEBUG , "signal_handler call ");
switch (signum) {
case SIGALRM:
codeErr = ERRYS_TIMEOUT;
+ WARNING(codeErr, 0, NULL);
break;
- case SIGHUP:
- case SIGTERM:
default:
codeErr = ERRYS_SIGNAL;
- pMsg = "#%d";
+ WARNING(codeErr, 0, "#%d", signum);
break;
}
- WARNING(codeErr, 0, pMsg, signum);
if (SysData.Flags.pidFile)
DelPidFile(1);
@@ -602,7 +598,7 @@ static void signal_handler(int signum){
}
#endif
- ErrSetData(codeErr, 0, pMsg, signum);
+ ErrSetData(codeErr, 0, (codeErr == ERRYS_SIGNAL)? "#%d": NULL, signum);
Msg2Cli(FAILURE, NULL);
exit(1);
|
