thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 9.0.1544: recent glibc marks sigset() as a deprecated

Browse Source 
Problem:    Recent glibc marks sigset() as a deprecated.
Solution:   Use sigaction() in mch_signal() if possible. (Ozaki Kiichi,
            closes #12373)
This commit is contained in:
ichizok
2023-05-11 22:25:42 +01:00
committed by Bram Moolenaar
parent 5d01f86d99
commit 378447fc18
12 changed files with 137 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/pty.c
View File

@@ -186,9 +186,9 @@ setup_slavepty(int fd)
int
mch_openpty(char **ttyn)
{
int f;
char *m;
void (*sigcld) SIGPROTOARG;
int f;
char *m;
sighandler_T sigcld;
static char TtyName[32]; // used for opening a new pty-pair
if ((f = posix_openpt(O_RDWR | O_NOCTTY | O_EXTRA)) == -1)
@@ -196,14 +196,14 @@ mch_openpty(char **ttyn)
// SIGCHLD set to SIG_DFL for grantpt() because it fork()s and
// exec()s pt_chmod
sigcld = signal(SIGCHLD, SIG_DFL);
sigcld = mch_signal(SIGCHLD, SIG_DFL);
if ((m = ptsname(f)) == NULL || grantpt(f) || unlockpt(f))
{
signal(SIGCHLD, sigcld);
mch_signal(SIGCHLD, sigcld);
close(f);
return -1;
}
signal(SIGCHLD, sigcld);
mch_signal(SIGCHLD, sigcld);
vim_strncpy((char_u *)TtyName, (char_u *)m, sizeof(TtyName) - 1);
initmaster(f);
*ttyn = TtyName;
@@ -285,9 +285,9 @@ mch_openpty(char **ttyn)
int
mch_openpty(char **ttyn)
{
int f;
char *m;
void (*sigcld) SIGPROTOARG;
int f;
char *m;
sighandler_T sigcld;
// used for opening a new pty-pair:
static char TtyName[32];
@@ -298,14 +298,14 @@ mch_openpty(char **ttyn)
* SIGCHLD set to SIG_DFL for grantpt() because it fork()s and
* exec()s pt_chmod
*/
sigcld = signal(SIGCHLD, SIG_DFL);
sigcld = mch_signal(SIGCHLD, SIG_DFL);
if ((m = ptsname(f)) == NULL || grantpt(f) || unlockpt(f))
{
signal(SIGCHLD, sigcld);
mch_signal(SIGCHLD, sigcld);
close(f);
return -1;
}
signal(SIGCHLD, sigcld);
mch_signal(SIGCHLD, sigcld);
vim_strncpy((char_u *)TtyName, (char_u *)m, sizeof(TtyName) - 1);
initmaster(f);
*ttyn = TtyName;