summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2012-06-20 15:11:27 -0400
committerRich Felker <dalias@aerifal.cx>2012-06-20 15:11:27 -0400
commitc21a19d5a559cbd39963b89547900d24624f1fad (patch)
tree155427ae2cd3e35ce2a2f58fb22d0d6544493406
parentcea106fb8976d04b916953469439bc58fa111266 (diff)
downloadmusl-c21a19d5a559cbd39963b89547900d24624f1fad.tar.gz
musl-c21a19d5a559cbd39963b89547900d24624f1fad.tar.bz2
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.
-rw-r--r--src/misc/ptsname.c8
-rw-r--r--src/misc/pty.c9
2 files changed, 13 insertions, 4 deletions
diff --git a/src/misc/ptsname.c b/src/misc/ptsname.c
index 4f56781d..a3477927 100644
--- a/src/misc/ptsname.c
+++ b/src/misc/ptsname.c
@@ -1,9 +1,15 @@
#include <stdlib.h>
+#include <errno.h>
int __ptsname_r(int, char *, size_t);
char *ptsname(int fd)
{
static char buf[9 + sizeof(int)*3 + 1];
- return __ptsname_r(fd, buf, sizeof buf) < 0 ? 0 : buf;
+ int err = __ptsname_r(fd, buf, sizeof buf);
+ if (err) {
+ errno = err;
+ return 0;
+ }
+ return buf;
}
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);