From d45c3d28d788129428036fd7f26fa417beccd93e Mon Sep 17 00:00:00 2001 From: Ken Hornstein Date: Mon, 9 Jan 2012 13:26:59 -0500 Subject: [PATCH] Switch from using RETSIGTYPE via autoconf to void, since POSIX says that's type to use for a signal handler. --- configure.in | 1 - h/signals.h | 2 +- sbr/getans.c | 4 ++-- sbr/lock_file.c | 4 ++-- uip/mhlist.c | 4 ++-- uip/mhlsbr.c | 12 ++++++------ uip/mhmail.c | 4 ++-- uip/mhn.c | 4 ++-- uip/mhshow.c | 4 ++-- uip/mhshowsbr.c | 4 ++-- uip/mhstore.c | 4 ++-- uip/mhtest.c | 4 ++-- uip/msh.c | 16 ++++++++-------- uip/post.c | 2 +- uip/prompter.c | 4 ++-- uip/rcvtty.c | 4 ++-- uip/slocal.c | 4 ++-- 17 files changed, 40 insertions(+), 41 deletions(-) diff --git a/configure.in b/configure.in index 4657b50..db75827 100644 --- a/configure.in +++ b/configure.in @@ -757,7 +757,6 @@ LIBS="$nmh_save_LIBS" dnl -------------- dnl CHECK TYPEDEFS dnl -------------- -AC_TYPE_SIGNAL AC_TYPE_PID_T AC_TYPE_OFF_T AC_TYPE_UID_T diff --git a/h/signals.h b/h/signals.h index 6858dff..905b811 100644 --- a/h/signals.h +++ b/h/signals.h @@ -10,7 +10,7 @@ /* * The type for a signal handler */ -typedef RETSIGTYPE (*SIGNAL_HANDLER)(int); +typedef void (*SIGNAL_HANDLER)(int); /* * If not a POSIX machine, then we create our diff --git a/sbr/getans.c b/sbr/getans.c index 3229eb5..5c70ba0 100644 --- a/sbr/getans.c +++ b/sbr/getans.c @@ -18,7 +18,7 @@ static jmp_buf sigenv; /* * static prototypes */ -static RETSIGTYPE intrser (int); +static void intrser (int); char ** @@ -67,7 +67,7 @@ getans (char *prompt, struct swit *ansp) } -static RETSIGTYPE +static void intrser (int i) { /* diff --git a/sbr/lock_file.c b/sbr/lock_file.c index 83cf01a..8f2242a 100644 --- a/sbr/lock_file.c +++ b/sbr/lock_file.c @@ -103,7 +103,7 @@ static int lkopen_dot (char *, int, mode_t); static void lockname (char *, struct lockinfo *, int); static void timerON (char *, int); static void timerOFF (int); -static RETSIGTYPE alrmser (int); +static void alrmser (int); #if !defined(HAVE_LIBLOCKFILE) static int lockit (struct lockinfo *); @@ -585,7 +585,7 @@ timerOFF (int fd) * lockfiles, so another command doesn't remove them. */ -static RETSIGTYPE +static void alrmser (int sig) { char *lockfile; diff --git a/uip/mhlist.c b/uip/mhlist.c index d698668..664be9f 100644 --- a/uip/mhlist.c +++ b/uip/mhlist.c @@ -108,7 +108,7 @@ void freects_done (int) NORETURN; /* * static prototypes */ -static RETSIGTYPE pipeser (int); +static void pipeser (int); int @@ -371,7 +371,7 @@ do_cache: } -static RETSIGTYPE +static void pipeser (int i) { if (i == SIGQUIT) { diff --git a/uip/mhlsbr.c b/uip/mhlsbr.c index d1204c7..ed8c477 100644 --- a/uip/mhlsbr.c +++ b/uip/mhlsbr.c @@ -271,9 +271,9 @@ static void putcomp (struct mcomp *, struct mcomp *, int); static char *oneline (char *, long); static void putstr (char *); static void putch (char); -static RETSIGTYPE intrser (int); -static RETSIGTYPE pipeser (int); -static RETSIGTYPE quitser (int); +static void intrser (int); +static void pipeser (int); +static void quitser (int); static void face_format (struct mcomp *); static int doface (struct mcomp *); static void mhladios (char *, char *, ...); @@ -1444,7 +1444,7 @@ putch (char ch) } -static RETSIGTYPE +static void intrser (int i) { #ifndef RELIABLE_SIGNALS @@ -1457,7 +1457,7 @@ intrser (int i) } -static RETSIGTYPE +static void pipeser (int i) { #ifndef RELIABLE_SIGNALS @@ -1468,7 +1468,7 @@ pipeser (int i) } -static RETSIGTYPE +static void quitser (int i) { #ifndef RELIABLE_SIGNALS diff --git a/uip/mhmail.c b/uip/mhmail.c index e586860..377fccd 100644 --- a/uip/mhmail.c +++ b/uip/mhmail.c @@ -37,7 +37,7 @@ static char tmpfil[BUFSIZ]; /* * static prototypes */ -static RETSIGTYPE intrser (int); +static void intrser (int); int @@ -197,7 +197,7 @@ main (int argc, char **argv) } -static RETSIGTYPE +static void intrser (int i) { #ifndef RELIABLE_SIGNALS diff --git a/uip/mhn.c b/uip/mhn.c index fe728f9..6a46ca5 100644 --- a/uip/mhn.c +++ b/uip/mhn.c @@ -196,7 +196,7 @@ void freects_done (int) NORETURN; /* * static prototypes */ -static RETSIGTYPE pipeser (int); +static void pipeser (int); int @@ -684,7 +684,7 @@ do_cache: } -static RETSIGTYPE +static void pipeser (int i) { if (i == SIGQUIT) { diff --git a/uip/mhshow.c b/uip/mhshow.c index 4667e34..ea34914 100644 --- a/uip/mhshow.c +++ b/uip/mhshow.c @@ -124,7 +124,7 @@ void freects_done (int) NORETURN; /* * static prototypes */ -static RETSIGTYPE pipeser (int); +static void pipeser (int); int @@ -451,7 +451,7 @@ do_cache: } -static RETSIGTYPE +static void pipeser (int i) { if (i == SIGQUIT) { diff --git a/uip/mhshowsbr.c b/uip/mhshowsbr.c index 8e09591..c2bb48a 100644 --- a/uip/mhshowsbr.c +++ b/uip/mhshowsbr.c @@ -75,7 +75,7 @@ static int show_multi_aux (CT, int, int, char *); static int show_message_rfc822 (CT, int, int); static int show_partial (CT, int, int); static int show_external (CT, int, int); -static RETSIGTYPE intrser (int); +static void intrser (int); /* @@ -1081,7 +1081,7 @@ show_external (CT ct, int serial, int alternate) } -static RETSIGTYPE +static void intrser (int i) { #ifndef RELIABLE_SIGNALS diff --git a/uip/mhstore.c b/uip/mhstore.c index ff7724c..2646ba6 100644 --- a/uip/mhstore.c +++ b/uip/mhstore.c @@ -102,7 +102,7 @@ void freects_done (int) NORETURN; /* * static prototypes */ -static RETSIGTYPE pipeser (int); +static void pipeser (int); int @@ -383,7 +383,7 @@ do_cache: } -static RETSIGTYPE +static void pipeser (int i) { if (i == SIGQUIT) { diff --git a/uip/mhtest.c b/uip/mhtest.c index c884ffe..cde45db 100644 --- a/uip/mhtest.c +++ b/uip/mhtest.c @@ -105,7 +105,7 @@ void freects_done (int) NORETURN; * static prototypes */ static int write_content (CT *, char *); -static RETSIGTYPE pipeser (int); +static void pipeser (int); int @@ -377,7 +377,7 @@ write_content (CT *cts, char *outfile) } -static RETSIGTYPE +static void pipeser (int i) { if (i == SIGQUIT) { diff --git a/uip/msh.c b/uip/msh.c index 9e56ddd..c0fc4e7 100644 --- a/uip/msh.c +++ b/uip/msh.c @@ -195,10 +195,10 @@ static int initaux_io (struct Cmd *); static void fin_io (struct Cmd *, int); static void finaux_io (struct Cmd *); static void m_init (void); -static RETSIGTYPE intrser (int); -static RETSIGTYPE pipeser (int); -static RETSIGTYPE quitser (int); -static RETSIGTYPE alrmser (int); +static void intrser (int); +static void pipeser (int); +static void quitser (int); +static void alrmser (int); static int pINI (void); static int pQRY (char *, int); static int pQRY1 (int); @@ -1618,7 +1618,7 @@ seq_setcur (struct msgs *mp, int msgnum) -static RETSIGTYPE +static void intrser (int i) { #ifndef RELIABLE_SIGNALS @@ -1635,7 +1635,7 @@ intrser (int i) } -static RETSIGTYPE +static void pipeser (int i) { #ifndef RELIABLE_SIGNALS @@ -1654,7 +1654,7 @@ pipeser (int i) } -static RETSIGTYPE +static void quitser (int i) { #ifndef RELIABLE_SIGNALS @@ -1671,7 +1671,7 @@ quitser (int i) } -static RETSIGTYPE +static void alrmser (int i) { longjmp (peerenv, DONE); diff --git a/uip/post.c b/uip/post.c index 419b86c..0d71c31 100644 --- a/uip/post.c +++ b/uip/post.c @@ -1611,7 +1611,7 @@ do_text (char *file, int fd) * SIGNAL HANDLING */ -static RETSIGTYPE +static void sigser (int i) { #ifndef RELIABLE_SIGNALS diff --git a/uip/prompter.c b/uip/prompter.c index 459fa97..872d742 100644 --- a/uip/prompter.c +++ b/uip/prompter.c @@ -70,7 +70,7 @@ static jmp_buf sigenv; int getln (char *, int); static int chrcnv (char *); static void chrdsp (char *, char); -static RETSIGTYPE intrser (int); +static void intrser (int); int @@ -393,7 +393,7 @@ getln (char *buffer, int n) } -static RETSIGTYPE +static void intrser (int i) { #ifndef RELIABLE_SIGNALS diff --git a/uip/rcvtty.c b/uip/rcvtty.c index 07053d2..6c08dae 100644 --- a/uip/rcvtty.c +++ b/uip/rcvtty.c @@ -78,7 +78,7 @@ char *getusername(void); /* * static prototypes */ -static RETSIGTYPE alrmser (int); +static void alrmser (int); static int message_fd (char **); static int header_fd (void); static void alert (char *, int); @@ -204,7 +204,7 @@ main (int argc, char **argv) } -static RETSIGTYPE +static void alrmser (int i) { #ifndef RELIABLE_SIGNALS diff --git a/uip/slocal.c b/uip/slocal.c index f10c76d..6b4c306 100644 --- a/uip/slocal.c +++ b/uip/slocal.c @@ -190,7 +190,7 @@ static int timely (char *, char *); static int usr_file (int, char *, int); static int usr_pipe (int, char *, char *, char **, int); static int usr_folder (int, char *); -static RETSIGTYPE alrmser (int); +static void alrmser (int); static void get_sender (char *, char **); static int copy_message (int, char *, int); static void verbose_printf (char *fmt, ...); @@ -1211,7 +1211,7 @@ usr_pipe (int fd, char *cmd, char *pgm, char **vec, int suppress) } -static RETSIGTYPE +static void alrmser (int i) { #ifndef RELIABLE_SIGNALS -- 1.7.10.4