2005-01-18 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
* log.h: Test for SA_SIGINFO to see whether zlog_signal takes final
two args (siginfo and program_counter).
* log.c: (hex_append) Include this function only if SA_SIGINFO or
HAVE_GLIBC_BACKTRACE is defined.
(zlog_signal) Final two args (siginfo and program_counter) now
depend on whether SA_SIGINFO is defined on this platform.
* sigevent.c: (program_counter) Do not include this function if
SA_SIGINFO is not defined on this platform.
(exit_handler,core_handler) Test for SA_SIGINFO to decide whether
2nd & 3rd arguments are present and to decide how to invoke
zlog_signal.
(trap_default_signals) Test for SA_SIGINFO and invoke sigaction
appropriately.
diff --git a/lib/log.c b/lib/log.c
index a639745..2efc30f 100644
--- a/lib/log.c
+++ b/lib/log.c
@@ -1,5 +1,5 @@
/*
- * $Id: log.c,v 1.22 2005/01/17 15:22:28 ajs Exp $
+ * $Id: log.c,v 1.23 2005/01/18 22:18:59 ajs Exp $
*
* Logging of zebra
* Copyright (C) 1997, 1998, 1999 Kunihiro Ishiguro
@@ -177,6 +177,7 @@
return str_append(s,len,t);
}
+#if defined(SA_SIGINFO) || defined(HAVE_GLIBC_BACKTRACE)
static char *
hex_append(char *s, int len, u_long x)
{
@@ -194,6 +195,7 @@
}
return str_append(s,len,t);
}
+#endif
static int syslog_fd = -1;
@@ -258,8 +260,11 @@
/* Note: the goal here is to use only async-signal-safe functions. */
void
-zlog_signal(int signo, const char *action, siginfo_t *siginfo,
- void *program_counter)
+zlog_signal(int signo, const char *action
+#ifdef SA_SIGINFO
+ , siginfo_t *siginfo, void *program_counter
+#endif
+ )
{
time_t now;
char buf[sizeof("DEFAULT: Received signal S at T (si_addr 0xP, PC 0xP); aborting...")+100];
@@ -279,6 +284,7 @@
s = num_append(LOC,signo);
s = str_append(LOC," at ");
s = num_append(LOC,now);
+#ifdef SA_SIGINFO
s = str_append(LOC," (si_addr 0x");
s = hex_append(LOC,(u_long)(siginfo->si_addr));
if (program_counter)
@@ -287,6 +293,9 @@
s = hex_append(LOC,(u_long)program_counter);
}
s = str_append(LOC,"); ");
+#else /* SA_SIGINFO */
+ s = str_append(LOC,"; ");
+#endif /* SA_SIGINFO */
s = str_append(LOC,action);
if (s < buf+sizeof(buf))
*s++ = '\n';
@@ -312,7 +321,13 @@
}
#undef DUMP
- zlog_backtrace_sigsafe(PRI, program_counter);
+ zlog_backtrace_sigsafe(PRI,
+#ifdef SA_SIGINFO
+ program_counter
+#else
+ NULL
+#endif
+ );
#undef PRI
#undef LOC
}