Imported Upstream version 1.8.6p8

[debian/sudo] / compat / strsignal.c

diff --git a/compat/strsignal.c b/compat/strsignal.c
index a13346c1012f102a5517ccdb5a23e4804122bc44..9ebb8e12c8cb5ae94e5b980eadc0605eaf39f0e0 100644 (file)
--- a/compat/strsignal.c
+++ b/compat/strsignal.c
@@ -27,13 +27,13 @@
 #include "gettext.h"
 
 #if defined(HAVE_DECL_SYS_SIGLIST) && HAVE_DECL_SYS_SIGLIST == 1
-# define my_sys_siglist        sys_siglist
+# define sudo_sys_siglist      sys_siglist
 #elif defined(HAVE_DECL__SYS_SIGLIST) && HAVE_DECL__SYS_SIGLIST == 1
-# define my_sys_siglist        _sys_siglist
+# define sudo_sys_siglist      _sys_siglist
 #elif defined(HAVE_DECL___SYS_SIGLIST) && HAVE_DECL___SYS_SIGLIST == 1
-# define my_sys_siglist        __sys_siglist
+# define sudo_sys_siglist      __sys_siglist
 #else
-extern const char *const my_sys_siglist[NSIG];
+extern const char *const sudo_sys_siglist[NSIG];
 #endif
 
 /*
@@ -42,7 +42,8 @@ extern const char *const my_sys_siglist[NSIG];
 char *
 strsignal(int signo)
 {
-    if (signo > 0 && signo < NSIG)
-       return (char *)my_sys_siglist[signo];
+    if (signo > 0 && signo < NSIG && sudo_sys_siglist[signo] != NULL)
+       return (char *)sudo_sys_siglist[signo];
+    /* XXX - should be "Unknown signal: %d" */
     return _("Unknown signal");
 }