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

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

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

5
adb/services.c
View file

@ -206,7 +206,6 @@ static int create_subproc_pty(const char *cmd, const char *arg0, const char *arg
fprintf(stderr, "error: create_subproc_pty not implemented on Win32 (%s %s %s)\n", cmd, arg0, arg1); fprintf(stderr, "error: create_subproc_pty not implemented on Win32 (%s %s %s)\n", cmd, arg0, arg1);
return -1; return -1;
#else /* !HAVE_WIN32_PROC */ #else /* !HAVE_WIN32_PROC */
char *devname;
int ptm; int ptm;
ptm = unix_open("/dev/ptmx", O_RDWR | O_CLOEXEC); // | O_NOCTTY); ptm = unix_open("/dev/ptmx", O_RDWR | O_CLOEXEC); // | O_NOCTTY);
@ -215,8 +214,8 @@ static int create_subproc_pty(const char *cmd, const char *arg0, const char *arg
return -1; return -1;
} }
if(grantpt(ptm) || unlockpt(ptm) || char devname[64];
((devname = (char*) ptsname(ptm)) == 0)){ if(grantpt(ptm) || unlockpt(ptm) || ptsname_r(ptm, devname, sizeof(devname)) != 0) {
printf("[ trouble with /dev/ptmx - %s ]\n", strerror(errno)); printf("[ trouble with /dev/ptmx - %s ]\n", strerror(errno));
adb_close(ptm); adb_close(ptm);
return -1; return -1;