mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 08:59:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Patch #975056 - fixes for restartable signals on *BSD. In addition,

Browse source 
a few remaining calls to signal() were converted to PyOS_setsig().
This commit is contained in:
Anthony Baxter 2004-10-13 14:48:50 +00:00
parent 7d428788e1
commit 9ceaa72ebe
5 changed files with 28 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Modules/posixmodule.c
View file

@ -2903,18 +2903,18 @@ posix_openpty(PyObject *self, PyObject *noargs)
master_fd = open(DEV_PTY_FILE, O_RDWR | O_NOCTTY); /* open master */
if (master_fd < 0)
return posix_error();
sig_saved = signal(SIGCHLD, SIG_DFL);
sig_saved = PyOS_setsig(SIGCHLD, SIG_DFL);
/* change permission of slave */
if (grantpt(master_fd) < 0) {
signal(SIGCHLD, sig_saved);
PyOS_setsig(SIGCHLD, sig_saved);
return posix_error();
}
/* unlock slave */
if (unlockpt(master_fd) < 0) {
signal(SIGCHLD, sig_saved);
PyOS_setsig(SIGCHLD, sig_saved);
return posix_error();
}
signal(SIGCHLD, sig_saved);
PyOS_setsig(SIGCHLD, sig_saved);
slave_name = ptsname(master_fd); /* get name of slave */
if (slave_name == NULL)
return posix_error();

6
Modules/signalmodule.c
View file

@ -136,9 +136,6 @@ signal_handler(int sig_num)
to the Python handler... */
return;
}
#endif
#ifdef HAVE_SIGINTERRUPT
siginterrupt(sig_num, 1);
#endif
PyOS_setsig(sig_num, signal_handler);
}
@ -217,9 +214,6 @@ signal_signal(PyObject *self, PyObject *args)
}
else
func = signal_handler;
#ifdef HAVE_SIGINTERRUPT
siginterrupt(sig_num, 1);
#endif
if (PyOS_setsig(sig_num, func) == SIG_ERR) {
PyErr_SetFromErrno(PyExc_RuntimeError);
return NULL;

2
Modules/socketmodule.c
View file

@ -217,7 +217,7 @@ shutdown(how) -- shut down traffic in one or both directions\n\
/* Generic includes */
#include <sys/types.h>
#include <signal.h>
//#include <signal.h>
/* Generic socket object definitions and includes */
#define PySocket_BUILDING_SOCKET