Start 1.33.0 development cycle

[oweals/busybox.git] / libbb / getpty.c

diff --git a/libbb/getpty.c b/libbb/getpty.c
index c006e34f5f90a0aab8d94eb5174a27e6750318c4..9ec6265ad3648b7e1c920e1a36ba1e2cf4619ccf 100644 (file)
--- a/libbb/getpty.c
+++ b/libbb/getpty.c
@@ -3,28 +3,37 @@
  * Mini getpty implementation for busybox
  * Bjorn Wesen, Axis Communications AB (bjornw@axis.com)
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
-
 #include "libbb.h"
 
 #define DEBUG 0
 
-int getpty(char *line, int size)
+int FAST_FUNC xgetpty(char *line)
 {
        int p;
+
 #if ENABLE_FEATURE_DEVPTS
        p = open("/dev/ptmx", O_RDWR);
-       if (p > 0) {
-               const char *name;
-               grantpt(p);
-               unlockpt(p);
-               name = ptsname(p);
-               if (!name) {
-                       bb_perror_msg("ptsname error (is /dev/pts mounted?)");
-                       return -1;
+       if (p >= 0) {
+               grantpt(p); /* chmod+chown corresponding slave pty */
+               unlockpt(p); /* (what does this do?) */
+# ifndef HAVE_PTSNAME_R
+               {
+                       const char *name;
+                       name = ptsname(p); /* find out the name of slave pty */
+                       if (!name) {
+                               bb_simple_perror_msg_and_die("ptsname error (is /dev/pts mounted?)");
+                       }
+                       safe_strncpy(line, name, GETPTY_BUFSIZE);
                }
-               safe_strncpy(line, name, size);
+# else
+               /* find out the name of slave pty */
+               if (ptsname_r(p, line, GETPTY_BUFSIZE-1) != 0) {
+                       bb_simple_perror_msg_and_die("ptsname error (is /dev/pts mounted?)");
+               }
+               line[GETPTY_BUFSIZE-1] = '\0';
+# endif
                return p;
        }
 #else
@@ -52,7 +61,5 @@ int getpty(char *line, int size)
                }
        }
 #endif /* FEATURE_DEVPTS */
-       return -1;
+       bb_simple_error_msg_and_die("can't find free pty");
 }
-
-