X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fmisc%2Fopenpty.c;h=c10740606111778c16b1d6c3dd3adb5a791240b6;hb=1d5750b95c06913a1f18a995481276d698d20fae;hp=102024732d09296596eb9b857ed316fb3ffc0685;hpb=d40e344f7b311980dfe3c165d8cbecfe04c12bd2;p=musl

diff --git a/src/misc/openpty.c b/src/misc/openpty.c
index 10202473..c1074060 100644
--- a/src/misc/openpty.c
+++ b/src/misc/openpty.c
@@ -3,31 +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 *m, int *s, char *name, const struct termios *tio, const struct winsize *ws)
+int openpty(int *pm, int *ps, char *name, const struct termios *tio, const struct winsize *ws)
 {
-	int n=0;
+	int m, s, n=0, cs;
 	char buf[20];
 
-	*m = open("/dev/ptmx", O_RDWR|O_NOCTTY);
-	if (*m < 0) return -1;
+	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);
 
-	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;
 }