Merge branch 'busybox' into merge

8 files changed, 24 insertions, 20 deletions

diff --git a/networking/arp.c b/networking/arp.c
index e79b1b6a1..0099aa534 100644
--- a/networking/arp.c
+++ b/networking/arp.c
@@ -68,7 +68,6 @@ struct globals {
         const struct hwtype *hw; /* current hardware type */
         const char *device;      /* current device */
         smallint hw_set;         /* flag if hw-type was set (-H) */
-
 } FIX_ALIASING;
 #define G (*(struct globals*)&bb_common_bufsiz1)
 #define ap         (G.ap        )
diff --git a/networking/ip.c b/networking/ip.c
index 98fe621b1..d35345c36 100644
--- a/networking/ip.c
+++ b/networking/ip.c
@@ -33,7 +33,7 @@
 //usage:       "{ {add|del} IFADDR dev STRING | {show|flush}\n"
 //usage:       "                [dev STRING] [to PREFIX] }"
 //usage:#define ipaddr_full_usage "\n\n"
-//usage:       "ipaddr {add|delete} IFADDR dev STRING\n"
+//usage:       "ipaddr {add|change|replace|delete} IFADDR dev STRING\n"
 //usage:       "ipaddr {show|flush} [dev STRING] [scope SCOPE-ID]\n"
 //usage:       "        [to PREFIX] [label PATTERN]\n"
 //usage:       "        IFADDR := PREFIX | ADDR peer PREFIX\n"
diff --git a/networking/libiproute/ipaddress.c b/networking/libiproute/ipaddress.c
index 4072d0626..a6d5129e7 100644
--- a/networking/libiproute/ipaddress.c
+++ b/networking/libiproute/ipaddress.c
@@ -598,7 +598,7 @@ static int default_scope(inet_prefix *lcl)
 }
 
 /* Return value becomes exitcode. It's okay to not return at all */
