[patch] Add musl-compatible definitions for res_ninit() and res_nclose()

08_11.2.5-resolv_compat.patch (text/plain), 1.51 KB, created by CFuga on 2022-08-01 20:36:29 UTC

diff -uNr a/open-vm-tools/lib/nicInfo/nicInfoPosix.c b/open-vm-tools/lib/nicInfo/nicInfoPosix.c
--- a/open-vm-tools/lib/nicInfo/nicInfoPosix.c	2020-12-17 14:11:31.000000000 -0600
+++ b/open-vm-tools/lib/nicInfo/nicInfoPosix.c	2022-01-05 09:51:45.000000000 -0600
@@ -61,6 +61,9 @@
 #include <netinet/in.h>
 #include <arpa/nameser.h>
 #include <resolv.h>
+#if defined(__linux__) && !defined(__GLIBC__)
+#   include "resolv_compat.h"
+#endif
 
 #ifdef __linux__
 #   include <net/if.h>
diff -uNr a/open-vm-tools/lib/nicInfo/resolv_compat.h b/open-vm-tools/lib/nicInfo/resolv_compat.h
--- a/open-vm-tools/lib/nicInfo/resolv_compat.h	1969-12-31 18:00:00.000000000 -0600
+++ b/open-vm-tools/lib/nicInfo/resolv_compat.h	2022-01-05 09:47:05.000000000 -0600
@@ -0,0 +1,29 @@
+#if !defined(__GLIBC__)
+/***************************************************************************
+ * resolv_compat.h
+ *
+ * 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>
+
+static inline int res_ninit(res_state statp)
+{
+    int rc = res_init();
+    if (statp != &_res) {
+       memcpy(statp, &_res, sizeof(*statp));
+    }
+    return rc;
+}
+
+static inline int res_nclose(res_state statp)
+{
+    if (!statp)
+    return -1;
+    if (statp != &_res) {
+        memset(statp, 0, sizeof(*statp));
+    }
+    return 0;
+}
+#endif