summaryrefslogtreecommitdiff
path: root/src/misc
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2014-12-20 23:38:25 -0500
committerRich Felker <dalias@aerifal.cx>2014-12-20 23:38:25 -0500
commit1227e418eafbbe55e74eee5d2b1e6e53a60102cd (patch)
treed0b7e0198c3184b7910fdbe2cf259917dd2e652f /src/misc
parent3b26a32df42092af6d0cdac655e52635b91d36b2 (diff)
downloadmusl-1227e418eafbbe55e74eee5d2b1e6e53a60102cd.tar.gz
block pthread cancellation in openpty function
being a nonstandard function, this isn't strictly necessary, but it's inexpensive and avoids unpleasant surprises. eventually I would like all functions in libc to be safe against cancellation, either ignoring it or acting on it cleanly.
Diffstat (limited to 'src/misc')
-rw-r--r--src/misc/openpty.c23
1 files changed, 14 insertions, 9 deletions
diff --git a/src/misc/openpty.c b/src/misc/openpty.c
index b6962e13..c1074060 100644
--- a/src/misc/openpty.c
+++ b/src/misc/openpty.c
@@ -3,33 +3,38 @@
#include <unistd.h>
#include <pty.h>
#include <stdio.h>
+#include <pthread.h>
/* Nonstandard, but vastly superior to the standard functions */
int openpty(int *pm, int *ps, char *name, const struct termios *tio, const struct winsize *ws)
{
- int m, s, n=0;
+ int m, s, n=0, cs;
char buf[20];
m = open("/dev/ptmx", O_RDWR|O_NOCTTY);
if (m < 0) return -1;
- if (ioctl(m, TIOCSPTLCK, &n) || ioctl (m, TIOCGPTN, &n)) {
- close(m);
- return -1;
- }
+ pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cs);
+
+ if (ioctl(m, TIOCSPTLCK, &n) || ioctl (m, TIOCGPTN, &n))
+ goto fail;
if (!name) name = buf;
snprintf(name, sizeof buf, "/dev/pts/%d", n);
- if ((s = open(name, O_RDWR|O_NOCTTY)) < 0) {
- close(m);
- return -1;
- }
+ if ((s = open(name, O_RDWR|O_NOCTTY)) < 0)
+ goto fail;
if (tio) tcsetattr(s, TCSANOW, tio);
if (ws) ioctl(s, TIOCSWINSZ, ws);
*pm = m;
*ps = s;
+
+ pthread_setcancelstate(cs, 0);
return 0;
+fail:
+ close(m);
+ pthread_setcancelstate(cs, 0);
+ return -1;
}