Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ec531e5c authored by Elliott Hughes's avatar Elliott Hughes Committed by Android Git Automerger
Browse files

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

* commit '47a12389':
  Fix adb "ptsname is not thread-safe; use ptsname_r instead" build break.
parents 3617bdf3 47a12389

adb/services.c

+2 −3
Original line number Diff line number Diff line
@@ -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);

    return -1;

#else /* !HAVE_WIN32_PROC */

    char *devname;

    int ptm;



    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;

    }



    if(grantpt(ptm) || unlockpt(ptm) ||

       ((devname = (char*) ptsname(ptm)) == 0)){

    char devname[64];

    if(grantpt(ptm) || unlockpt(ptm) || ptsname_r(ptm, devname, sizeof(devname)) != 0) {

        printf("[ trouble with /dev/ptmx - %s ]\n", strerror(errno));

        adb_close(ptm);

        return -1;