patch 9.0.1544: recent glibc marks sigset() as a deprecated
Problem: Recent glibc marks sigset() as a deprecated.
Solution: Use sigaction() in mch_signal() if possible. (Ozaki Kiichi,
closes #12373)
diff --git a/src/os_unix.c b/src/os_unix.c
index 94cda9e..5bcac85 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -214,7 +214,10 @@
static int save_patterns(int num_pat, char_u **pat, int *num_file, char_u ***file);
#ifndef SIG_ERR
-# define SIG_ERR ((void (*)())-1)
+# define SIG_ERR ((sighandler_T)-1)
+#endif
+#ifndef SIG_HOLD
+# define SIG_HOLD ((sighandler_T)-2)
#endif
// volatile because it is used in signal handler sig_winch().
@@ -340,6 +343,62 @@
{-1, "Unknown!", FALSE}
};
+ sighandler_T
+mch_signal(int sig, sighandler_T func)
+{
+#if defined(HAVE_SIGACTION) && defined(HAVE_SIGPROCMASK)
+ // Modern implementation: use sigaction().
+ struct sigaction sa, old;
+ sigset_t curset;
+ int blocked;
+
+ if (sigprocmask(SIG_BLOCK, NULL, &curset) == -1)
+ return SIG_ERR;
+
+ blocked = sigismember(&curset, sig);
+
+ if (func == SIG_HOLD)
+ {
+ if (blocked)
+ return SIG_HOLD;
+
+ sigemptyset(&curset);
+ sigaddset(&curset, sig);
+
+ if (sigaction(sig, NULL, &old) == -1
+ || sigprocmask(SIG_BLOCK, &curset, NULL) == -1)
+ return SIG_ERR;
+ return old.sa_handler;
+ }
+
+ if (blocked)
+ {
+ sigemptyset(&curset);
+ sigaddset(&curset, sig);
+
+ if (sigprocmask(SIG_UNBLOCK, &curset, NULL) == -1)
+ return SIG_ERR;
+ }
+
+ sa.sa_handler = func;
+ sigemptyset(&sa.sa_mask);
+# ifdef SA_RESTART
+ sa.sa_flags = SA_RESTART;
+# else
+ sa.sa_flags = 0;
+# endif
+ if (sigaction(sig, &sa, &old) == -1)
+ return SIG_ERR;
+ return blocked ? SIG_HOLD: old.sa_handler;
+#elif defined(HAVE_SIGSET)
+ // Using sigset() is preferred above signal().
+ return sigset(sig, func);
+#else
+ // Oldest and most compatible solution.
+ return signal(sig, func);
+#endif
+}
+
int
mch_chdir(char *path)
{
@@ -349,11 +408,11 @@
smsg("chdir(%s)", path);
verbose_leave();
}
-# ifdef VMS
+#ifdef VMS
return chdir(vms_fixfilename(path));
-# else
+#else
return chdir(path);
-# endif
+#endif
}
// Why is NeXT excluded here (and not in os_unixx.h)?
@@ -869,7 +928,7 @@
sig_winch SIGDEFARG(sigarg)
{
// this is not required on all systems, but it doesn't hurt anybody
- signal(SIGWINCH, (void (*)(int))sig_winch);
+ mch_signal(SIGWINCH, sig_winch);
do_resize = TRUE;
}
#endif
@@ -881,7 +940,7 @@
// Second time we get called we actually need to suspend
if (in_mch_suspend)
{
- signal(SIGTSTP, ignore_sigtstp ? SIG_IGN : SIG_DFL);
+ mch_signal(SIGTSTP, ignore_sigtstp ? SIG_IGN : SIG_DFL);
raise(sigarg);
}
else
@@ -890,7 +949,7 @@
#if !defined(__ANDROID__) && !defined(__OpenBSD__) && !defined(__DragonFly__)
// This is not required on all systems. On some systems (at least Android,
// OpenBSD, and DragonFlyBSD) this breaks suspending with CTRL-Z.
- signal(SIGTSTP, (void (*)(int))sig_tstp);
+ mch_signal(SIGTSTP, sig_tstp);
#endif
}
#endif
@@ -900,7 +959,7 @@
catch_sigint SIGDEFARG(sigarg)
{
// this is not required on all systems, but it doesn't hurt anybody
- signal(SIGINT, (void (*)(int))catch_sigint);
+ mch_signal(SIGINT, catch_sigint);
got_int = TRUE;
}
#endif
@@ -910,7 +969,7 @@
catch_sigusr1 SIGDEFARG(sigarg)
{
// this is not required on all systems, but it doesn't hurt anybody
- signal(SIGUSR1, (void (*)(int))catch_sigusr1);
+ mch_signal(SIGUSR1, catch_sigusr1);
got_sigusr1 = TRUE;
}
#endif
@@ -920,7 +979,7 @@
catch_sigpwr SIGDEFARG(sigarg)
{
// this is not required on all systems, but it doesn't hurt anybody
- signal(SIGPWR, (void (*)())catch_sigpwr);
+ mch_signal(SIGPWR, catch_sigpwr);
/*
* I'm not sure we get the SIGPWR signal when the system is really going
* down or when the batteries are almost empty. Just preserve the swap
@@ -1364,7 +1423,7 @@
// that indicates the shell (or program) that launched us does not support
// tty job control and thus we should ignore that signal. If invoked as a
// restricted editor (e.g., as "rvim") SIGTSTP is always ignored.
- ignore_sigtstp = restricted || SIG_IGN == signal(SIGTSTP, SIG_ERR);
+ ignore_sigtstp = restricted || SIG_IGN == mch_signal(SIGTSTP, SIG_ERR);
#endif
set_signals();
@@ -1383,7 +1442,7 @@
/*
* WINDOW CHANGE signal is handled with sig_winch().
*/
- signal(SIGWINCH, (void (*)(int))sig_winch);
+ mch_signal(SIGWINCH, sig_winch);
#endif
#ifdef SIGTSTP
@@ -1391,20 +1450,20 @@
// In the GUI default TSTP processing is OK.
// Checking both gui.in_use and gui.starting because gui.in_use is not set
// at this point (set after menus are displayed), but gui.starting is set.
- signal(SIGTSTP, ignore_sigtstp ? SIG_IGN
+ mch_signal(SIGTSTP, ignore_sigtstp ? SIG_IGN
# ifdef FEAT_GUI
: gui.in_use || gui.starting ? SIG_DFL
# endif
- : (void (*)(int))sig_tstp);
+ : sig_tstp);
#endif
#if defined(SIGCONT)
- signal(SIGCONT, sigcont_handler);
+ mch_signal(SIGCONT, sigcont_handler);
#endif
#ifdef SIGPIPE
/*
* We want to ignore breaking of PIPEs.
*/
- signal(SIGPIPE, SIG_IGN);
+ mch_signal(SIGPIPE, SIG_IGN);
#endif
#ifdef SIGINT
@@ -1415,14 +1474,14 @@
/*
* Call user's handler on SIGUSR1
*/
- signal(SIGUSR1, (void (*)(int))catch_sigusr1);
+ mch_signal(SIGUSR1, catch_sigusr1);
#endif
/*
* Ignore alarm signals (Perl's alarm() generates it).
*/
#ifdef SIGALRM
- signal(SIGALRM, SIG_IGN);
+ mch_signal(SIGALRM, SIG_IGN);
#endif
#ifdef SIGPWR
@@ -1430,7 +1489,7 @@
* Catch SIGPWR (power failure?) to preserve the swap files, so that no
* work will be lost.
*/
- signal(SIGPWR, (void (*)())catch_sigpwr);
+ mch_signal(SIGPWR, catch_sigpwr);
#endif
/*
@@ -1443,7 +1502,7 @@
* When the GUI is running, ignore the hangup signal.
*/
if (gui.in_use)
- signal(SIGHUP, SIG_IGN);
+ mch_signal(SIGHUP, SIG_IGN);
#endif
}
@@ -1454,7 +1513,7 @@
static void
catch_int_signal(void)
{
- signal(SIGINT, (void (*)(int))catch_sigint);
+ mch_signal(SIGINT, catch_sigint);
}
#endif
@@ -1464,7 +1523,7 @@
catch_signals(SIG_DFL, SIG_DFL);
#if defined(SIGCONT)
// SIGCONT isn't in the list, because its default action is ignore
- signal(SIGCONT, SIG_DFL);
+ mch_signal(SIGCONT, SIG_DFL);
#endif
}
@@ -1506,7 +1565,7 @@
sv.sv_flags = SV_ONSTACK;
sigvec(signal_info[i].sig, &sv, NULL);
# else
- signal(signal_info[i].sig, func_deadly);
+ mch_signal(signal_info[i].sig, func_deadly);
# endif
#endif
}
@@ -1514,11 +1573,11 @@
{
// Deal with non-deadly signals.
#ifdef SIGTSTP
- signal(signal_info[i].sig,
+ mch_signal(signal_info[i].sig,
signal_info[i].sig == SIGTSTP && ignore_sigtstp
? SIG_IGN : func_other);
#else
- signal(signal_info[i].sig, func_other);
+ mch_signal(signal_info[i].sig, func_other);
#endif
}
}
@@ -1923,7 +1982,7 @@
if (x11_window != 0 && x11_display == NULL)
{
#ifdef SET_SIG_ALARM
- void (*sig_save)();
+ sighandler_T sig_save;
#endif
#ifdef ELAPSED_FUNC
elapsed_T start_tv;
@@ -1938,14 +1997,14 @@
* the network connection is bad. Set an alarm timer to get out.
*/
sig_alarm_called = FALSE;
- sig_save = (void (*)())signal(SIGALRM, (void (*)())sig_alarm);
+ sig_save = mch_signal(SIGALRM, sig_alarm);
alarm(2);
#endif
x11_display = XOpenDisplay(NULL);
#ifdef SET_SIG_ALARM
alarm(0);
- signal(SIGALRM, (void (*)())sig_save);
+ mch_signal(SIGALRM, sig_save);
if (p_verbose > 0 && sig_alarm_called)
verb_msg(_("Opening the X display timed out"));
#endif
@@ -3519,7 +3578,7 @@
{
if (deadly_signal != 0)
{
- signal(deadly_signal, SIG_DFL);
+ mch_signal(deadly_signal, SIG_DFL);
kill(getpid(), deadly_signal); // Die using the signal we caught
}
}
@@ -4828,7 +4887,7 @@
// will exit and send SIGHUP to all processes in its
// group, killing the just started process. Ignore SIGHUP
// to avoid that. (suggested by Simon Schubert)
- signal(SIGHUP, SIG_IGN);
+ mch_signal(SIGHUP, SIG_IGN);
# endif
}
# endif
@@ -7283,7 +7342,7 @@
// we are going to suspend or starting an external process
// so we shouldn't have problem with this
# ifdef SIGTSTP
- signal(SIGTSTP, restricted ? SIG_IGN : (void (*)())sig_tstp);
+ mch_signal(SIGTSTP, restricted ? SIG_IGN : sig_tstp);
# endif
return 1; // succeed
}
@@ -7415,7 +7474,7 @@
if (ioctl(1, CONS_MOUSECTL, &mouse) == -1)
return FAIL;
- signal(SIGUSR2, (void (*)())sig_sysmouse);
+ mch_signal(SIGUSR2, sig_sysmouse);
mouse.operation = MOUSE_SHOW;
ioctl(1, CONS_MOUSECTL, &mouse);
return OK;
@@ -7430,7 +7489,7 @@
{
struct mouse_info mouse;
- signal(SIGUSR2, restricted ? SIG_IGN : SIG_DFL);
+ mch_signal(SIGUSR2, restricted ? SIG_IGN : SIG_DFL);
mouse.operation = MOUSE_MODE;
mouse.u.mode.mode = 0;
mouse.u.mode.signal = 0;