| Index: fusl/src/misc/openpty.c
|
| diff --git a/fusl/src/misc/openpty.c b/fusl/src/misc/openpty.c
|
| index c10740606111778c16b1d6c3dd3adb5a791240b6..d9dd67f7b0a7ec4070fc429aa7b09f9a7b652281 100644
|
| --- a/fusl/src/misc/openpty.c
|
| +++ b/fusl/src/misc/openpty.c
|
| @@ -7,34 +7,41 @@
|
|
|
| /* 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, cs;
|
| - char buf[20];
|
| -
|
| - m = open("/dev/ptmx", O_RDWR|O_NOCTTY);
|
| - if (m < 0) 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)
|
| - goto fail;
|
| -
|
| - if (tio) tcsetattr(s, TCSANOW, tio);
|
| - if (ws) ioctl(s, TIOCSWINSZ, ws);
|
| -
|
| - *pm = m;
|
| - *ps = s;
|
| -
|
| - pthread_setcancelstate(cs, 0);
|
| - return 0;
|
| +int openpty(int* pm,
|
| + int* ps,
|
| + char* name,
|
| + const struct termios* tio,
|
| + const struct winsize* ws) {
|
| + int m, s, n = 0, cs;
|
| + char buf[20];
|
| +
|
| + m = open("/dev/ptmx", O_RDWR | O_NOCTTY);
|
| + if (m < 0)
|
| + 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)
|
| + 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;
|
| + close(m);
|
| + pthread_setcancelstate(cs, 0);
|
| + return -1;
|
| }
|
|
|