Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Restore signalhandler in case of error. Fix type of signal handler.

This commit is contained in:
Martin v. Löwis 2002-12-31 14:30:26 +00:00
parent c5f5f87f74
commit c8b2e770cf
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Modules/posixmodule.c
View File

@ -2744,7 +2744,7 @@ posix_openpty(PyObject *self, PyObject *args)
char * slave_name; char * slave_name;
#endif #endif
#if defined(HAVE_DEV_PTMX) && !defined(HAVE_OPENPTY) && !defined(HAVE__GETPTY) #if defined(HAVE_DEV_PTMX) && !defined(HAVE_OPENPTY) && !defined(HAVE__GETPTY)
void *sig_saved; PyOS_sighandler_t sig_saved;
#ifdef sun #ifdef sun
extern char *ptsname(); extern char *ptsname();
#endif #endif
@ -2769,10 +2769,16 @@ posix_openpty(PyObject *self, PyObject *args)
if (master_fd < 0) if (master_fd < 0)
return posix_error(); return posix_error();
sig_saved = signal(SIGCHLD, SIG_DFL); sig_saved = signal(SIGCHLD, SIG_DFL);
if (grantpt(master_fd) < 0) /* change permission of slave */ /* change permission of slave */
if (grantpt(master_fd) < 0) {
signal(SIGCHLD, sig_saved);
return posix_error(); return posix_error();
if (unlockpt(master_fd) < 0) /* unlock slave */ }
/* unlock slave */
if (unlockpt(master_fd) < 0) {
signal(SIGCHLD, sig_saved);
return posix_error(); return posix_error();
}
signal(SIGCHLD, sig_saved); signal(SIGCHLD, sig_saved);
slave_name = ptsname(master_fd); /* get name of slave */ slave_name = ptsname(master_fd); /* get name of slave */
if (slave_name == NULL) if (slave_name == NULL)