提交 3b26a32d 编写于 作者: R Rich Felker

don't write openpty results until success is determined

not only is this semantically more correct; it also reduces code size
slightly by eliminating the need for the compiler to assume the
possibility of aliasing.
上级 4b2cb377
...@@ -6,28 +6,30 @@ ...@@ -6,28 +6,30 @@
/* Nonstandard, but vastly superior to the standard functions */ /* 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;
char buf[20]; char buf[20];
*m = open("/dev/ptmx", O_RDWR|O_NOCTTY); m = open("/dev/ptmx", O_RDWR|O_NOCTTY);
if (*m < 0) return -1; if (m < 0) return -1;
if (ioctl(*m, TIOCSPTLCK, &n) || ioctl (*m, TIOCGPTN, &n)) { if (ioctl(m, TIOCSPTLCK, &n) || ioctl (m, TIOCGPTN, &n)) {
close(*m); close(m);
return -1; return -1;
} }
if (!name) name = buf; if (!name) name = buf;
snprintf(name, sizeof buf, "/dev/pts/%d", n); snprintf(name, sizeof buf, "/dev/pts/%d", n);
if ((*s = open(name, O_RDWR|O_NOCTTY)) < 0) { if ((s = open(name, O_RDWR|O_NOCTTY)) < 0) {
close(*m); close(m);
return -1; return -1;
} }
if (tio) tcsetattr(*s, TCSANOW, tio); if (tio) tcsetattr(s, TCSANOW, tio);
if (ws) ioctl(*s, TIOCSWINSZ, ws); if (ws) ioctl(s, TIOCSWINSZ, ws);
*pm = m;
*ps = s;
return 0; return 0;
} }
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册