ptsname: Fix misuse of ttyname_r.

diff --git a/ChangeLog b/ChangeLog
index 9cdd83a51c5bbb7887bf7f21752b355ee291ba70..9208e2fdd94be9c54db25cdddd4b007f2c60c5fc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-04-25  Bruno Haible  <bruno@clisp.org>
+
+       ptsname: Fix misuse of ttyname_r.
+       * lib/ptsname.c (__ptsname_r): Use __ttyname_r's return value instead
+       of errno.
+
 2010-04-25  Bruno Haible  <bruno@clisp.org>
 
        ttyname_r: Make it work on Solaris 10.

diff --git a/lib/ptsname.c b/lib/ptsname.c
index a62ef2104af2c61e117581da19d86f2ac1ec4429..3c7a9e043b876970eacfbdad4052cc8a302c7865 100644 (file)
--- a/lib/ptsname.c
+++ b/lib/ptsname.c
@@ -63,6 +63,7 @@ static int
 __ptsname_r (int fd, char *buf, size_t buflen)
 {
   int save_errno = errno;
+  int err;
   struct stat st;
 
   if (buf == NULL)
@@ -81,8 +82,12 @@ __ptsname_r (int fd, char *buf, size_t buflen)
       return ERANGE;
     }
 
-  if (__ttyname_r (fd, buf, buflen) != 0)
-    return errno;
+  err = __ttyname_r (fd, buf, buflen);
+  if (err != 0)
+    {
+      __set_errno (err);
+      return errno;
+    }
 
   buf[sizeof (_PATH_DEV) - 1] = 't';