Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/libbb/inet_common.c

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/libbb/inet_common.c (modified) (11 diffs)

branches/2.2.9/mindi-busybox/libbb/inet_common.c

@@ -6 +6 @@
  * Heavily modified by Manuel Novoa III       Mar 12, 2001
  *
- *
+ * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 
@@ -12 +12 @@
 #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;
@@ -24 +24 @@
 
     /* 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;
@@ -64 +64 @@
     res_init();
     _res.options |= RES_DEBUG;
-#endif
-
-#ifdef DEBUG
     bb_error_msg("gethostbyname(%s)", name);
 #endif
@@ -82 +79 @@
  *          & 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 */
@@ -98 +95 @@
     int host = 0;
 
-    /* Grmpf. -FvK */
     if (s_in->sin_family != AF_INET) {
 #ifdef DEBUG
@@ -114 +110 @@
         if ((numeric & 0x0FFF) == 0) {
             if (numeric & 0x8000)
-                return xstrdup(bb_str_default);
+                return xstrdup("default");
             return xstrdup("*");
         }
@@ -167 +163 @@
 #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;
@@ -191 +187 @@
 
 
-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!",
+        bb_error_msg("rresolve: unsupported address family %d!",
                   sin6->sin6_family);
 #endif
@@ -211 +206 @@
     if (IN6_IS_ADDR_UNSPECIFIED(&sin6->sin6_addr)) {
         if (numeric & 0x8000)
-            return xstrdup(bb_str_default);
+            return xstrdup("default");
         return xstrdup("*");
     }
@@ -224 +219 @@
 }
 
-#endif                          /* CONFIG_FEATURE_IPV6 */
+#endif  /* CONFIG_FEATURE_IPV6 */