add ptsname_r (nonstandard) and split ptsname (standard) to separate file

this eliminates the ugly static buffer in programs that use ptsname_r.

diff --git a/include/stdlib.h b/include/stdlib.h
index 27784c6..a12192f 100644 (file)
--- a/include/stdlib.h
+++ b/include/stdlib.h
@@ -125,6 +125,7 @@ char *mktemp (char *);
 void *valloc (size_t);
 void *memalign(size_t, size_t);
 int clearenv(void);
+int ptsname_r(int, char *, size_t);
 #endif
 
 

diff --git a/src/misc/ptsname.c b/src/misc/ptsname.c
new file mode 100644 (file)
index 0000000..4f56781
--- /dev/null
+++ b/src/misc/ptsname.c
@@ -0,0 +1,9 @@
+#include <stdlib.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;
+}

diff --git a/src/misc/pty.c b/src/misc/pty.c
index 0d25a83..6ca33e3 100644 (file)
--- a/src/misc/pty.c
+++ b/src/misc/pty.c
@@ -2,6 +2,7 @@
 #include <sys/ioctl.h>
 #include <stdio.h>
 #include <fcntl.h>
+#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);