Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/libbb/getpty.c

Timestamp:

Jan 1, 2014, 12:47:38 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.21.1

File:

• branches/3.2/mindi-busybox/libbb/getpty.c (modified) (2 diffs)

branches/3.2/mindi-busybox/libbb/getpty.c

@@ -20 +20 @@
         grantpt(p); /* chmod+chown corresponding slave pty */
         unlockpt(p); /* (what does this do?) */
-#if 0 /* if ptsname_r is not available... */
-        const char *name;
-        name = ptsname(p); /* find out the name of slave pty */
-        if (!name) {
-            bb_perror_msg_and_die("ptsname error (is /dev/pts mounted?)");
+# ifndef HAVE_PTSNAME_R
+        {
+            const char *name;
+            name = ptsname(p); /* find out the name of slave pty */
+            if (!name) {
+                bb_perror_msg_and_die("ptsname error (is /dev/pts mounted?)");
+            }
+            safe_strncpy(line, name, GETPTY_BUFSIZE);
         }
-        safe_strncpy(line, name, GETPTY_BUFSIZE);
-#else
+# else
         /* find out the name of slave pty */
         if (ptsname_r(p, line, GETPTY_BUFSIZE-1) != 0) {
@@ -33 +35 @@
         }
         line[GETPTY_BUFSIZE-1] = '\0';
-#endif
+# endif
         return p;
     }