chiark - git - mdw - termux-packages/blob - ndk_patches/pwd.patch

   1 diff -u -r /home/fornwall/lib/android-ndk/platforms/android-21/arch-arm/usr/include/pwd.h ./usr/include/pwd.h
   2 --- /home/fornwall/lib/android-ndk/platforms/android-21/arch-arm/usr/include/pwd.h      2014-10-14 22:53:49.000000000 -0400
   3 +++ ./usr/include/pwd.h 2015-07-15 09:42:32.974621965 -0400
   4 @@ -65,6 +65,9 @@
   5  #include <sys/cdefs.h>
   6  #include <sys/types.h>
   7
   8 +/* For access(): */
   9 +#include <unistd.h>
  10 +
  11  #define _PATH_PASSWD        "/etc/passwd"
  12  #define _PATH_MASTERPASSWD  "/etc/master.passwd"
  13  #define _PATH_MASTERPASSWD_LOCK "/etc/ptmp"
  14 @@ -119,6 +122,39 @@
  15  int getpwnam_r(const char*, struct passwd*, char*, size_t, struct passwd**);
  16  int getpwuid_r(uid_t, struct passwd*, char*, size_t, struct passwd**);
  17
  18 +extern char *realpath(const char *path, char *resolved_path);
  19 +extern void free(void *ptr);
  20 +extern void *memcpy(void *dest, const void *src, size_t n);
  21 +extern size_t strlen(const char *s);
  22 +
  23 +static void android_setup_pwd(struct passwd* pw) {
  24 +       static char realpath_buffer[4096/*PATH_MAX*/];
  25 +       char* result = realpath("@TERMUX_HOME@/.termux/shell", realpath_buffer);
  26 +       if (result == NULL || access(realpath_buffer, X_OK) == -1) {
  27 +               pw->pw_shell = "@TERMUX_PREFIX@/bin/ash";
  28 +       } else {
  29 +               pw->pw_shell = realpath_buffer;
  30 +       }
  31 +       pw->pw_dir = "@TERMUX_HOME@";
  32 +       pw->pw_passwd = "*";
  33 +}
  34 +
  35 +static struct passwd* android_polyfill_getpwuid(uid_t t) {
  36 +       struct passwd* pw = getpwuid(t);
  37 +       if (pw == NULL) return NULL;
  38 +       android_setup_pwd(pw);
  39 +       return pw;
  40 +}
  41 +
  42 +static struct passwd* android_polyfill_getpwnam(const char* name) {
  43 +       struct passwd* pw = getpwnam(name);
  44 +       if (pw == NULL) return NULL;
  45 +       android_setup_pwd(pw);
  46 +       return pw;
  47 +}
  48 +
  49 +#define getpwnam android_polyfill_getpwnam
  50 +#define getpwuid android_polyfill_getpwuid
  51  void endpwent(void);
  52  struct passwd* getpwent(void);
  53  int setpwent(void);