[prev in list] [next in list] [prev in thread] [next in thread]
List: busybox
Subject: [PATCH 8/9] libbb: conditionalize AF_* usage in error reporting
From: Jeremie Koenig <jk () jk ! fr ! eu ! org>
Date: 2010-07-28 21:03:17
Message-ID: 1280350998-24890-9-git-send-email-jk () jk ! fr ! eu ! org
[Download RAW message or body]
Signed-off-by: Jeremie Koenig <jk@jk.fr.eu.org>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---
libbb/xfuncs_printf.c | 4 ++++
networking/Config.src | 1 -
2 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/libbb/xfuncs_printf.c b/libbb/xfuncs_printf.c
index 7069a7c..91f7ba2 100644
--- a/libbb/xfuncs_printf.c
+++ b/libbb/xfuncs_printf.c
@@ -387,8 +387,12 @@ int FAST_FUNC xsocket(int domain, int type, int protocol)
/* Hijack vaguely related config option */
#if ENABLE_VERBOSE_RESOLUTION_ERRORS
const char *s = "INET";
+# ifdef AF_PACKET
if (domain == AF_PACKET) s = "PACKET";
+# endif
+# ifdef AF_NETLINK
if (domain == AF_NETLINK) s = "NETLINK";
+# endif
IF_FEATURE_IPV6(if (domain == AF_INET6) s = "INET6";)
bb_perror_msg_and_die("socket(AF_%s,%d,%d)", s, type, protocol);
#else
diff --git a/networking/Config.src b/networking/Config.src
index 26c59e7..fc613e8 100644
--- a/networking/Config.src
+++ b/networking/Config.src
@@ -43,7 +43,6 @@ config FEATURE_PREFER_IPV4_ADDRESS
config VERBOSE_RESOLUTION_ERRORS
bool "Verbose resolution errors"
default n
- depends on PLATFORM_LINUX #because of xsocket() in libbb/xfuncs_prinf.c
help
Enable if you are not satisfied with simplistic
"can't resolve 'hostname.com'" and want to know more.
--
1.7.1
_______________________________________________
busybox mailing list
busybox@busybox.net
http://lists.busybox.net/mailman/listinfo/busybox
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic