Merge branch 'patch-1' into 'master'

Clean up everything and add lots of new functions

I hope everything here is okay. I fixed some bugs in existing functions (mostly wrong prototypes or off-by-one errors) and formatted everything to a consistent style. If you'd like me to adjust the style, that's no problem. It wasn't very consistent to start with (within the code, and compared to the documentation).

*I added specific notes you may want to comment on to some of the commit messages.*

Major features:
* Pass correct `argv[0]` in loader
* Intercept `readlink("/proc/self/exe")` to allow re-exec
* Add almost all reasonable-to-implement functions in LSB 5.0.0 core generic libc. Remaining functions are:
  - Impossible-to-implement: sigreturn
  - Not useful: reentrant random (`*rand48_r`, etc.), argz, envz, pmap, rpc (clnt_*, svc*, xdr*), bindresvport
  - Got tired of it: checked wchar
* Add additional functions used by android and its NDK tools (clang, cmake, lldb, ninja, etc.).

At this point, I am able to run Android Studio with the bundled prebuilt JDK, and compile, install, and run an android application (including one with native libraries) on a real device, with only a few minor issues:
* must export `LD_LIBRARY_PATH=/opt/android-studio/jre/jre/lib/amd64/server` because musl and glibc interpret the variable differently with regards to `dlopen`. This is something that has to be patched in musl builds of openjdk, so it's not a gcompat issue.
* ld.bfd fails to parse the argument `--sysroot=/path`, but can parse `--sysroot /path`. So there's some difference with `getopt_long_only` (or getopt in general). May be a bug, may be just an API difference. May be it can be patched up.
* LLDB fails to connect to the android phone for native debugging -- I haven't tried it on glibc yet, so it may not be a gcompat issue at all (may be a phone or the app issue).

I'd be happy to send some documentation later.

See merge request !1

1 files changed, 23 insertions, 13 deletions

diff --git a/libgcompat/resolv.c b/libgcompat/resolv.c
index 9ded8c9..5943bcc 100644
--- a/libgcompat/resolv.c
+++ b/libgcompat/resolv.c
@@ -1,32 +1,42 @@
-/* Original author: Khem Raj <raj.khem@gmail.com> */
-/***************************************************************************
- * resolv_compat.h
+/*
+ * Original author: Khem Raj <raj.khem@gmail.com>
  *
  * Mimick GLIBC's res_ninit() and res_nclose() for musl libc
  * Note: res_init() is actually deprecated according to
  * http://docs.oracle.com/cd/E36784_01/html/E36875/res-nclose-3resolv.html
- **************************************************************************/
-#include <string.h>	/* memcpy, memset */
-#include <resolv.h>	/* res_state */
+ */
 
-static inline int res_ninit(res_state statp)
+#include <resolv.h> /* res_state */
+#include <stddef.h> /* NULL */
+#include <string.h> /* memcpy, memset */
+
+#include "alias.h" /* weak_alias */
+
+int __res_ninit(res_state statp)
 {
-	int rc = res_init();
+	int rc;
+
+	if (statp == NULL) {
+		return -1;
+	}
+	rc = res_init();
 	if (statp != &_res) {
 		memcpy(statp, &_res, sizeof(*statp));
 	}
+
 	return rc;
 }
+weak_alias(__res_ninit, res_ninit);
 
-static inline int res_nclose(res_state statp)
+int __res_nclose(res_state statp)
 {
-	if (!statp)
+	if (statp == NULL) {
 		return -1;
+	}
 	if (statp != &_res) {
 		memset(statp, 0, sizeof(*statp));
 	}
+
 	return 0;
 }
-
-extern __typeof(res_ninit) __res_ninit __attribute__((weak, alias("res_ninit")));
-extern __typeof(res_nclose) __res_nclose __attribute__((weak, alias("res_nclose")));
+weak_alias(__res_nclose, res_nclose);