diff options
| author | Rich Felker <dalias@aerifal.cx> | 2014-12-20 23:22:57 -0500 |
|---|---|---|
| committer | Rich Felker <dalias@aerifal.cx> | 2014-12-20 23:22:57 -0500 |
| commit | 3b26a32df42092af6d0cdac655e52635b91d36b2 (patch) | |
| tree | 84b1efc57b5c23da99b377883f62c201d35a155a | |
| parent | 4b2cb37770e56835b261660535cea77474154ba0 (diff) | |
| download | musl-3b26a32df42092af6d0cdac655e52635b91d36b2.tar.gz musl-3b26a32df42092af6d0cdac655e52635b91d36b2.tar.xz musl-3b26a32df42092af6d0cdac655e52635b91d36b2.zip | |
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.
| -rw-r--r-- | src/misc/openpty.c | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/src/misc/openpty.c b/src/misc/openpty.c index 10202473..b6962e13 100644 --- a/src/misc/openpty.c +++ b/src/misc/openpty.c @@ -6,28 +6,30 @@ /* 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]; - *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); + if (ioctl(m, TIOCSPTLCK, &n) || ioctl (m, TIOCGPTN, &n)) { + close(m); return -1; } if (!name) name = buf; snprintf(name, sizeof buf, "/dev/pts/%d", n); - if ((*s = open(name, O_RDWR|O_NOCTTY)) < 0) { - close(*m); + if ((s = open(name, O_RDWR|O_NOCTTY)) < 0) { + close(m); return -1; } - 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; return 0; } |