From 78053ff2a47a116cece23924653120b572cabea0 Mon Sep 17 00:00:00 2001 From: Pascal Stumpf Date: Thu, 9 Aug 2012 22:04:52 +0200 Subject: [PATCH] SIGPWR is not present everywhere. --- cde/lib/DtSearch/dtsrapi.c | 4 +++- cde/lib/DtSearch/userint.c | 2 ++ cde/programs/dtsr/dtsrclean.c | 2 ++ cde/programs/dtsr/tomita.c | 2 ++ 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/cde/lib/DtSearch/dtsrapi.c b/cde/lib/DtSearch/dtsrapi.c index 27eded99..4fe506b6 100644 --- a/cde/lib/DtSearch/dtsrapi.c +++ b/cde/lib/DtSearch/dtsrapi.c @@ -313,7 +313,7 @@ int DtSearchInit ( aa_argv0 = argv0; if (err_file) aa_stderr = err_file; -#if defined(linux) +#if defined(linux) || defined(CSRG_BASED) else aa_stderr = stderr; #endif @@ -337,7 +337,9 @@ int DtSearchInit ( signal (SIGQUIT, signal_abort); /* quit, ctrl-d */ signal (SIGKILL, signal_abort); /* (kill -9, cannot be trapped) */ signal (SIGTERM, signal_abort); /* kill [-15], sfwr terminate */ +#ifdef SIGPWR signal (SIGPWR, signal_abort); /* power failure imminent */ +#endif #ifdef _AIX signal (SIGXCPU, signal_abort); /* cpu time limit exceeded */ signal (SIGDANGER, signal_abort); /* imminent paging space crash */ diff --git a/cde/lib/DtSearch/userint.c b/cde/lib/DtSearch/userint.c index 2036ef7b..1bd4b3bf 100644 --- a/cde/lib/DtSearch/userint.c +++ b/cde/lib/DtSearch/userint.c @@ -105,7 +105,9 @@ void init_user_interrupt (void) signal (SIGKILL, flag_shutdown); /* kill -9, cannot be trapped */ signal (SIGALRM, flag_shutdown); /* called alarm() polling timer */ signal (SIGTERM, flag_shutdown); /* kill [-15], sfwr terminate */ +#ifdef SIGPWR signal (SIGPWR, flag_shutdown); /* power failure imminent */ +#endif signal (SIGUSR1, flag_shutdown); /* kill -30, "pings" OE */ #ifdef _AIX signal (SIGXCPU, flag_shutdown); /* cpu time limit exceeded */ diff --git a/cde/programs/dtsr/dtsrclean.c b/cde/programs/dtsr/dtsrclean.c index e7ff7da9..fdd5d9d3 100644 --- a/cde/programs/dtsr/dtsrclean.c +++ b/cde/programs/dtsr/dtsrclean.c @@ -1016,7 +1016,9 @@ int main (int argc, char *argv[]) signal (SIGKILL, signal_shutdown); /* this cannot be trapped */ signal (SIGALRM, signal_shutdown); signal (SIGTERM, signal_shutdown); +#ifdef SIGPWR signal (SIGPWR, signal_shutdown); +#endif #ifdef _AIX signal (SIGXCPU, signal_shutdown); signal (SIGDANGER, signal_shutdown); diff --git a/cde/programs/dtsr/tomita.c b/cde/programs/dtsr/tomita.c index d2db3027..9e17c500 100644 --- a/cde/programs/dtsr/tomita.c +++ b/cde/programs/dtsr/tomita.c @@ -701,7 +701,9 @@ static void deleter (char *infname) signal (SIGQUIT, kill_delete); signal (SIGTRAP, kill_delete); signal (SIGTERM, kill_delete); +#ifdef SIGPWR signal (SIGPWR, kill_delete); +#endif #ifdef _AIX signal (SIGXCPU, kill_delete); /* cpu time limit exceeded */ signal (SIGDANGER, kill_delete); /* imminent paging space -- 2.25.1