Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/networking/libiproute/utils.c

Timestamp:

Dec 20, 2016, 4:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

• . (copied) (copied from branches/3.2 )
• mindi-busybox/networking/libiproute/utils.c (modified) (8 diffs)

branches/3.3/mindi-busybox/networking/libiproute/utils.c

@@ -14 +14 @@
 #include "inet_common.h"
 
+unsigned get_hz(void)
+{
+    static unsigned hz_internal;
+    FILE *fp;
+
+    if (hz_internal)
+        return hz_internal;
+
+    fp = fopen_for_read("/proc/net/psched");
+    if (fp) {
+        unsigned nom, denom;
+
+        if (fscanf(fp, "%*08x%*08x%08x%08x", &nom, &denom) == 2)
+            if (nom == 1000000)
+                hz_internal = denom;
+        fclose(fp);
+    }
+    if (!hz_internal)
+        hz_internal = bb_clk_tck();
+    return hz_internal;
+}
+
 unsigned get_unsigned(char *arg, const char *errmsg)
 {
@@ -26 +48 @@
         }
     }
-    invarg(arg, errmsg); /* does not return */
+    invarg_1_to_2(arg, errmsg); /* does not return */
 }
 
@@ -41 +63 @@
         }
     }
-    invarg(arg, errmsg); /* does not return */
+    invarg_1_to_2(arg, errmsg); /* does not return */
 }
 
@@ -56 +78 @@
         }
     }
-    invarg(arg, errmsg); /* does not return */
+    invarg_1_to_2(arg, errmsg); /* does not return */
 }
 
@@ -209 +231 @@
 void incomplete_command(void)
 {
-    bb_error_msg_and_die("command line is not complete, try option \"help\"");
-}
-
-void invarg(const char *arg, const char *opt)
-{
-    bb_error_msg_and_die(bb_msg_invalid_arg, arg, opt);
+    bb_error_msg_and_die("command line is not complete, try \"help\"");
+}
+
+void invarg_1_to_2(const char *arg, const char *opt)
+{
+    bb_error_msg_and_die(bb_msg_invalid_arg_to, arg, opt);
 }
 
@@ -255 +277 @@
 }
 
-const char *rt_addr_n2a(int af,
-        void *addr, char *buf, int buflen)
+const char *rt_addr_n2a(int af, void *addr)
 {
     switch (af) {
     case AF_INET:
     case AF_INET6:
-        return inet_ntop(af, addr, buf, buflen);
+        return inet_ntop(af, addr,
+            auto_string(xzalloc(INET6_ADDRSTRLEN)), INET6_ADDRSTRLEN
+        );
     default:
         return "???";
@@ -268 +291 @@
 
 #ifdef RESOLVE_HOSTNAMES
-const char *format_host(int af, int len, void *addr, char *buf, int buflen)
+const char *format_host(int af, int len, void *addr)
 {
     if (resolve_hosts) {
@@ -287 +310 @@
             h_ent = gethostbyaddr(addr, len, af);
             if (h_ent != NULL) {
-                safe_strncpy(buf, h_ent->h_name, buflen);
-                return buf;
-            }
-        }
-    }
-    return rt_addr_n2a(af, addr, buf, buflen);
+                return auto_string(xstrdup(h_ent->h_name));
+            }
+        }
+    }
+    return rt_addr_n2a(af, addr);
 }
 #endif