sergiotarxz/termux-packages
sergiotarxz/termux-packages
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ndk_patches: Replace endpwent() with empty stub

Browse Source
This commit is contained in:
Fredrik Fornwall 2016-03-10 15:24:52 -05:00
parent 03e92e97aa
commit e8735a9e0a
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ndk_patches/pwd.patch
View File

@ -1,6 +1,6 @@
diff -u -r /home/fornwall/lib/android-ndk/platforms/android-21/arch-arm/usr/include/pwd.h ./usr/include/pwd.h 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 --- /home/fornwall/lib/android-ndk/platforms/android-21/arch-arm/usr/include/pwd.h 2016-03-03 16:54:24.000000000 -0500
+++ ./usr/include/pwd.h 2015-07-15 09:42:32.974621965 -0400 +++ ./usr/include/pwd.h 2016-03-10 08:11:16.795710172 -0500
@@ -65,6 +65,10 @@ @@ -65,6 +65,10 @@
#include <sys/cdefs.h> #include <sys/cdefs.h>
#include <sys/types.h> #include <sys/types.h>
@ -12,10 +12,11 @@ diff -u -r /home/fornwall/lib/android-ndk/platforms/android-21/arch-arm/usr/incl
#define _PATH_PASSWD "/etc/passwd" #define _PATH_PASSWD "/etc/passwd"
#define _PATH_MASTERPASSWD "/etc/master.passwd" #define _PATH_MASTERPASSWD "/etc/master.passwd"
#define _PATH_MASTERPASSWD_LOCK "/etc/ptmp" #define _PATH_MASTERPASSWD_LOCK "/etc/ptmp"
@@ -119,6 +122,36 @@ @@ -119,7 +123,37 @@
int getpwnam_r(const char*, struct passwd*, char*, size_t, struct passwd**); int getpwnam_r(const char*, struct passwd*, char*, size_t, struct passwd**);
int getpwuid_r(uid_t, struct passwd*, char*, size_t, struct passwd**); int getpwuid_r(uid_t, struct passwd*, char*, size_t, struct passwd**);
-void endpwent(void);
+static void android_setup_pwd(struct passwd* pw) { +static void android_setup_pwd(struct passwd* pw) {
+ static char realpath_buffer[4096/*PATH_MAX*/]; + static char realpath_buffer[4096/*PATH_MAX*/];
+ char* result = realpath("@TERMUX_HOME@/.termux/shell", realpath_buffer); + char* result = realpath("@TERMUX_HOME@/.termux/shell", realpath_buffer);
@ -46,6 +47,6 @@ diff -u -r /home/fornwall/lib/android-ndk/platforms/android-21/arch-arm/usr/incl
+ +
+#define getpwnam android_polyfill_getpwnam +#define getpwnam android_polyfill_getpwnam
+#define getpwuid android_polyfill_getpwuid +#define getpwuid android_polyfill_getpwuid
void endpwent(void); +static void endpwent(void) { /* Do nothing. */ }
struct passwd* getpwent(void); struct passwd* getpwent(void);
int setpwent(void); int setpwent(void);