ifenslave: fix missing close paren
[oweals/busybox.git] / networking / ifconfig.c
index 00dc455b0d7a585bda8584943c5306ce92b48501..b6604f5d15a0e4ff2bf1677f57208b187466afb7 100644 (file)
@@ -10,7 +10,7 @@
  * Authors of the original ifconfig was:
  *              Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
 /*
  * IPV6 support added by Bart Visscher <magick@linux-fan.com>
  */
 
+//usage:#define ifconfig_trivial_usage
+//usage:       IF_FEATURE_IFCONFIG_STATUS("[-a]") " interface [address]"
+//usage:#define ifconfig_full_usage "\n\n"
+//usage:       "Configure a network interface\n"
+//usage:     "\n"
+//usage:       IF_FEATURE_IPV6(
+//usage:       "       [add ADDRESS[/PREFIXLEN]]\n")
+//usage:       IF_FEATURE_IPV6(
+//usage:       "       [del ADDRESS[/PREFIXLEN]]\n")
+//usage:       "       [[-]broadcast [ADDRESS]] [[-]pointopoint [ADDRESS]]\n"
+//usage:       "       [netmask ADDRESS] [dstaddr ADDRESS]\n"
+//usage:       IF_FEATURE_IFCONFIG_SLIP(
+//usage:       "       [outfill NN] [keepalive NN]\n")
+//usage:       "       " IF_FEATURE_IFCONFIG_HW("[hw ether" IF_FEATURE_HWIB("|infiniband")" ADDRESS] ") "[metric NN] [mtu NN]\n"
+//usage:       "       [[-]trailers] [[-]arp] [[-]allmulti]\n"
+//usage:       "       [multicast] [[-]promisc] [txqueuelen NN] [[-]dynamic]\n"
+//usage:       IF_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ(
+//usage:       "       [mem_start NN] [io_addr NN] [irq NN]\n")
+//usage:       "       [up|down] ..."
+
+#include "libbb.h"
+#include "inet_common.h"
 #include <net/if.h>
 #include <net/if_arp.h>
 #include <netinet/in.h>
-#if __GLIBC__ >=2 && __GLIBC_MINOR__ >= 1
-#include <netpacket/packet.h>
-#include <net/ethernet.h>
-#else
-#include <sys/types.h>
-#include <netinet/if_ether.h>
+#ifdef HAVE_NET_ETHERNET_H
+# include <net/ethernet.h>
 #endif
-#include "inet_common.h"
-#include "busybox.h"
 
 #if ENABLE_FEATURE_IFCONFIG_SLIP
 # include <net/if_slip.h>
