X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=libbb%2Finet_common.c;h=0f4fca1a27c622a2987e2efd105fdf6c1ffe5831;hb=8172d054db64bc80a355db111b484719930045bc;hp=fa4d8672fe2a9280833d3387ed8487a254813ee6;hpb=db12d1d733ab7de0c5f4cda261eb79fd334a4ed9;p=oweals%2Fbusybox.git

diff --git a/libbb/inet_common.c b/libbb/inet_common.c
index fa4d8672f..0f4fca1a2 100644
--- a/libbb/inet_common.c
+++ b/libbb/inet_common.c
@@ -5,7 +5,7 @@
  *
  * Heavily modified by Manuel Novoa III       Mar 12, 2001
  *
- * Licensed under GPLv2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 
 #include "libbb.h"
@@ -23,7 +23,7 @@ int FAST_FUNC INET_resolve(const char *name, struct sockaddr_in *s_in, int hostf
 	s_in->sin_port = 0;
 
 	/* Default is special, meaning 0.0.0.0. */
-	if (!strcmp(name, bb_str_default)) {
+	if (strcmp(name, "default") == 0) {
 		s_in->sin_addr.s_addr = INADDR_ANY;
 		return 1;
 	}
@@ -97,7 +97,7 @@ char* FAST_FUNC INET_rresolve(struct sockaddr_in *s_in, int numeric, uint32_t ne
 	if (s_in->sin_family != AF_INET) {
 #ifdef DEBUG
 		bb_error_msg("rresolve: unsupported address family %d!",
-				  s_in->sin_family);
+				s_in->sin_family);
 #endif
 		errno = EAFNOSUPPORT;
 		return NULL;
@@ -109,7 +109,7 @@ char* FAST_FUNC INET_rresolve(struct sockaddr_in *s_in, int numeric, uint32_t ne
 	if (ad == INADDR_ANY) {
 		if ((numeric & 0x0FFF) == 0) {
 			if (numeric & 0x8000)
-				return xstrdup(bb_str_default);
+				return xstrdup("default");
 			return xstrdup("*");
 		}
 	}
@@ -164,18 +164,19 @@ char* FAST_FUNC INET_rresolve(struct sockaddr_in *s_in, int numeric, uint32_t ne
 
 int FAST_FUNC INET6_resolve(const char *name, struct sockaddr_in6 *sin6)
 {
-	struct addrinfo req, *ai;
+	struct addrinfo req, *ai = NULL;
 	int s;
 
-	memset(&req, '\0', sizeof req);
+	memset(&req, 0, sizeof(req));
 	req.ai_family = AF_INET6;
 	s = getaddrinfo(name, NULL, &req, &ai);
-	if (s) {
+	if (s != 0) {
 		bb_error_msg("getaddrinfo: %s: %d", name, s);
 		return -1;
 	}
-	memcpy(sin6, ai->ai_addr, sizeof(struct sockaddr_in6));
-	freeaddrinfo(ai);
+	memcpy(sin6, ai->ai_addr, sizeof(*sin6));
+	if (ai)
+		freeaddrinfo(ai);
 	return 0;
 }
 
@@ -193,8 +194,8 @@ char* FAST_FUNC INET6_rresolve(struct sockaddr_in6 *sin6, int numeric)
 
 	if (sin6->sin6_family != AF_INET6) {
 #ifdef DEBUG
-		bb_error_msg("rresolve: unsupport address family %d!",
-				  sin6->sin6_family);
+		bb_error_msg("rresolve: unsupported address family %d!",
+				sin6->sin6_family);
 #endif
 		errno = EAFNOSUPPORT;
 		return NULL;
@@ -205,17 +206,19 @@ char* FAST_FUNC INET6_rresolve(struct sockaddr_in6 *sin6, int numeric)
 	}
 	if (IN6_IS_ADDR_UNSPECIFIED(&sin6->sin6_addr)) {
 		if (numeric & 0x8000)
-			return xstrdup(bb_str_default);
+			return xstrdup("default");
 		return xstrdup("*");
 	}
 
-	s = getnameinfo((struct sockaddr *) sin6, sizeof(struct sockaddr_in6),
-				name, sizeof(name), NULL, 0, 0);
-	if (s) {
+	s = getnameinfo((struct sockaddr *) sin6, sizeof(*sin6),
+				name, sizeof(name),
+				/*serv,servlen:*/ NULL, 0,
+				0);
+	if (s != 0) {
 		bb_error_msg("getnameinfo failed");
 		return NULL;
 	}
 	return xstrdup(name);
 }
 
-#endif		/* CONFIG_FEATURE_IPV6 */
+#endif  /* CONFIG_FEATURE_IPV6 */