diff options
author | Kenny Root <kenny@the-b.org> | 2015-08-27 13:00:46 -0700 |
---|---|---|
committer | Kenny Root <kenny@the-b.org> | 2015-08-27 13:20:28 -0700 |
commit | 82cb97e1b8e944826c865ac89c0acc8089754bab (patch) | |
tree | 1fbcda1a895285e5bc8ebeadae06b9d11b9f1dfe /app | |
parent | 7de5ce146e721cbc7296c8110f6bed26d9eae8e2 (diff) | |
download | connectbot-82cb97e1b8e944826c865ac89c0acc8089754bab.tar.gz connectbot-82cb97e1b8e944826c865ac89c0acc8089754bab.tar.bz2 connectbot-82cb97e1b8e944826c865ac89c0acc8089754bab.zip |
Remove reference to grantpt
grantpt doesn't do anything on Android since it uses devpts.
Diffstat (limited to 'app')
-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; |