X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/d3e5452e3ee76b8c454bc018f03d53ec567c49de..09cbf04fb6e2f29076f45a4cbac6f958f2187979:/ndk-patches/pwd.h.patch

diff --git a/ndk-patches/pwd.h.patch b/ndk-patches/pwd.h.patch
index 2d39b85b..7fc34ee4 100644
--- a/ndk-patches/pwd.h.patch
+++ b/ndk-patches/pwd.h.patch
@@ -1,15 +1,6 @@
 diff -u -r /home/fornwall/lib/android-ndk/sysroot/usr/include/pwd.h ./usr/include/pwd.h
 --- /home/fornwall/lib/android-ndk/sysroot/usr/include/pwd.h	2017-06-20 17:41:56.000000000 +0200
 +++ ./usr/include/pwd.h	2017-06-26 11:45:26.036064547 +0200
-@@ -63,6 +63,8 @@
- #include <sys/cdefs.h>
- #include <sys/types.h>
- 
-+#include <stdlib.h> /* For realpath() */
-+
- __BEGIN_DECLS
- 
- struct passwd {
 @@ -89,7 +91,6 @@
  struct passwd* getpwent(void) __INTRODUCED_IN(26);
  
@@ -18,23 +9,20 @@ diff -u -r /home/fornwall/lib/android-ndk/sysroot/usr/include/pwd.h ./usr/includ
  #endif /* __ANDROID_API__ >= 26 */
  
  
-@@ -99,6 +100,54 @@
+@@ -99,6 +100,51 @@
  int getpwuid_r(uid_t, struct passwd*, char*, size_t, struct passwd**) __INTRODUCED_IN(12);
  #endif /* __ANDROID_API__ >= 12 */
  
 +int access(const char* __path, int __mode);
 +
 +static void android_setup_pwd(struct passwd* pw) {
-+	static char realpath_buffer[4096/*PATH_MAX*/];
-+	char* result = realpath("/data/data/com.termux/files/home/.termux/shell", realpath_buffer);
-+	if (result == NULL || access(realpath_buffer, /*X_OK*/1) == -1) {
-+		char const* bash_path = "/data/data/com.termux/files/usr/bin/bash";
-+		if (access(bash_path, /*X_OK*/1) != -1) pw->pw_shell = (char*) bash_path;
-+		else pw->pw_shell = "/data/data/com.termux/files/usr/bin/sh";
++	char const* result = "@TERMUX_PREFIX@/bin/login";
++	if (result == NULL || access(result, /*X_OK*/1) == -1) {
++		pw->pw_shell = "@TERMUX_PREFIX@/bin/bash";
 +	} else {
-+		pw->pw_shell = realpath_buffer;
++		pw->pw_shell = (char*) result;
 +	}
-+	pw->pw_dir = "/data/data/com.termux/files/home";
++	pw->pw_dir = "@TERMUX_HOME@";
 +	pw->pw_passwd = "*";
 +#ifdef __LP64__
 +	pw->pw_gecos = ""; /* Avoid NULL field. */