-static int ipaddr_modify(int cmd, char **argv)
+static int ipaddr_modify(int cmd, int flags, char **argv)
 {
         static const char option[] ALIGN1 =
                 "peer\0""remote\0""broadcast\0""brd\0"
@@ -622,7 +622,7 @@ static int ipaddr_modify(int cmd, char **argv)
         memset(&req, 0, sizeof(req));
 
         req.n.nlmsg_len = NLMSG_LENGTH(sizeof(struct ifaddrmsg));
-        req.n.nlmsg_flags = NLM_F_REQUEST;
+        req.n.nlmsg_flags = NLM_F_REQUEST | flags;
         req.n.nlmsg_type = cmd;
         req.ifa.ifa_family = preferred_family;
 
@@ -749,16 +749,24 @@ static int ipaddr_modify(int cmd, char **argv)
 int FAST_FUNC do_ipaddr(char **argv)
 {
         static const char commands[] ALIGN1 =
-                "add\0""delete\0""list\0""show\0""lst\0""flush\0";
+                /* 0    1         2      3          4         5       6       7      8 */
+                "add\0""change\0""chg\0""replace\0""delete\0""list\0""show\0""lst\0""flush\0";
         int cmd = 2;
         if (*argv) {
                 cmd = index_in_substrings(commands, *argv);
                 if (cmd < 0)
                         invarg(*argv, applet_name);
                 argv++;
-                if (cmd <= 1)
-                        return ipaddr_modify((cmd == 0) ? RTM_NEWADDR : RTM_DELADDR, argv);
+                if (cmd <= 4) {
+                        return ipaddr_modify(
+                                /*cmd:*/ cmd == 4 ? RTM_DELADDR : RTM_NEWADDR,
+                                /*flags:*/
+                                        cmd == 0 ? NLM_F_CREATE|NLM_F_EXCL : /* add */
+                                        cmd == 1 || cmd == 2 ? NLM_F_REPLACE : /* change */
+                                        cmd == 3 ? NLM_F_CREATE|NLM_F_REPLACE : /* replace */
+                                        0 /* delete */
+                        , argv);
+                }
         }
-        /* 2 == list, 3 == show, 4 == lst */
-        return ipaddr_list_or_flush(argv, cmd == 5);
+        return ipaddr_list_or_flush(argv, cmd == 8);
 }
diff --git a/networking/netstat.c b/networking/netstat.c
index 1303d3f3d..2196d42f7 100644
--- a/networking/netstat.c
+++ b/networking/netstat.c
@@ -119,7 +119,7 @@ typedef enum {
 #define ADDR_NORMAL_WIDTH        23
 /* When there are IPv6 connections the IPv6 addresses will be
  * truncated to none-recognition. The '-W' option makes the
- * address columns wide enough to accomodate for longest possible
+ * address columns wide enough to accommodate for longest possible
  * IPv6 addresses, i.e. addresses of the form
  * xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:ddd.ddd.ddd.ddd
  */
diff --git a/networking/ntpd.c b/networking/ntpd.c
index 0233ed82c..b5120a70d 100644
--- a/networking/ntpd.c
+++ b/networking/ntpd.c
@@ -1497,7 +1497,6 @@ update_local_clock(peer_t *p)
 #endif
                 abs_offset = offset = 0;
                 set_new_values(STATE_SYNC, offset, recv_time);
-
         } else { /* abs_offset <= STEP_THRESHOLD */
 
                 /* The ratio is calculated before jitter is updated to make
diff --git a/networking/tc.c b/networking/tc.c
index 533f7c042..76e2e8359 100644
--- a/networking/tc.c
+++ b/networking/tc.c
@@ -151,17 +151,17 @@ static void print_rate(char *buf, int len, uint32_t rate)
         double tmp = (double)rate*8;
 
         if (use_iec) {
-                if (tmp >= 1000.0*1024.0*1024.0)
-                        snprintf(buf, len, "%.0fMibit", tmp/1024.0*1024.0);
-                else if (tmp >= 1000.0*1024)
+                if (tmp >= 1000*1024*1024)
+                        snprintf(buf, len, "%.0fMibit", tmp/(1024*1024));
+                else if (tmp >= 1000*1024)
                         snprintf(buf, len, "%.0fKibit", tmp/1024);
                 else
                         snprintf(buf, len, "%.0fbit", tmp);
         } else {
-                if (tmp >= 1000.0*1000000.0)
-                        snprintf(buf, len, "%.0fMbit", tmp/1000000.0);
-                else if (tmp >= 1000.0 * 1000.0)
-                        snprintf(buf, len, "%.0fKbit", tmp/1000.0);
+                if (tmp >= 1000*1000000)
+                        snprintf(buf, len, "%.0fMbit", tmp/1000000);
+                else if (tmp >= 1000*1000)
+                        snprintf(buf, len, "%.0fKbit", tmp/1000);
                 else
                         snprintf(buf, len, "%.0fbit",  tmp);
         }
diff --git a/networking/tftp.c b/networking/tftp.c
index 7c0ee58d7..8ecd7bb6f 100644
--- a/networking/tftp.c
+++ b/networking/tftp.c
@@ -348,7 +348,6 @@ static int tftp_protocol(
                          * as if it is "block 0" */
                         block_nr = 0;
                 }
-
         } else { /* tftp */
                 /* Open file (must be after changing user) */
                 local_fd = CMD_GET(option_mask32) ? STDOUT_FILENO : STDIN_FILENO;
diff --git a/networking/wget.c b/networking/wget.c
index 42bfbb206..e09bd2368 100644
--- a/networking/wget.c
+++ b/networking/wget.c
@@ -1062,7 +1062,6 @@ However, in real world it was observed that some web servers
 
                 /* For HTTP, data is pumped over the same connection */
                 dfp = sfp;
-
         } else {
                 /*
                  *  FTP session