KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix python3.7 fork registration not working

Browse Source
This commit is contained in:
Kovid Goyal 2020-12-31 10:38:26 +05:30
parent 1f7499e841
commit 72d193e852
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
kitty/child.c
View File

@ -78,10 +78,16 @@ spawn(PyObject *self UNUSED, PyObject *args) {
char **argv = serialize_string_tuple(argv_p); char **argv = serialize_string_tuple(argv_p);
char **env = serialize_string_tuple(env_p); char **env = serialize_string_tuple(env_p);
#if PY_VERSION_HEX >= 0x03070000
PyOS_BeforeFork();
#endif
pid_t pid = fork(); pid_t pid = fork();
switch(pid) { switch(pid) {
case 0: { case 0: {
// child // child
#if PY_VERSION_HEX >= 0x03070000
PyOS_AfterFork_Child();
#endif
sigset_t signals = {0}; sigset_t signals = {0};
struct sigaction act = {.sa_handler=SIG_DFL}; struct sigaction act = {.sa_handler=SIG_DFL};
#define SA(which) { if (sigaction(which, &act, NULL) != 0) exit_on_err("sigaction() in child process failed"); } #define SA(which) { if (sigaction(which, &act, NULL) != 0) exit_on_err("sigaction() in child process failed"); }
@ -138,10 +144,19 @@ spawn(PyObject *self UNUSED, PyObject *args) {
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
break; break;
} }
case -1: case -1: {
#if PY_VERSION_HEX >= 0x03070000
int saved_errno = errno;
PyOS_AfterFork_Parent();
errno = saved_errno;
#endif
PyErr_SetFromErrno(PyExc_OSError); PyErr_SetFromErrno(PyExc_OSError);
break; break;
}
default: default:
#if PY_VERSION_HEX >= 0x03070000
PyOS_AfterFork_Parent();
#endif
break; break;
} }
#undef exit_on_err #undef exit_on_err