commit b0b856e2c69b594b7ba63dccaaaf0e12ac165b65
author Elliott Hughes <enh@google.com> Tue Jul 29 11:05:18 2014 -0700
committer Elliott Hughes <enh@google.com> Tue Jul 29 11:08:57 2014 -0700
tree 43341a6cd5a1eeb6c670489a02f24811cd11cd1e
parent 1e92ed5e83474c157237de18af5b2201095f37e3

Fix "ptsname is not thread-safe; use ptsname_r instead" build break.

(cherry picked from commit 84cfd1092d1087a9a4d9f13c2fa2440ecd73f5fc)

Change-Id: I5035348a4b17648996c7b8d53c990e3cebbe4baf

logwrapper/logwrap.c

diff --git a/logwrapper/logwrap.c b/logwrapper/logwrap.c
index d47c9b5..3a6276e 100644
--- a/logwrapper/logwrap.c
+++ b/logwrapper/logwrap.c
@@ -477,7 +477,6 @@
     pid_t pid;
     int parent_ptty;
     int child_ptty;
-    char *child_devname = NULL;
     struct sigaction intact;
     struct sigaction quitact;
     sigset_t blockset;
@@ -498,8 +497,9 @@
         goto err_open;
     }
 
+    char child_devname[64];
     if (grantpt(parent_ptty) || unlockpt(parent_ptty) ||
-            ((child_devname = (char*)ptsname(parent_ptty)) == 0)) {
+            ptsname_r(parent_ptty, child_devname, sizeof(child_devname)) != 0) {
         ERROR("Problem with /dev/ptmx\n");
         rc = -1;
         goto err_ptty;