- don't free user-supplied string (via -e)

[oweals/busybox.git] / libbb / inet_common.c

diff --git a/libbb/inet_common.c b/libbb/inet_common.c
index 8449201ab03ef8ecb203dded49590ab9bda7d7ab..3a20b4a16fb294767ac1fb5a7da9461bd6d09438 100644 (file)
--- a/libbb/inet_common.c
+++ b/libbb/inet_common.c
@@ -11,10 +11,12 @@
 #include "libbb.h"
 #include "inet_common.h"
 
-int INET_resolve(const char *name, struct sockaddr_in *s_in, int hostfirst)
+int FAST_FUNC INET_resolve(const char *name, struct sockaddr_in *s_in, int hostfirst)
 {
        struct hostent *hp;
+#if ENABLE_FEATURE_ETC_NETWORKS
        struct netent *np;
+#endif
 
        /* Grmpf. -FvK */
        s_in->sin_family = AF_INET;
@@ -43,6 +45,7 @@ int INET_resolve(const char *name, struct sockaddr_in *s_in, int hostfirst)
                        return 0;
                }
        }
+#if ENABLE_FEATURE_ETC_NETWORKS
        /* Try the NETWORKS database to see if this is a known network. */
 #ifdef DEBUG
        bb_error_msg("getnetbyname(%s)", name);
@@ -52,6 +55,7 @@ int INET_resolve(const char *name, struct sockaddr_in *s_in, int hostfirst)
                s_in->sin_addr.s_addr = htonl(np->n_net);
                return 1;
        }
+#endif
        if (hostfirst) {
                /* Don't try again */
                return -1;
@@ -77,7 +81,7 @@ int INET_resolve(const char *name, struct sockaddr_in *s_in, int hostfirst)
  *          & 0x4000: host instead of net,
  *          & 0x0fff: don't resolve
  */
-char *INET_rresolve(struct sockaddr_in *s_in, int numeric, uint32_t netmask)
+char* FAST_FUNC INET_rresolve(struct sockaddr_in *s_in, int numeric, uint32_t netmask)
 {
        /* addr-to-name cache */
        struct addr {
@@ -93,7 +97,6 @@ char *INET_rresolve(struct sockaddr_in *s_in, int numeric, uint32_t netmask)
        uint32_t ad, host_ad;
        int host = 0;
 
-       /* Grmpf. -FvK */
        if (s_in->sin_family != AF_INET) {
 #ifdef DEBUG
                bb_error_msg("rresolve: unsupported address family %d!",
@@ -140,10 +143,7 @@ char *INET_rresolve(struct sockaddr_in *s_in, int numeric, uint32_t netmask)
                ent = gethostbyaddr((char *) &ad, 4, AF_INET);
                if (ent)
                        name = xstrdup(ent->h_name);
-       } else {
-               /* Hmmm... this is very rare to have named nets,
-                * and this getnetbyaddr() call is the only one in bbox.
-                * Maybe get rid of or make configurable? */
+       } else if (ENABLE_FEATURE_ETC_NETWORKS) {
                struct netent *np;
 #ifdef DEBUG
                bb_error_msg("getnetbyaddr (%08x)", (unsigned)host_ad);
@@ -163,9 +163,9 @@ char *INET_rresolve(struct sockaddr_in *s_in, int numeric, uint32_t netmask)
        return name;
 }
 
-#ifdef CONFIG_FEATURE_IPV6
+#if ENABLE_FEATURE_IPV6
 
-int INET6_resolve(const char *name, struct sockaddr_in6 *sin6)
+int FAST_FUNC INET6_resolve(const char *name, struct sockaddr_in6 *sin6)
 {
        struct addrinfo req, *ai;
        int s;
@@ -189,12 +189,11 @@ int INET6_resolve(const char *name, struct sockaddr_in6 *sin6)
 #endif
 
 
-char *INET6_rresolve(struct sockaddr_in6 *sin6, int numeric)
+char* FAST_FUNC INET6_rresolve(struct sockaddr_in6 *sin6, int numeric)
 {
        char name[128];
        int s;
 
-       /* Grmpf. -FvK */
        if (sin6->sin6_family != AF_INET6) {
 #ifdef DEBUG
                bb_error_msg("rresolve: unsupport address family %d!",
@@ -222,4 +221,4 @@ char *INET6_rresolve(struct sockaddr_in6 *sin6, int numeric)
        return xstrdup(name);
 }
 
-#endif                                                 /* CONFIG_FEATURE_IPV6 */
+#endif         /* CONFIG_FEATURE_IPV6 */