GNUPG-1-9-BRANCH gnupg/common (ChangeLog signal.c)

[cvs user wk]

    Date: Friday, May 13, 2005 @ 14:43:07
  Author: wk
    Path: /cvs/gnupg/gnupg/common
     Tag: GNUPG-1-9-BRANCH

Modified: ChangeLog signal.c

(got_fatal_signal): Print the signal number if we can't
get a name for it.
(get_signal_name): Return NULL if no name is available. Fixed
conditional for sys_siglist to the correct one.


-----------+
 ChangeLog |    3 ++-
 signal.c  |    5 ++---
 2 files changed, 4 insertions(+), 4 deletions(-)


Index: gnupg/common/ChangeLog
diff -u gnupg/common/ChangeLog:1.30.2.49 gnupg/common/ChangeLog:1.30.2.50
--- gnupg/common/ChangeLog:1.30.2.49	Fri May 13 14:37:52 2005
+++ gnupg/common/ChangeLog	Fri May 13 14:43:07 2005
@@ -2,7 +2,8 @@
 
 	* signal.c (got_fatal_signal): Print the signal number if we can't
 	get a name for it.
-	(get_signal_name): Return NULL if no name is available.
+	(get_signal_name): Return NULL if no name is available. Fixed
+	conditional for sys_siglist to the correct one.
 
 2005-04-17  Werner Koch  <wk at g10code.com>
 
Index: gnupg/common/signal.c
diff -u gnupg/common/signal.c:1.2.2.2 gnupg/common/signal.c:1.2.2.3
--- gnupg/common/signal.c:1.2.2.2	Fri May 13 14:37:52 2005
+++ gnupg/common/signal.c	Fri May 13 14:43:07 2005
@@ -76,7 +76,7 @@
 {
   /* Note that we can't use strsignal(), because it is not
      reentrant. */
-#if defined(SYS_SIGLIST_DECLARED) && defined(NSIG)
+#if defined(HAVE_DECL_SYS_SIGLIST) && defined(NSIG)
   return (signum >= 0 && signum < NSIG) ? sys_siglist[signum] : "?";
 #else
   return NULL;
@@ -101,7 +101,7 @@
   s = log_get_prefix (NULL);
   if (s)
     write(2, s, strlen (s));
-  write (2, ": ", 2 );
+  write (2, ": signal ", 9 );
   s = get_signal_name(sig);
   if (s)
     write (2, s, strlen(s) );
@@ -109,7 +109,6 @@
     {
       /* We are in a signal handler so we can't use any kind of printf
          even not sprintf.  USe a straightforward algorithm. */
-      write (2, "signal ", 7 );
       if (sig < 0 || sig >= 100000)
         write (2, "?", 1);
       else