chiark
/
gitweb
/
~mdw
/
termux-packages
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
879a9ab
)
ndk_patches: Fix pwd.h patch to compile in more cases
author
Fredrik Fornwall
<fredrik@fornwall.net>
Fri, 31 Jul 2015 01:20:15 +0000
(21:20 -0400)
committer
Fredrik Fornwall
<fredrik@fornwall.net>
Fri, 31 Jul 2015 01:20:15 +0000
(21:20 -0400)
ndk_patches/pwd.patch
patch
|
blob
|
blame
|
history
diff --git
a/ndk_patches/pwd.patch
b/ndk_patches/pwd.patch
index 2cd2cb8ff48995db4698867d18d25a9ece25491d..bee01ee12091c9d5e823d57aa17520456cfe0f52 100644
(file)
--- a/
ndk_patches/pwd.patch
+++ b/
ndk_patches/pwd.patch
@@
-25,7
+25,7
@@
diff -u -r /home/fornwall/lib/android-ndk/platforms/android-21/arch-arm/usr/incl
+ char* result = realpath("@TERMUX_HOME@/.termux/shell", realpath_buffer);
+ if (result == NULL || access(realpath_buffer, X_OK) == -1) {
+ char const* bash_path = "@TERMUX_PREFIX@/bin/bash";
-+ if (access(bash_path, X_OK) != -1) pw->pw_shell = bash_path;
++ if (access(bash_path, X_OK) != -1) pw->pw_shell =
(char*)
bash_path;
+ else pw->pw_shell = "@TERMUX_PREFIX@/bin/ash";
+ } else {
+ pw->pw_shell = realpath_buffer;