diff options
author | Rich Felker <dalias@aerifal.cx> | 2012-06-20 15:11:27 -0400 |
---|---|---|
committer | Rich Felker <dalias@aerifal.cx> | 2012-06-20 15:11:27 -0400 |
commit | c21a19d5a559cbd39963b89547900d24624f1fad (patch) | |
tree | 155427ae2cd3e35ce2a2f58fb22d0d6544493406 /src/misc/pty.c | |
parent | cea106fb8976d04b916953469439bc58fa111266 (diff) | |
download | musl-c21a19d5a559cbd39963b89547900d24624f1fad.tar.gz musl-c21a19d5a559cbd39963b89547900d24624f1fad.tar.xz musl-c21a19d5a559cbd39963b89547900d24624f1fad.zip |
fix ptsname_r to conform to the upcoming posix requirements
it should return the error code rather than 0/-1 and setting errno.
Diffstat (limited to 'src/misc/pty.c')
-rw-r--r-- | src/misc/pty.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/misc/pty.c b/src/misc/pty.c index 6ca33e31..9e201ef3 100644 --- a/src/misc/pty.c +++ b/src/misc/pty.c @@ -2,7 +2,9 @@ #include <sys/ioctl.h> #include <stdio.h> #include <fcntl.h> +#include <errno.h> #include "libc.h" +#include "syscall.h" int posix_openpt(int flags) { @@ -22,10 +24,11 @@ int unlockpt(int fd) int __ptsname_r(int fd, char *buf, size_t len) { - int pty; + int pty, err; if (!buf) len = 0; - return -( ioctl (fd, TIOCGPTN, &pty) < 0 - || snprintf(buf, len, "/dev/pts/%d", pty) >= len ); + if ((err = __syscall(SYS_ioctl, fd, TIOCGPTN, &pty))) return err; + if (snprintf(buf, len, "/dev/pts/%d", pty) >= len) return ERANGE; + return 0; } weak_alias(__ptsname_r, ptsname_r); |