Apply post-1.19.0 patches, bump version to 1.19.11_19_1

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

1 files changed, 10 insertions, 8 deletions

diff --git a/libbb/getpty.c b/libbb/getpty.c
index 6a15cff2f..435e4d09f 100644
--- a/libbb/getpty.c
+++ b/libbb/getpty.c
@@ -19,20 +19,22 @@ int FAST_FUNC xgetpty(char *line)
         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_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) {
                         bb_perror_msg_and_die("ptsname error (is /dev/pts mounted?)");
                 }
                 line[GETPTY_BUFSIZE-1] = '\0';
-#endif
+# endif
                 return p;
         }
 #else