ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

am f6304733: Merge "Fix "ptsname is not thread-safe; use ptsname_r instead" build break."

Browse source 
* commit 'f6304733878628b6a003a4ea3588b9fbb5943ce5':
  Fix "ptsname is not thread-safe; use ptsname_r instead" build break.
This commit is contained in:
Elliott Hughes 2014-07-29 18:12:14 +00:00 • committed by Android Git Automerger
commit 3617bdf3ef
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
logwrapper/logwrap.c
View file

@ -477,7 +477,6 @@ int android_fork_execvp_ext(int argc, char* argv[], int *status, bool ignore_int
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 @@ int android_fork_execvp_ext(int argc, char* argv[], int *status, bool ignore_int
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;