52 lines
1.9 KiB
Diff
52 lines
1.9 KiB
Diff
diff -u -r /home/fornwall/lib/android-ndk/platforms/android-21/arch-arm/usr/include/pwd.h ./usr/include/pwd.h
|
|
--- /home/fornwall/lib/android-ndk/platforms/android-21/arch-arm/usr/include/pwd.h 2014-10-14 22:53:49.000000000 -0400
|
|
+++ ./usr/include/pwd.h 2015-07-15 09:42:32.974621965 -0400
|
|
@@ -65,6 +65,10 @@
|
|
#include <sys/cdefs.h>
|
|
#include <sys/types.h>
|
|
|
|
+/* For access() and realpath(): */
|
|
+#include <unistd.h>
|
|
+#include <stdlib.h>
|
|
+
|
|
#define _PATH_PASSWD "/etc/passwd"
|
|
#define _PATH_MASTERPASSWD "/etc/master.passwd"
|
|
#define _PATH_MASTERPASSWD_LOCK "/etc/ptmp"
|
|
@@ -119,6 +122,36 @@
|
|
int getpwnam_r(const char*, struct passwd*, char*, size_t, struct passwd**);
|
|
int getpwuid_r(uid_t, struct passwd*, char*, size_t, struct passwd**);
|
|
|
|
+static void android_setup_pwd(struct passwd* pw) {
|
|
+ static char realpath_buffer[4096/*PATH_MAX*/];
|
|
+ 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 = (char*) bash_path;
|
|
+ else pw->pw_shell = "@TERMUX_PREFIX@/bin/ash";
|
|
+ } else {
|
|
+ pw->pw_shell = strcmp(realpath_buffer, "@TERMUX_PREFIX@/bin/busybox") == 0 ? (char*)"@TERMUX_PREFIX@/bin/ash" : realpath_buffer;
|
|
+ }
|
|
+ pw->pw_dir = "@TERMUX_HOME@";
|
|
+ pw->pw_passwd = "*";
|
|
+}
|
|
+
|
|
+static struct passwd* android_polyfill_getpwuid(uid_t t) {
|
|
+ struct passwd* pw = getpwuid(t);
|
|
+ if (pw == NULL) return NULL;
|
|
+ android_setup_pwd(pw);
|
|
+ return pw;
|
|
+}
|
|
+
|
|
+static struct passwd* android_polyfill_getpwnam(const char* name) {
|
|
+ struct passwd* pw = getpwnam(name);
|
|
+ if (pw == NULL) return NULL;
|
|
+ android_setup_pwd(pw);
|
|
+ return pw;
|
|
+}
|
|
+
|
|
+#define getpwnam android_polyfill_getpwnam
|
|
+#define getpwuid android_polyfill_getpwuid
|
|
void endpwent(void);
|
|
struct passwd* getpwent(void);
|
|
int setpwent(void);
|