summaryrefslogtreecommitdiff
path: root/libc/inet
diff options
context:
space:
mode:
authorDmitry Chestnykh <dm.chestnykh@gmail.com>2024-02-10 10:06:08 +0300
committerWaldemar Brodkorb <wbx@openadk.org>2024-02-10 11:26:17 +0100
commit1447430eff5b6ab5422e1598ab41d421626a36e2 (patch)
tree03ad974280a18243e71ac622b593d3eec7776f4e /libc/inet
parent395f920c0a29dd565a66b268ea00fc444ae64086 (diff)
libc: Fix dns-related build issues.
- The first observed issue is linking failure: ` /usr/bin/ld: libc/libc_so.a(encodeq.os): in function `__encode_question': encodeq.c:(.text+0x16): undefined reference to `__GI___dn_comp' /usr/bin/ld: libc/libc_so.a(dnslookup.os): in function `__dns_lookup': dnslookup.c:(.text+0x6fb): undefined reference to `__GI___dn_expand' /usr/bin/ld: dnslookup.c:(.text+0x7ab): undefined reference to `__hnbad' collect2: error: ld returned 1 exit status ` The root cause is that the resolv.c file contains some functions (dn_comp, dn_expand, __hnbad) under `#ifdef L_ns_name` and `#ifdef L_ns_comp` which wasn't defined, so we had undefined refs to such functions. - The second issue is misleading indentation inside `ns_name_pack`. ` libc/inet/resolv.c: In function '__ns_name_pack': libc/inet/resolv.c:3519:17: warning: this 'if' clause does not guard... 3519 | if (msg != NULL) ... ./include/errno.h:73:18: note: ...this statement, but the latter is misleadingly indented as if it were guarded by the 'if' 73 | # define errno errno /* For #ifndef errno tests. */ | ^~~~~ libc/inet/resolv.c:3522:25: note: in expansion of macro 'errno' 3522 | errno = EMSGSIZE; ` Signed-off-by: Dmitry Chestnykh <dm.chestnykh@gmail.com>
Diffstat (limited to 'libc/inet')
-rw-r--r--libc/inet/encodeq.c2
-rw-r--r--libc/inet/resolv.c4
2 files changed, 4 insertions, 2 deletions
diff --git a/libc/inet/encodeq.c b/libc/inet/encodeq.c
index 5555aa548..dc7945bc6 100644
--- a/libc/inet/encodeq.c
+++ b/libc/inet/encodeq.c
@@ -5,4 +5,6 @@
*/
#define L_encodeq
+#define L_ns_name
+#define L_res_comp
#include RESOLVER
diff --git a/libc/inet/resolv.c b/libc/inet/resolv.c
index 2f627ca08..37842021c 100644
--- a/libc/inet/resolv.c
+++ b/libc/inet/resolv.c
@@ -3519,8 +3519,8 @@ cleanup:
if (msg != NULL)
*lpp = NULL;
- errno = EMSGSIZE;
- return -1;
+ errno = EMSGSIZE;
+ return -1;
}
return dstp - dst;