openvt,getty,vfork_daemon_rexec,mount: tighten up fd cleanup code

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

diff --git a/libbb/inet_common.c b/libbb/inet_common.c
index c02c732f32273d3f07976b6608020378ea651dd9..9cdcb11deae95d14e2a26387b8afbfd1fbc0f7e1 100644 (file)
--- a/libbb/inet_common.c
+++ b/libbb/inet_common.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
  * stolen from net-tools-1.59 and stripped down for busybox by
  *                      Erik Andersen <andersen@codepoet.org>
@@ -8,20 +9,8 @@
  *
  */
 
-#include "inet_common.h"
-#include <stdio.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
 #include "libbb.h"
-
-#ifdef DEBUG
-# include <resolv.h>
-#endif
-
-
-const char bb_INET_default[] = "default";
+#include "inet_common.h"
 
 int INET_resolve(const char *name, struct sockaddr_in *s_in, int hostfirst)
 {
@@ -33,9 +22,9 @@ int INET_resolve(const char *name, struct sockaddr_in *s_in, int hostfirst)
        s_in->sin_port = 0;
 
        /* Default is special, meaning 0.0.0.0. */
-       if (!strcmp(name, bb_INET_default)) {
+       if (!strcmp(name, bb_str_default)) {
                s_in->sin_addr.s_addr = INADDR_ANY;
-               return (1);
+               return 1;
        }
        /* Look to see if it's a dotted quad. */
        if (inet_aton(name, &s_in->sin_addr)) {
@@ -111,7 +100,7 @@ int INET_rresolve(char *name, size_t len, struct sockaddr_in *s_in,
                                  s_in->sin_family);
 #endif
                errno = EAFNOSUPPORT;
-               return (-1);
+               return -1;
        }
        ad = (unsigned long) s_in->sin_addr.s_addr;
 #ifdef DEBUG
@@ -120,22 +109,19 @@ int INET_rresolve(char *name, size_t len, struct sockaddr_in *s_in,
        if (ad == INADDR_ANY) {
                if ((numeric & 0x0FFF) == 0) {
                        if (numeric & 0x8000)
-                               safe_strncpy(name, bb_INET_default, len);
+                               safe_strncpy(name, bb_str_default, len);
                        else
                                safe_strncpy(name, "*", len);
-                       return (0);
+                       return 0;
                }
        }
        if (numeric & 0x0FFF) {
                safe_strncpy(name, inet_ntoa(s_in->sin_addr), len);
-               return (0);
+               return 0;
        }
 
        if ((ad & (~netmask)) != 0 || (numeric & 0x4000))
                host = 1;
-#if 0
-       INET_nn = NULL;
-#endif
        pn = INET_nn;
        while (pn != NULL) {
                if (pn->addr.sin_addr.s_addr == ad && pn->host == host) {
@@ -144,7 +130,7 @@ int INET_rresolve(char *name, size_t len, struct sockaddr_in *s_in,
                        bb_error_msg("rresolve: found %s %08lx in cache",
                                          (host ? "host" : "net"), ad);
 #endif
-                       return (0);
+                       return 0;
                }
                pn = pn->next;
        }
@@ -172,14 +158,14 @@ int INET_rresolve(char *name, size_t len, struct sockaddr_in *s_in,
        if ((ent == NULL) && (np == NULL)) {
                safe_strncpy(name, inet_ntoa(s_in->sin_addr), len);
        }
-       pn = (struct addr *) xmalloc(sizeof(struct addr));
+       pn = xmalloc(sizeof(struct addr));
        pn->addr = *s_in;
        pn->next = INET_nn;
        pn->host = host;
-       pn->name = bb_xstrdup(name);
+       pn->name = xstrdup(name);
        INET_nn = pn;
 
-       return (0);
+       return 0;
 }
 
 #ifdef CONFIG_FEATURE_IPV6
@@ -191,7 +177,8 @@ int INET6_resolve(const char *name, struct sockaddr_in6 *sin6)
 
        memset(&req, '\0', sizeof req);
        req.ai_family = AF_INET6;
-       if ((s = getaddrinfo(name, NULL, &req, &ai))) {
+       s = getaddrinfo(name, NULL, &req, &ai);
+       if (s) {
                bb_error_msg("getaddrinfo: %s: %d", name, s);
                return -1;
        }
@@ -199,7 +186,7 @@ int INET6_resolve(const char *name, struct sockaddr_in6 *sin6)
 
        freeaddrinfo(ai);
 
-       return (0);
+       return 0;
 }
 
 #ifndef IN6_IS_ADDR_UNSPECIFIED
@@ -217,23 +204,24 @@ int INET6_rresolve(char *name, size_t len, struct sockaddr_in6 *sin6,
        /* Grmpf. -FvK */
        if (sin6->sin6_family != AF_INET6) {
 #ifdef DEBUG
-               bb_error_msg(_("rresolve: unsupport address family %d !\n"),
+               bb_error_msg("rresolve: unsupport address family %d!",
                                  sin6->sin6_family);
 #endif
                errno = EAFNOSUPPORT;
-               return (-1);
+               return -1;
        }
        if (numeric & 0x7FFF) {
                inet_ntop(AF_INET6, &sin6->sin6_addr, name, len);
-               return (0);
+               return 0;
        }
        if (IN6_IS_ADDR_UNSPECIFIED(&sin6->sin6_addr)) {
                if (numeric & 0x8000) {
-                       strcpy(name, "default");
+                       strcpy(name, bb_str_default);
                } else {
-                       strcpy(name, "*");
+                       name[0] = '*';
+                       name[1] = '\0';
                }
-               return (0);
+               return 0;
        }
 
        s = getnameinfo((struct sockaddr *) sin6, sizeof(struct sockaddr_in6), name, len, NULL, 0, 0);
@@ -241,7 +229,7 @@ int INET6_rresolve(char *name, size_t len, struct sockaddr_in6 *sin6,
                bb_error_msg("getnameinfo failed");
                return -1;
        }
-       return (0);
+       return 0;
 }
 
 #endif                                                 /* CONFIG_FEATURE_IPV6 */