Convert my_sys_sig{list,name} -> sudo_sys_sig{list,name}

--HG--
branch : 1.7

diff --git a/Makefile.in b/Makefile.in
index 73eb2def6fe3a6839f8de91b7b0da7d69d033b94..4f649af81450c5aca658036d1d26834737147c0f 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -298,7 +298,7 @@ mksiglist: $(srcdir)/mksiglist.c $(srcdir)/mksiglist.h $(srcdir)/missing.h confi
 
 $(srcdir)/mksiglist.h: $(srcdir)/siglist.in
        @if [ -n "$(DEVEL)" ]; then \
-           awk 'BEGIN {print "/* public domain */\n"} /^    [A-Z]/ {printf("#ifdef SIG%s\n    if (my_sys_siglist[SIG%s] == NULL)\n\tmy_sys_siglist[SIG%s] = \"%s\";\n#endif\n", $$1, $$1, $$1, substr($$0, 13))}' < $(srcdir)/siglist.in > $@; \
+           awk 'BEGIN {print "/* public domain */\n"} /^    [A-Z]/ {printf("#ifdef SIG%s\n    if (sudo_sys_siglist[SIG%s] == NULL)\n\tsudo_sys_siglist[SIG%s] = \"%s\";\n#endif\n", $$1, $$1, $$1, substr($$0, 13))}' < $(srcdir)/siglist.in > $@; \
        fi
 
 # Dependencies (not counting auth functions)

