From 750b738e53f799443fcfcd3a0751318c072a022f Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Wed, 13 Apr 2011 08:35:32 -0400 Subject: add ptsname_r (nonstandard) and split ptsname (standard) to separate file this eliminates the ugly static buffer in programs that use ptsname_r. --- src/misc/ptsname.c | 9 +++++++++ src/misc/pty.c | 18 +++++++----------- 2 files changed, 16 insertions(+), 11 deletions(-) create mode 100644 src/misc/ptsname.c (limited to 'src/misc') diff --git a/src/misc/ptsname.c b/src/misc/ptsname.c new file mode 100644 index 00000000..4f56781d --- /dev/null +++ b/src/misc/ptsname.c @@ -0,0 +1,9 @@ +#include + +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; +} diff --git a/src/misc/pty.c b/src/misc/pty.c index 0d25a836..6ca33e31 100644 --- a/src/misc/pty.c +++ b/src/misc/pty.c @@ -2,6 +2,7 @@ #include #include #include +#include "libc.h" int posix_openpt(int flags) { @@ -19,17 +20,12 @@ int unlockpt(int fd) return ioctl(fd, TIOCSPTLCK, &unlock); } -char *ptsname(int fd) +int __ptsname_r(int fd, char *buf, size_t len) { - static char buf[9 + sizeof(int)*3 + 1]; - char *s = buf+sizeof(buf)-1; int pty; - if (ioctl (fd, TIOCGPTN, &pty)) - return NULL; - if (pty) for (; pty; pty/=10) *--s = '0' + pty%10; - else *--s = '0'; - s -= 9; - s[0] = '/'; s[1] = 'd'; s[2] = 'e'; s[3] = 'v'; - s[4] = '/'; s[5] = 'p'; s[6] = 't'; s[7] = 's'; s[8] = '/'; - return s; + if (!buf) len = 0; + return -( ioctl (fd, TIOCGPTN, &pty) < 0 + || snprintf(buf, len, "/dev/pts/%d", pty) >= len ); } + +weak_alias(__ptsname_r, ptsname_r); -- cgit v1.2.1