use xbind, xconnect where appropriate.

[oweals/busybox.git] / networking / libiproute / iplink.c

diff --git a/networking/libiproute/iplink.c b/networking/libiproute/iplink.c
index 9e30122c38137af953f068230414f5de276f3300..ea57d60aca78faf965ec4120a4c9d856c25061bb 100644 (file)
--- a/networking/libiproute/iplink.c
+++ b/networking/libiproute/iplink.c
@@ -1,7 +1,8 @@
+/* vi: set sw=4 ts=4: */
 /*
- * iplink.c            "ip link".
+ * iplink.c "ip link".
  *
- * Authors:    Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
+ * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
  *
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
@@ -11,10 +12,6 @@
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 
-#include <errno.h>
-#include <string.h>
-#include <unistd.h>
-
 #include <net/if.h>
 #include <net/if_packet.h>
 #include <netpacket/packet.h>
@@ -28,11 +25,9 @@
 /* take from linux/sockios.h */
 #define SIOCSIFNAME    0x8923          /* set interface name */
 
-static int do_link;
-
 static int on_off(char *msg)
 {
-       bb_error_msg("Error: argument of \"%s\" must be \"on\" or \"off\"", msg);
+       bb_error_msg("error: argument of \"%s\" must be \"on\" or \"off\"", msg);
        return -1;
 }
 
@@ -62,7 +57,7 @@ static int do_chflags(char *dev, __u32 flags, __u32 mask)
        int fd;
        int err;
 
-       strcpy(ifr.ifr_name, dev);
+       strncpy(ifr.ifr_name, dev, sizeof(ifr.ifr_name));
        fd = get_ctl_fd();
        if (fd < 0)
                return -1;
@@ -89,8 +84,8 @@ static int do_changename(char *dev, char *newdev)
        int fd;
        int err;
 
-       strcpy(ifr.ifr_name, dev);
-       strcpy(ifr.ifr_newname, newdev);
+       strncpy(ifr.ifr_name, dev, sizeof(ifr.ifr_name));
+       strncpy(ifr.ifr_newname, newdev, sizeof(ifr.ifr_newname));
        fd = get_ctl_fd();
        if (fd < 0)
                return -1;
@@ -114,7 +109,7 @@ static int set_qlen(char *dev, int qlen)
                return -1;
 
        memset(&ifr, 0, sizeof(ifr));
-       strcpy(ifr.ifr_name, dev);
+       strncpy(ifr.ifr_name, dev, sizeof(ifr.ifr_name));
        ifr.ifr_qlen = qlen;
        if (ioctl(s, SIOCSIFTXQLEN, &ifr) < 0) {
                perror("SIOCSIFXQLEN");
@@ -136,7 +131,7 @@ static int set_mtu(char *dev, int mtu)
                return -1;
 
        memset(&ifr, 0, sizeof(ifr));
-       strcpy(ifr.ifr_name, dev);
+       strncpy(ifr.ifr_name, dev, sizeof(ifr.ifr_name));
        ifr.ifr_mtu = mtu;
        if (ioctl(s, SIOCSIFMTU, &ifr) < 0) {
                perror("SIOCSIFMTU");
@@ -162,7 +157,7 @@ static int get_address(char *dev, int *htype)
        }
 
        memset(&ifr, 0, sizeof(ifr));
-       strcpy(ifr.ifr_name, dev);
+       strncpy(ifr.ifr_name, dev, sizeof(ifr.ifr_name));
        if (ioctl(s, SIOCGIFINDEX, &ifr) < 0) {
                perror("SIOCGIFINDEX");
                close(s);
@@ -195,13 +190,13 @@ static int parse_address(char *dev, int hatype, int halen, char *lla, struct ifr
        int alen;
 
        memset(ifr, 0, sizeof(*ifr));
-       strcpy(ifr->ifr_name, dev);
+       strncpy(ifr->ifr_name, dev, sizeof(ifr->ifr_name));
        ifr->ifr_hwaddr.sa_family = hatype;
        alen = ll_addr_a2n((unsigned char *)(ifr->ifr_hwaddr.sa_data), 14, lla);
        if (alen < 0)
                return -1;
        if (alen != halen) {
-               bb_error_msg("Wrong address (%s) length: expected %d bytes", lla, halen);
+               bb_error_msg("wrong address (%s) length: expected %d bytes", lla, halen);
                return -1;
        }
        return 0;
@@ -335,7 +330,6 @@ static int do_set(int argc, char **argv)
 static int ipaddr_list_link(int argc, char **argv)
 {
        preferred_family = AF_PACKET;
-       do_link = 1;
        return ipaddr_list_or_flush(argc, argv, 0);
 }
 
@@ -351,6 +345,6 @@ int do_iplink(int argc, char **argv)
        } else
                return ipaddr_list_link(0, NULL);
 
-       bb_error_msg("Command \"%s\" is unknown.", *argv);
+       bb_error_msg("command \"%s\" is unknown", *argv);
        exit(-1);
 }