diff options
| author | Kenny Root <kenny@the-b.org> | 2015-08-27 13:09:43 -0700 |
|---|---|---|
| committer | Kenny Root <kenny@the-b.org> | 2015-08-27 13:09:43 -0700 |
| commit | d585b54b51c67e6fc82853937b29455932ede44b (patch) | |
| tree | c84cd35d9d9bed778cddfd5ebd7ea39fed831c4f | |
| parent | a2232aae9e4d79f79a56e23d026ee0f03ff18792 (diff) | |
| parent | 63d5afd93ce1371809c7e21800d9091389672d87 (diff) | |
| download | connectbot-d585b54b51c67e6fc82853937b29455932ede44b.tar.gz connectbot-d585b54b51c67e6fc82853937b29455932ede44b.tar.bz2 connectbot-d585b54b51c67e6fc82853937b29455932ede44b.zip | |
Merge pull request #156 from kruton/no-grantpt
Remove reference to grantpt
| -rw-r--r-- | app/src/main/jni/com_google_ase_Exec.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/app/src/main/jni/com_google_ase_Exec.cpp b/app/src/main/jni/com_google_ase_Exec.cpp index b2fa39f..a9d1aba 100644 --- a/app/src/main/jni/com_google_ase_Exec.cpp +++ b/app/src/main/jni/com_google_ase_Exec.cpp @@ -90,7 +90,12 @@ static int create_subprocess( } fcntl(ptm, F_SETFD, FD_CLOEXEC); - if(grantpt(ptm) || unlockpt(ptm) || + if( +#if !defined(ANDROID) + /* this actually doesn't do anything on Android */ + grantpt(ptm) || +#endif + unlockpt(ptm) || ptsname_r(ptm, devname, sizeof(devname))){ LOG("[ trouble with /dev/ptmx - %s ]\n", strerror(errno)); return -1; |