diff --git a/mksiglist.c b/mksiglist.c
index f5cfbc158e8f2ab93eca0971fb62eadba88dd8e8..4345834d5d506e5cfe87c474e3dde4d360d510dc 100644 (file)
--- a/mksiglist.c
+++ b/mksiglist.c
@@ -37,7 +37,7 @@ main(argc, argv)
     int argc;
     char *argv[];
 {
-    static char *my_sys_siglist[NSIG];
+    static char *sudo_sys_siglist[NSIG];
     int i;
 
 #include "mksiglist.h"
@@ -45,10 +45,10 @@ main(argc, argv)
     printf("#include <config.h>\n");
     printf("#include <signal.h>\n");
     printf("#include \"missing.h\"\n\n");
-    printf("const char *const my_sys_siglist[NSIG] = {\n");
+    printf("const char *const sudo_sys_siglist[NSIG] = {\n");
     for (i = 0; i < NSIG; i++) {
-       if (my_sys_siglist[i] != NULL) {
-           printf("    \"%s\",\n", my_sys_siglist[i]);
+       if (sudo_sys_siglist[i] != NULL) {
+           printf("    \"%s\",\n", sudo_sys_siglist[i]);
        } else {
            printf("    \"Signal %d\",\n", i);
        }

diff --git a/mksiglist.h b/mksiglist.h
index f9f3294f912b943a8c001ed4a49f69d8a9b7e391..c17cf88ad1256da5c3e0fe786cf3a8af714858e5 100644 (file)
--- a/mksiglist.h
+++ b/mksiglist.h
@@ -1,174 +1,174 @@
 /* public domain */
 
 #ifdef SIGHUP
-    if (my_sys_siglist[SIGHUP] == NULL)
-       my_sys_siglist[SIGHUP] = "Hangup";
+    if (sudo_sys_siglist[SIGHUP] == NULL)
+       sudo_sys_siglist[SIGHUP] = "Hangup";
 #endif
 #ifdef SIGINT
-    if (my_sys_siglist[SIGINT] == NULL)
-       my_sys_siglist[SIGINT] = "Interrupt";
+    if (sudo_sys_siglist[SIGINT] == NULL)
+       sudo_sys_siglist[SIGINT] = "Interrupt";
 #endif
 #ifdef SIGQUIT
-    if (my_sys_siglist[SIGQUIT] == NULL)
-       my_sys_siglist[SIGQUIT] = "Quit";
+    if (sudo_sys_siglist[SIGQUIT] == NULL)
+       sudo_sys_siglist[SIGQUIT] = "Quit";
 #endif
 #ifdef SIGILL
-    if (my_sys_siglist[SIGILL] == NULL)
-       my_sys_siglist[SIGILL] = "Illegal instruction";
+    if (sudo_sys_siglist[SIGILL] == NULL)
+       sudo_sys_siglist[SIGILL] = "Illegal instruction";
 #endif
 #ifdef SIGTRAP
-    if (my_sys_siglist[SIGTRAP] == NULL)
-       my_sys_siglist[SIGTRAP] = "Trace trap";
+    if (sudo_sys_siglist[SIGTRAP] == NULL)
+       sudo_sys_siglist[SIGTRAP] = "Trace trap";
 #endif
 #ifdef SIGABRT
-    if (my_sys_siglist[SIGABRT] == NULL)
-       my_sys_siglist[SIGABRT] = "Abort";
+    if (sudo_sys_siglist[SIGABRT] == NULL)
+       sudo_sys_siglist[SIGABRT] = "Abort";
 #endif
 #ifdef SIGIOT
-    if (my_sys_siglist[SIGIOT] == NULL)
-       my_sys_siglist[SIGIOT] = "IOT instruction";
+    if (sudo_sys_siglist[SIGIOT] == NULL)
+       sudo_sys_siglist[SIGIOT] = "IOT instruction";
 #endif
 #ifdef SIGEMT
-    if (my_sys_siglist[SIGEMT] == NULL)
-       my_sys_siglist[SIGEMT] = "EMT trap";
+    if (sudo_sys_siglist[SIGEMT] == NULL)
+       sudo_sys_siglist[SIGEMT] = "EMT trap";
 #endif
 #ifdef SIGFPE
-    if (my_sys_siglist[SIGFPE] == NULL)
-       my_sys_siglist[SIGFPE] = "Floating point exception";
+    if (sudo_sys_siglist[SIGFPE] == NULL)
+       sudo_sys_siglist[SIGFPE] = "Floating point exception";
 #endif
 #ifdef SIGKILL
-    if (my_sys_siglist[SIGKILL] == NULL)
-       my_sys_siglist[SIGKILL] = "Killed";
+    if (sudo_sys_siglist[SIGKILL] == NULL)
+       sudo_sys_siglist[SIGKILL] = "Killed";
 #endif
 #ifdef SIGUNUSED
-    if (my_sys_siglist[SIGUNUSED] == NULL)
-       my_sys_siglist[SIGUNUSED] = "Unused";
+    if (sudo_sys_siglist[SIGUNUSED] == NULL)
+       sudo_sys_siglist[SIGUNUSED] = "Unused";
 #endif
 #ifdef SIGBUS
-    if (my_sys_siglist[SIGBUS] == NULL)
-       my_sys_siglist[SIGBUS] = "Bus error";
+    if (sudo_sys_siglist[SIGBUS] == NULL)
+       sudo_sys_siglist[SIGBUS] = "Bus error";
 #endif
 #ifdef SIGSEGV
-    if (my_sys_siglist[SIGSEGV] == NULL)
-       my_sys_siglist[SIGSEGV] = "Memory fault";
+    if (sudo_sys_siglist[SIGSEGV] == NULL)
+       sudo_sys_siglist[SIGSEGV] = "Memory fault";
 #endif
 #ifdef SIGSYS
-    if (my_sys_siglist[SIGSYS] == NULL)
-       my_sys_siglist[SIGSYS] = "Bad system call";
+    if (sudo_sys_siglist[SIGSYS] == NULL)
+       sudo_sys_siglist[SIGSYS] = "Bad system call";
 #endif
 #ifdef SIGPIPE
-    if (my_sys_siglist[SIGPIPE] == NULL)
-       my_sys_siglist[SIGPIPE] = "Broken pipe";
+    if (sudo_sys_siglist[SIGPIPE] == NULL)
+       sudo_sys_siglist[SIGPIPE] = "Broken pipe";
 #endif
 #ifdef SIGALRM
-    if (my_sys_siglist[SIGALRM] == NULL)
-       my_sys_siglist[SIGALRM] = "Alarm clock";
+    if (sudo_sys_siglist[SIGALRM] == NULL)
+       sudo_sys_siglist[SIGALRM] = "Alarm clock";
 #endif
 #ifdef SIGTERM
-    if (my_sys_siglist[SIGTERM] == NULL)
-       my_sys_siglist[SIGTERM] = "Terminated";
+    if (sudo_sys_siglist[SIGTERM] == NULL)
+       sudo_sys_siglist[SIGTERM] = "Terminated";
 #endif
 #ifdef SIGSTKFLT
-    if (my_sys_siglist[SIGSTKFLT] == NULL)
-       my_sys_siglist[SIGSTKFLT] = "Stack fault";
+    if (sudo_sys_siglist[SIGSTKFLT] == NULL)
+       sudo_sys_siglist[SIGSTKFLT] = "Stack fault";
 #endif
 #ifdef SIGIO
-    if (my_sys_siglist[SIGIO] == NULL)
-       my_sys_siglist[SIGIO] = "I/O possible";
+    if (sudo_sys_siglist[SIGIO] == NULL)
+       sudo_sys_siglist[SIGIO] = "I/O possible";
 #endif
 #ifdef SIGXCPU
-    if (my_sys_siglist[SIGXCPU] == NULL)
-       my_sys_siglist[SIGXCPU] = "CPU time limit exceeded";
+    if (sudo_sys_siglist[SIGXCPU] == NULL)
+       sudo_sys_siglist[SIGXCPU] = "CPU time limit exceeded";
 #endif
 #ifdef SIGXFSZ
-    if (my_sys_siglist[SIGXFSZ] == NULL)
-       my_sys_siglist[SIGXFSZ] = "File size limit exceeded";
+    if (sudo_sys_siglist[SIGXFSZ] == NULL)
+       sudo_sys_siglist[SIGXFSZ] = "File size limit exceeded";
 #endif
 #ifdef SIGVTALRM
-    if (my_sys_siglist[SIGVTALRM] == NULL)
-       my_sys_siglist[SIGVTALRM] = "Virtual timer expired";
+    if (sudo_sys_siglist[SIGVTALRM] == NULL)
+       sudo_sys_siglist[SIGVTALRM] = "Virtual timer expired";
 #endif
 #ifdef SIGPROF
-    if (my_sys_siglist[SIGPROF] == NULL)
-       my_sys_siglist[SIGPROF] = "Profiling timer expired";
+    if (sudo_sys_siglist[SIGPROF] == NULL)
+       sudo_sys_siglist[SIGPROF] = "Profiling timer expired";
 #endif
 #ifdef SIGWINCH
-    if (my_sys_siglist[SIGWINCH] == NULL)
-       my_sys_siglist[SIGWINCH] = "Window size change";
+    if (sudo_sys_siglist[SIGWINCH] == NULL)
+       sudo_sys_siglist[SIGWINCH] = "Window size change";
 #endif
 #ifdef SIGLOST
-    if (my_sys_siglist[SIGLOST] == NULL)
-       my_sys_siglist[SIGLOST] = "File lock lost";
+    if (sudo_sys_siglist[SIGLOST] == NULL)
+       sudo_sys_siglist[SIGLOST] = "File lock lost";
 #endif
 #ifdef SIGUSR1
-    if (my_sys_siglist[SIGUSR1] == NULL)
-       my_sys_siglist[SIGUSR1] = "User defined signal 1";
+    if (sudo_sys_siglist[SIGUSR1] == NULL)
+       sudo_sys_siglist[SIGUSR1] = "User defined signal 1";
 #endif
 #ifdef SIGUSR2
-    if (my_sys_siglist[SIGUSR2] == NULL)
-       my_sys_siglist[SIGUSR2] = "User defined signal 2";
+    if (sudo_sys_siglist[SIGUSR2] == NULL)
+       sudo_sys_siglist[SIGUSR2] = "User defined signal 2";
 #endif
 #ifdef SIGPWR
-    if (my_sys_siglist[SIGPWR] == NULL)
-       my_sys_siglist[SIGPWR] = "Power-fail/Restart";
+    if (sudo_sys_siglist[SIGPWR] == NULL)
+       sudo_sys_siglist[SIGPWR] = "Power-fail/Restart";
 #endif
 #ifdef SIGPOLL
-    if (my_sys_siglist[SIGPOLL] == NULL)
-       my_sys_siglist[SIGPOLL] = "Pollable event occurred";
+    if (sudo_sys_siglist[SIGPOLL] == NULL)
+       sudo_sys_siglist[SIGPOLL] = "Pollable event occurred";
 #endif
 #ifdef SIGSTOP
-    if (my_sys_siglist[SIGSTOP] == NULL)
-       my_sys_siglist[SIGSTOP] = "Stopped (signal)";
+    if (sudo_sys_siglist[SIGSTOP] == NULL)
+       sudo_sys_siglist[SIGSTOP] = "Stopped (signal)";
 #endif
 #ifdef SIGTSTP
-    if (my_sys_siglist[SIGTSTP] == NULL)
-       my_sys_siglist[SIGTSTP] = "Stopped";
+    if (sudo_sys_siglist[SIGTSTP] == NULL)
+       sudo_sys_siglist[SIGTSTP] = "Stopped";
 #endif
 #ifdef SIGCONT
-    if (my_sys_siglist[SIGCONT] == NULL)
-       my_sys_siglist[SIGCONT] = "Continued";
+    if (sudo_sys_siglist[SIGCONT] == NULL)
+       sudo_sys_siglist[SIGCONT] = "Continued";
 #endif
 #ifdef SIGCHLD
-    if (my_sys_siglist[SIGCHLD] == NULL)
-       my_sys_siglist[SIGCHLD] = "Child exited";
+    if (sudo_sys_siglist[SIGCHLD] == NULL)
+       sudo_sys_siglist[SIGCHLD] = "Child exited";
 #endif
 #ifdef SIGCLD
-    if (my_sys_siglist[SIGCLD] == NULL)
-       my_sys_siglist[SIGCLD] = "Child exited";
+    if (sudo_sys_siglist[SIGCLD] == NULL)
+       sudo_sys_siglist[SIGCLD] = "Child exited";
 #endif
 #ifdef SIGTTIN
-    if (my_sys_siglist[SIGTTIN] == NULL)
-       my_sys_siglist[SIGTTIN] = "Stopped (tty input)";
+    if (sudo_sys_siglist[SIGTTIN] == NULL)
+       sudo_sys_siglist[SIGTTIN] = "Stopped (tty input)";
 #endif
 #ifdef SIGTTOU
-    if (my_sys_siglist[SIGTTOU] == NULL)
-       my_sys_siglist[SIGTTOU] = "Stopped (tty output)";
+    if (sudo_sys_siglist[SIGTTOU] == NULL)
+       sudo_sys_siglist[SIGTTOU] = "Stopped (tty output)";
 #endif
 #ifdef SIGINFO
-    if (my_sys_siglist[SIGINFO] == NULL)
-       my_sys_siglist[SIGINFO] = "Information request";
+    if (sudo_sys_siglist[SIGINFO] == NULL)
+       sudo_sys_siglist[SIGINFO] = "Information request";
 #endif
 #ifdef SIGURG
-    if (my_sys_siglist[SIGURG] == NULL)
-       my_sys_siglist[SIGURG] = "Urgent I/O condition";
+    if (sudo_sys_siglist[SIGURG] == NULL)
+       sudo_sys_siglist[SIGURG] = "Urgent I/O condition";
 #endif
 #ifdef SIGWAITING
-    if (my_sys_siglist[SIGWAITING] == NULL)
-       my_sys_siglist[SIGWAITING] = "No runnable LWPs";
+    if (sudo_sys_siglist[SIGWAITING] == NULL)
+       sudo_sys_siglist[SIGWAITING] = "No runnable LWPs";
 #endif
 #ifdef SIGLWP
-    if (my_sys_siglist[SIGLWP] == NULL)
-       my_sys_siglist[SIGLWP] = "Inter-LWP signal";
+    if (sudo_sys_siglist[SIGLWP] == NULL)
+       sudo_sys_siglist[SIGLWP] = "Inter-LWP signal";
 #endif
 #ifdef SIGFREEZE
-    if (my_sys_siglist[SIGFREEZE] == NULL)
-       my_sys_siglist[SIGFREEZE] = "Checkpoint freeze";
+    if (sudo_sys_siglist[SIGFREEZE] == NULL)
+       sudo_sys_siglist[SIGFREEZE] = "Checkpoint freeze";
 #endif
 #ifdef SIGTHAW
-    if (my_sys_siglist[SIGTHAW] == NULL)
-       my_sys_siglist[SIGTHAW] = "Checkpoint thaw";
+    if (sudo_sys_siglist[SIGTHAW] == NULL)
+       sudo_sys_siglist[SIGTHAW] = "Checkpoint thaw";
 #endif
 #ifdef SIGCANCEL
-    if (my_sys_siglist[SIGCANCEL] == NULL)
-       my_sys_siglist[SIGCANCEL] = "Thread cancellation";
+    if (sudo_sys_siglist[SIGCANCEL] == NULL)
+       sudo_sys_siglist[SIGCANCEL] = "Thread cancellation";
 #endif

diff --git a/strsignal.c b/strsignal.c
index a5514290dfa410b36e4c04d33e97c82eb6e20da4..358dd7807cc426d9dc50c9d29c5f0a08f70865cd 100644 (file)
--- a/strsignal.c
+++ b/strsignal.c
@@ -24,13 +24,13 @@
 #include "missing.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
 
 /*
@@ -41,6 +41,7 @@ strsignal(signo)
     int signo;
 {
     if (signo > 0 && signo < NSIG)
-       return (char *)my_sys_siglist[signo];
+       return (char *)sudo_sys_siglist[signo];
+    /* XXX - should be "Unknown signal: %d" */
     return "Unknown signal";
 }