@@ -164,7 +180,7 @@ struct in6_ifreq {
 
 struct arg1opt {
        const char *name;
-       int selector;
+       unsigned short selector;
        unsigned short ifr_offset;
 };
 
@@ -183,103 +199,93 @@ struct options {
 #define ifreq_offsetof(x)  offsetof(struct ifreq, x)
 
 static const struct arg1opt Arg1Opt[] = {
-       {"SIOCSIFMETRIC",  SIOCSIFMETRIC,  ifreq_offsetof(ifr_metric)},
-       {"SIOCSIFMTU",     SIOCSIFMTU,     ifreq_offsetof(ifr_mtu)},
-       {"SIOCSIFTXQLEN",  SIOCSIFTXQLEN,  ifreq_offsetof(ifr_qlen)},
-       {"SIOCSIFDSTADDR", SIOCSIFDSTADDR, ifreq_offsetof(ifr_dstaddr)},
-       {"SIOCSIFNETMASK", SIOCSIFNETMASK, ifreq_offsetof(ifr_netmask)},
-       {"SIOCSIFBRDADDR", SIOCSIFBRDADDR, ifreq_offsetof(ifr_broadaddr)},
+       { "SIFMETRIC",  SIOCSIFMETRIC,  ifreq_offsetof(ifr_metric) },
+       { "SIFMTU",     SIOCSIFMTU,     ifreq_offsetof(ifr_mtu) },
+       { "SIFTXQLEN",  SIOCSIFTXQLEN,  ifreq_offsetof(ifr_qlen) },
+       { "SIFDSTADDR", SIOCSIFDSTADDR, ifreq_offsetof(ifr_dstaddr) },
+       { "SIFNETMASK", SIOCSIFNETMASK, ifreq_offsetof(ifr_netmask) },
+       { "SIFBRDADDR", SIOCSIFBRDADDR, ifreq_offsetof(ifr_broadaddr) },
 #if ENABLE_FEATURE_IFCONFIG_HW
-       {"SIOCSIFHWADDR",  SIOCSIFHWADDR,  ifreq_offsetof(ifr_hwaddr)},
+       { "SIFHWADDR",  SIOCSIFHWADDR,  ifreq_offsetof(ifr_hwaddr) },
 #endif
-       {"SIOCSIFDSTADDR", SIOCSIFDSTADDR, ifreq_offsetof(ifr_dstaddr)},
+       { "SIFDSTADDR", SIOCSIFDSTADDR, ifreq_offsetof(ifr_dstaddr) },
 #ifdef SIOCSKEEPALIVE
-       {"SIOCSKEEPALIVE", SIOCSKEEPALIVE, ifreq_offsetof(ifr_data)},
+       { "SKEEPALIVE", SIOCSKEEPALIVE, ifreq_offsetof(ifr_data) },
 #endif
 #ifdef SIOCSOUTFILL
-       {"SIOCSOUTFILL",   SIOCSOUTFILL,   ifreq_offsetof(ifr_data)},
+       { "SOUTFILL",   SIOCSOUTFILL,   ifreq_offsetof(ifr_data) },
 #endif
 #if ENABLE_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ
-       {"SIOCSIFMAP",     SIOCSIFMAP,     ifreq_offsetof(ifr_map.mem_start)},
-       {"SIOCSIFMAP",     SIOCSIFMAP,     ifreq_offsetof(ifr_map.base_addr)},
-       {"SIOCSIFMAP",     SIOCSIFMAP,     ifreq_offsetof(ifr_map.irq)},
+       { "SIFMAP",     SIOCSIFMAP,     ifreq_offsetof(ifr_map.mem_start) },
+       { "SIFMAP",     SIOCSIFMAP,     ifreq_offsetof(ifr_map.base_addr) },
+       { "SIFMAP",     SIOCSIFMAP,     ifreq_offsetof(ifr_map.irq) },
 #endif
        /* Last entry if for unmatched (possibly hostname) arg. */
 #if ENABLE_FEATURE_IPV6
-       {"SIOCSIFADDR",    SIOCSIFADDR,    ifreq_offsetof(ifr_addr)}, /* IPv6 version ignores the offset */
-       {"SIOCDIFADDR",    SIOCDIFADDR,    ifreq_offsetof(ifr_addr)}, /* IPv6 version ignores the offset */
+       { "SIFADDR",    SIOCSIFADDR,    ifreq_offsetof(ifr_addr) }, /* IPv6 version ignores the offset */
+       { "DIFADDR",    SIOCDIFADDR,    ifreq_offsetof(ifr_addr) }, /* IPv6 version ignores the offset */
 #endif
-       {"SIOCSIFADDR",    SIOCSIFADDR,    ifreq_offsetof(ifr_addr)},
+       { "SIFADDR",    SIOCSIFADDR,    ifreq_offsetof(ifr_addr) },
 };
 
 static const struct options OptArray[] = {
-       {"metric",      N_ARG,         ARG_METRIC,      0},
-       {"mtu",         N_ARG,         ARG_MTU,         0},
-       {"txqueuelen",  N_ARG,         ARG_TXQUEUELEN,  0},
-       {"dstaddr",     N_ARG,         ARG_DSTADDR,     0},
-       {"netmask",     N_ARG,         ARG_NETMASK,     0},
-       {"broadcast",   N_ARG | M_CLR, ARG_BROADCAST,   IFF_BROADCAST},
+       { "metric",      N_ARG,         ARG_METRIC,      0 },
+       { "mtu",         N_ARG,         ARG_MTU,         0 },
+       { "txqueuelen",  N_ARG,         ARG_TXQUEUELEN,  0 },
+       { "dstaddr",     N_ARG,         ARG_DSTADDR,     0 },
+       { "netmask",     N_ARG,         ARG_NETMASK,     0 },
+       { "broadcast",   N_ARG | M_CLR, ARG_BROADCAST,   IFF_BROADCAST },
 #if ENABLE_FEATURE_IFCONFIG_HW
-       {"hw",          N_ARG, ARG_HW,                  0},
+       { "hw",          N_ARG,         ARG_HW,          0 },
 #endif
-       {"pointopoint", N_ARG | M_CLR, ARG_POINTOPOINT, IFF_POINTOPOINT},
+       { "pointopoint", N_ARG | M_CLR, ARG_POINTOPOINT, IFF_POINTOPOINT },
 #ifdef SIOCSKEEPALIVE
-       {"keepalive",   N_ARG,         ARG_KEEPALIVE,   0},
+       { "keepalive",   N_ARG,         ARG_KEEPALIVE,   0 },
 #endif
 #ifdef SIOCSOUTFILL
-       {"outfill",     N_ARG,         ARG_OUTFILL,     0},
+       { "outfill",     N_ARG,         ARG_OUTFILL,     0 },
 #endif
 #if ENABLE_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ
-       {"mem_start",   N_ARG,         ARG_MEM_START,   0},
-       {"io_addr",     N_ARG,         ARG_IO_ADDR,     0},
-       {"irq",         N_ARG,         ARG_IRQ,         0},
+       { "mem_start",   N_ARG,         ARG_MEM_START,   0 },
+       { "io_addr",     N_ARG,         ARG_IO_ADDR,     0 },
+       { "irq",         N_ARG,         ARG_IRQ,         0 },
 #endif
 #if ENABLE_FEATURE_IPV6
-       {"add",         N_ARG,         ARG_ADD_DEL,     0},
-       {"del",         N_ARG,         ARG_ADD_DEL,     0},
-#endif
-       {"arp",         N_CLR | M_SET, 0,               IFF_NOARP},
-       {"trailers",    N_CLR | M_SET, 0,               IFF_NOTRAILERS},
-       {"promisc",     N_SET | M_CLR, 0,               IFF_PROMISC},
-       {"multicast",   N_SET | M_CLR, 0,               IFF_MULTICAST},
-       {"allmulti",    N_SET | M_CLR, 0,               IFF_ALLMULTI},
-       {"dynamic",     N_SET | M_CLR, 0,               IFF_DYNAMIC},
-       {"up",          N_SET,         0,               (IFF_UP | IFF_RUNNING)},
-       {"down",        N_CLR,         0,               IFF_UP},
-       {NULL,          0,             ARG_HOSTNAME,    (IFF_UP | IFF_RUNNING)}
+       { "add",         N_ARG,         ARG_ADD_DEL,     0 },
+       { "del",         N_ARG,         ARG_ADD_DEL,     0 },
+#endif
+       { "arp",         N_CLR | M_SET, 0,               IFF_NOARP },
+       { "trailers",    N_CLR | M_SET, 0,               IFF_NOTRAILERS },
+       { "promisc",     N_SET | M_CLR, 0,               IFF_PROMISC },
+       { "multicast",   N_SET | M_CLR, 0,               IFF_MULTICAST },
+       { "allmulti",    N_SET | M_CLR, 0,               IFF_ALLMULTI },
+       { "dynamic",     N_SET | M_CLR, 0,               IFF_DYNAMIC },
+       { "up",          N_SET,         0,               (IFF_UP | IFF_RUNNING) },
+       { "down",        N_CLR,         0,               IFF_UP },
+       { NULL,          0,             ARG_HOSTNAME,    (IFF_UP | IFF_RUNNING) }
 };
 
 /*
  * A couple of prototypes.
  */
-
 #if ENABLE_FEATURE_IFCONFIG_HW
 static int in_ether(const char *bufp, struct sockaddr *sap);
 #endif
 
-#if ENABLE_FEATURE_IFCONFIG_STATUS
-extern int interface_opt_a;
-extern int display_interfaces(char *ifname);
-#endif
-
 /*
  * Our main function.
  */
-
-int ifconfig_main(int argc, char **argv)
+int ifconfig_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int ifconfig_main(int argc UNUSED_PARAM, char **argv)
 {
        struct ifreq ifr;
        struct sockaddr_in sai;
-#if ENABLE_FEATURE_IPV6
-       struct sockaddr_in6 sai6;
-#endif
 #if ENABLE_FEATURE_IFCONFIG_HW
        struct sockaddr sa;
 #endif
        const struct arg1opt *a1op;
        const struct options *op;
        int sockfd;                     /* socket fd we use to manipulate stuff with */
-       int goterr;
        int selector;
 #if ENABLE_FEATURE_IFCONFIG_BROADCAST_PLUS
        unsigned int mask;
@@ -293,7 +299,6 @@ int ifconfig_main(int argc, char **argv)
        /*char host[128];*/
        const char *host = NULL; /* make gcc happy */
 
-       goterr = 0;
        did_flags = 0;
 #if ENABLE_FEATURE_IFCONFIG_BROADCAST_PLUS
        sai_hostname = 0;
@@ -302,19 +307,17 @@ int ifconfig_main(int argc, char **argv)
 
        /* skip argv[0] */
        ++argv;
-       --argc;
 
 #if ENABLE_FEATURE_IFCONFIG_STATUS
-       if ((argc > 0) && (((*argv)[0] == '-') && ((*argv)[1] == 'a') && !(*argv)[2])) {
+       if (argv[0] && (argv[0][0] == '-' && argv[0][1] == 'a' && !argv[0][2])) {
                interface_opt_a = 1;
-               --argc;
                ++argv;
        }
 #endif
 
-       if (argc <= 1) {
+       if (!argv[0] || !argv[1]) { /* one or no args */
 #if ENABLE_FEATURE_IFCONFIG_STATUS
-               return display_interfaces(argc ? *argv : NULL);
+               return display_interfaces(argv[0] /* can be NULL */);
 #else
                bb_error_msg_and_die("no support for status display");
 #endif
@@ -324,7 +327,7 @@ int ifconfig_main(int argc, char **argv)
        sockfd = xsocket(AF_INET, SOCK_DGRAM, 0);
 
        /* get interface name */
-       safe_strncpy(ifr.ifr_name, *argv, IFNAMSIZ);
+       strncpy_IFNAMSIZ(ifr.ifr_name, *argv);
 
        /* Process the remaining arguments. */
        while (*++argv != (char *) NULL) {
@@ -337,18 +340,16 @@ int ifconfig_main(int argc, char **argv)
                for (op = OptArray; op->name; op++) {   /* Find table entry. */
                        if (strcmp(p, op->name) == 0) { /* If name matches... */
                                mask &= op->flags;
-                               if (mask) {     /* set the mask and go. */
+                               if (mask)       /* set the mask and go. */
                                        goto FOUND_ARG;
-                               }
                                /* If we get here, there was a valid arg with an */
                                /* invalid '-' prefix. */
-                               ++goterr;
-                               goto LOOP;
+                               bb_error_msg_and_die("bad: '%s'", p-1);
                        }
                }
 
                /* We fell through, so treat as possible hostname. */
-               a1op = Arg1Opt + (sizeof(Arg1Opt) / sizeof(Arg1Opt[0])) - 1;
+               a1op = Arg1Opt + ARRAY_SIZE(Arg1Opt) - 1;
                mask = op->arg_flags;
                goto HOSTNAME;
 
@@ -356,16 +357,13 @@ int ifconfig_main(int argc, char **argv)
                if (mask & ARG_MASK) {
                        mask = op->arg_flags;
                        a1op = Arg1Opt + (op - OptArray);
-                       if (mask & A_NETMASK & did_flags) {
+                       if (mask & A_NETMASK & did_flags)
                                bb_show_usage();
-                       }
                        if (*++argv == NULL) {
-                               if (mask & A_ARG_REQ) {
+                               if (mask & A_ARG_REQ)
                                        bb_show_usage();
-                               } else {
-                                       --argv;
-                                       mask &= A_SET_AFTER;    /* just for broadcast */
-                               }
+                               --argv;
+                               mask &= A_SET_AFTER;    /* just for broadcast */
                        } else {        /* got an arg so process it */
  HOSTNAME:
                                did_flags |= (mask & (A_NETMASK|A_HOSTNAME));
@@ -382,121 +380,98 @@ int ifconfig_main(int argc, char **argv)
 #if ENABLE_FEATURE_IPV6
                                                prefix = strchr(host, '/');
                                                if (prefix) {
-                                                       if (safe_strtoi(prefix + 1, &prefix_len) ||
-                                                               (prefix_len < 0) || (prefix_len > 128))
-                                                       {
-                                                               ++goterr;
-                                                               goto LOOP;
-                                                       }
-                                                       *prefix = 0;
+                                                       prefix_len = xatou_range(prefix + 1, 0, 128);
+                                                       *prefix = '\0';
                                                }
 #endif
-
                                                sai.sin_family = AF_INET;
                                                sai.sin_port = 0;
-                                               if (!strcmp(host, bb_INET_default)) {
+                                               if (strcmp(host, "default") == 0) {
                                                        /* Default is special, meaning 0.0.0.0. */
                                                        sai.sin_addr.s_addr = INADDR_ANY;
+                                               }
 #if ENABLE_FEATURE_IFCONFIG_BROADCAST_PLUS
-                                               } else if (((host[0] == '+') && !host[1]) && (mask & A_BROADCAST) &&
-                                                                  (did_flags & (A_NETMASK|A_HOSTNAME)) == (A_NETMASK|A_HOSTNAME)) {
+                                               else if ((host[0] == '+' && !host[1]) && (mask & A_BROADCAST)
+                                                && (did_flags & (A_NETMASK|A_HOSTNAME)) == (A_NETMASK|A_HOSTNAME)
+                                               ) {
                                                        /* + is special, meaning broadcast is derived. */
                                                        sai.sin_addr.s_addr = (~sai_netmask) | (sai_hostname & sai_netmask);
+                                               }
 #endif
+                                               else {
+                                                       len_and_sockaddr *lsa;
+                                                       if (strcmp(host, "inet") == 0)
+                                                               continue; /* compat stuff */
+                                                       lsa = xhost2sockaddr(host, 0);
 #if ENABLE_FEATURE_IPV6
-                                               } else if (inet_pton(AF_INET6, host, &sai6.sin6_addr) > 0) {
-                                                       int sockfd6;
-                                                       struct in6_ifreq ifr6;
-
-                                                       memcpy((char *) &ifr6.ifr6_addr,
-                                                                  (char *) &sai6.sin6_addr,
-                                                                  sizeof(struct in6_addr));
-
-                                                       /* Create a channel to the NET kernel. */
-                                                       if ((sockfd6 = socket(AF_INET6, SOCK_DGRAM, 0)) < 0) {
-                                                               bb_perror_msg_and_die("socket6");
-                                                       }
-                                                       if (ioctl(sockfd6, SIOGIFINDEX, &ifr) < 0) {
-                                                               perror("SIOGIFINDEX");
-                                                               ++goterr;
+                                                       if (lsa->u.sa.sa_family == AF_INET6) {
+                                                               int sockfd6;
+                                                               struct in6_ifreq ifr6;
+
+                                                               memcpy((char *) &ifr6.ifr6_addr,
+                                                                               (char *) &(lsa->u.sin6.sin6_addr),
+                                                                               sizeof(struct in6_addr));
+
+                                                               /* Create a channel to the NET kernel. */
+                                                               sockfd6 = xsocket(AF_INET6, SOCK_DGRAM, 0);
+                                                               xioctl(sockfd6, SIOGIFINDEX, &ifr);
+                                                               ifr6.ifr6_ifindex = ifr.ifr_ifindex;
+                                                               ifr6.ifr6_prefixlen = prefix_len;
+                                                               ioctl_or_perror_and_die(sockfd6, a1op->selector, &ifr6, "SIOC%s", a1op->name);
+                                                               if (ENABLE_FEATURE_CLEAN_UP)
+                                                                       free(lsa);
                                                                continue;
                                                        }
-                                                       ifr6.ifr6_ifindex = ifr.ifr_ifindex;
-                                                       ifr6.ifr6_prefixlen = prefix_len;
-                                                       if (ioctl(sockfd6, a1op->selector, &ifr6) < 0) {
-                                                               perror(a1op->name);
-                                                               ++goterr;
-                                                       }
-                                                       continue;
 #endif
-                                               } else if (inet_aton(host, &sai.sin_addr) == 0) {
-                                                       /* It's not a dotted quad. */
-                                                       struct hostent *hp = gethostbyname(host);
-                                                       if (!hp) {
-                                                               ++goterr;
-                                                               continue;
-                                                       }
-                                                       memcpy((char *) &sai.sin_addr, (char *) hp->h_addr_list[0],
-                                                                       sizeof(struct in_addr));
+                                                       sai.sin_addr = lsa->u.sin.sin_addr;
+                                                       if (ENABLE_FEATURE_CLEAN_UP)
+                                                               free(lsa);
                                                }
 #if ENABLE_FEATURE_IFCONFIG_BROADCAST_PLUS
-                                               if (mask & A_HOSTNAME) {
+                                               if (mask & A_HOSTNAME)
                                                        sai_hostname = sai.sin_addr.s_addr;
-                                               }
-                                               if (mask & A_NETMASK) {
+                                               if (mask & A_NETMASK)
                                                        sai_netmask = sai.sin_addr.s_addr;
-                                               }
 #endif
                                                p = (char *) &sai;
 #if ENABLE_FEATURE_IFCONFIG_HW
                                        } else {        /* A_CAST_HOST_COPY_IN_ETHER */
                                                /* This is the "hw" arg case. */
-                                               if (strcmp("ether", *argv) || (*++argv == NULL)) {
+                                               smalluint hw_class= index_in_substrings("ether\0"
+                                                               IF_FEATURE_HWIB("infiniband\0"), *argv) + 1;
+                                               if (!hw_class || !*++argv)
                                                        bb_show_usage();
-                                               }
                                                /*safe_strncpy(host, *argv, sizeof(host));*/
                                                host = *argv;
-                                               if (in_ether(host, &sa)) {
-                                                       bb_error_msg("invalid hw-addr %s", host);
-                                                       ++goterr;
-                                                       continue;
-                                               }
+                                               if (hw_class == 1 ? in_ether(host, &sa) : in_ib(host, &sa))
+                                                       bb_error_msg_and_die("invalid hw-addr %s", host);
                                                p = (char *) &sa;
                                        }
 #endif
                                        memcpy( (((char *)&ifr) + a1op->ifr_offset),
                                                   p, sizeof(struct sockaddr));
                                } else {
+                                       /* FIXME: error check?? */
                                        unsigned long i = strtoul(*argv, NULL, 0);
-
                                        p = ((char *)&ifr) + a1op->ifr_offset;
 #if ENABLE_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ
                                        if (mask & A_MAP_TYPE) {
-                                               if (ioctl(sockfd, SIOCGIFMAP, &ifr) < 0) {
-                                                       ++goterr;
-                                                       continue;
-                                               }
-                                               if ((mask & A_MAP_UCHAR) == A_MAP_UCHAR) {
+                                               xioctl(sockfd, SIOCGIFMAP, &ifr);
+                                               if ((mask & A_MAP_UCHAR) == A_MAP_UCHAR)
                                                        *((unsigned char *) p) = i;
-                                               } else if (mask & A_MAP_USHORT) {
+                                               else if (mask & A_MAP_USHORT)
                                                        *((unsigned short *) p) = i;
-                                               } else {
+                                               else
                                                        *((unsigned long *) p) = i;
-                                               }
                                        } else
 #endif
-                                       if (mask & A_CAST_CHAR_PTR) {
+                                       if (mask & A_CAST_CHAR_PTR)
                                                *((caddr_t *) p) = (caddr_t) i;
-                                       } else {        /* A_CAST_INT */
+                                       else    /* A_CAST_INT */
                                                *((int *) p) = i;
-                                       }
                                }
 
-                               if (ioctl(sockfd, a1op->selector, &ifr) < 0) {
-                                       perror(a1op->name);
-                                       ++goterr;
-                                       continue;
-                               }
+                               ioctl_or_perror_and_die(sockfd, a1op->selector, &ifr, "SIOC%s", a1op->name);
 #ifdef QUESTIONABLE_ALIAS_CASE
                                if (mask & A_COLON_CHK) {
                                        /*
@@ -508,46 +483,31 @@ int ifconfig_main(int argc, char **argv)
                                         */
                                        char *ptr;
                                        short int found_colon = 0;
-
-                                       for (ptr = ifr.ifr_name; *ptr; ptr++) {
-                                               if (*ptr == ':') {
+                                       for (ptr = ifr.ifr_name; *ptr; ptr++)
+                                               if (*ptr == ':')
                                                        found_colon++;
-                                               }
-                                       }
-
-                                       if (found_colon && *(ptr - 1) == '-') {
+                                       if (found_colon && ptr[-1] == '-')
                                                continue;
-                                       }
                                }
 #endif
                        }
-                       if (!(mask & A_SET_AFTER)) {
+                       if (!(mask & A_SET_AFTER))
                                continue;
-                       }
                        mask = N_SET;
                }
 
-               if (ioctl(sockfd, SIOCGIFFLAGS, &ifr) < 0) {
-                       perror("SIOCGIFFLAGS");
-                       ++goterr;
-               } else {
-                       selector = op->selector;
-                       if (mask & SET_MASK) {
-                               ifr.ifr_flags |= selector;
-                       } else {
-                               ifr.ifr_flags &= ~selector;
-                       }
-                       if (ioctl(sockfd, SIOCSIFFLAGS, &ifr) < 0) {
-                               perror("SIOCSIFFLAGS");
-                               ++goterr;
-                       }
-               }
- LOOP:
-               continue;
-       }                                       /* end of while-loop */
-
-       if (ENABLE_FEATURE_CLEAN_UP) close(sockfd);
-       return goterr;
+               xioctl(sockfd, SIOCGIFFLAGS, &ifr);
+               selector = op->selector;
+               if (mask & SET_MASK)
+                       ifr.ifr_flags |= selector;
+               else
+                       ifr.ifr_flags &= ~selector;
+               xioctl(sockfd, SIOCSIFFLAGS, &ifr);
+       } /* while () */
+
+       if (ENABLE_FEATURE_CLEAN_UP)
+               close(sockfd);
+       return 0;
 }
 
 #if ENABLE_FEATURE_IFCONFIG_HW
@@ -560,7 +520,7 @@ static int in_ether(const char *bufp, struct sockaddr *sap)
        unsigned char c;
 
        sap->sa_family = ARPHRD_ETHER;
-       ptr = sap->sa_data;
+       ptr = (char *) sap->sa_data;
 
        i = 0;
        do {
@@ -589,6 +549,6 @@ static int in_ether(const char *bufp, struct sockaddr *sap)
                *ptr++ = val;
        } while (++i < ETH_ALEN);
 
-       return (int) (*bufp);   /* Error if we don't end at end of string. */
+       return *bufp; /* Error if we don't end at end of string. */
 }
 #endif