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

   1 diff -u -r /home/fornwall/lib/android-ndk/platforms/android-19/arch-arm/usr/include/pwd.h ./usr/include/pwd.h
   2 --- /home/fornwall/lib/android-ndk/platforms/android-19/arch-arm/usr/include/pwd.h      2012-08-21 07:23:12.000000000 +0200
   3 +++ ./usr/include/pwd.h 2014-07-06 04:39:02.731221101 +0200
   4 @@ -114,6 +114,43 @@
   5  struct passwd* getpwnam(const char*);
   6  struct passwd* getpwuid(uid_t);
   7
   8 +extern char *realpath(const char *path, char *resolved_path);
   9 +extern void free(void *ptr);
  10 +extern void *memcpy(void *dest, const void *src, size_t n);
  11 +extern size_t strlen(const char *s);
  12 +
  13 +static void android_setup_pwd(struct passwd* pw) {
  14 +       static char realpath_buffer[255];
  15 +       size_t allocated_realpath_len;
  16 +       char* allocated_realpath = realpath("@TERMUX_HOME@/.termux/shell", NULL);
  17 +       if (allocated_realpath == NULL || (allocated_realpath_len = strlen(allocated_realpath)) >= sizeof(realpath_buffer)) {
  18 +               pw->pw_shell = "@TERMUX_PREFIX@/bin/ash";
  19 +       } else {
  20 +               memcpy(realpath_buffer, allocated_realpath, allocated_realpath_len);
  21 +               realpath_buffer[allocated_realpath_len] = 0;
  22 +               pw->pw_shell = realpath_buffer;
  23 +       }
  24 +       free(allocated_realpath);
  25 +       pw->pw_dir = "@TERMUX_HOME@";
  26 +       pw->pw_passwd = "*";
  27 +}
  28 +
  29 +static struct passwd* android_polyfill_getpwuid(uid_t t) {
  30 +       struct passwd* pw = getpwuid(t);
  31 +       if (pw == NULL) return NULL;
  32 +       android_setup_pwd(pw);
  33 +       return pw;
  34 +}
  35 +
  36 +static struct passwd* android_polyfill_getpwnam(const char* name) {
  37 +       struct passwd* pw = getpwnam(name);
  38 +       if (pw == NULL) return NULL;
  39 +       android_setup_pwd(pw);
  40 +       return pw;
  41 +}
  42 +
  43 +#define getpwnam android_polyfill_getpwnam
  44 +#define getpwuid android_polyfill_getpwuid
  45  void endpwent(void);
  46
  47  #if 0 /* MISSING FROM BIONIC */