start_stop_daemon: NOMMU fixes, round 2 by Alex Landau <landau_alex@yahoo.com>

[oweals/busybox.git] / networking / nameif.c

diff --git a/networking/nameif.c b/networking/nameif.c
index 5fee465ccb3ea98153bc18ea504f671747a940c8..fd081fd63c1fe83b7121a0276f7439bd7fc0113a 100644 (file)
--- a/networking/nameif.c
+++ b/networking/nameif.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
  * nameif.c - Naming Interfaces based on MAC address for busybox.
  *
@@ -5,20 +6,14 @@
  * Busybox port 2002 by Nick Fedchik <nick@fedchik.org.ua>
  *                     Glenn McGrath <bug1@iinet.net.au>
  *
- * Licensed under the GPL v2 or later, see the file LICENSE in this tarball. 
+ * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
  */
 
-#include <sys/syslog.h>
-#include <sys/socket.h>
-#include <sys/ioctl.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
+#include "libbb.h"
+#include <syslog.h>
 #include <net/if.h>
 #include <netinet/ether.h>
 
-#include "busybox.h"
 
 /* Older versions of net/if.h do not appear to define IF_NAMESIZE. */
 #ifndef IF_NAMESIZE
@@ -46,42 +41,21 @@ typedef struct mactable_s {
        struct ether_addr *mac;
 } mactable_t;
 
-static unsigned long flags;
-
-static void serror(const char *s, ...) __attribute__ ((noreturn));
-
-static void serror(const char *s, ...)
-{
-       va_list ap;
-
-       va_start(ap, s);
-
-       if (flags & 1) {
-               openlog(bb_applet_name, 0, LOG_LOCAL0);
-               vsyslog(LOG_ERR, s, ap);
-               closelog();
-       } else
-               bb_error_msg(s, ap);
-
-       va_end(ap);
-
-       exit(EXIT_FAILURE);
-}
-
 /* Check ascii str_macaddr, convert and copy to *mac */
-static struct ether_addr *cc_macaddr(char *str_macaddr)
+static struct ether_addr *cc_macaddr(const char *str_macaddr)
 {
        struct ether_addr *lmac, *mac;
 
        lmac = ether_aton(str_macaddr);
        if (lmac == NULL)
-               serror("cannot parse MAC %s", str_macaddr);
+               bb_error_msg_and_die("cannot parse MAC %s", str_macaddr);
        mac = xmalloc(ETH_ALEN);
        memcpy(mac, lmac, ETH_ALEN);
 
        return mac;
 }
 
+int nameif_main(int argc, char **argv);
 int nameif_main(int argc, char **argv)
 {
        mactable_t *clist = NULL;
@@ -92,20 +66,23 @@ int nameif_main(int argc, char **argv)
        int if_index = 1;
        mactable_t *ch;
 
-       flags = bb_getopt_ulflags(argc, argv, "sc:", &fname);
+       if (1 & getopt32(argc, argv, "sc:", &fname)) {
+               openlog(applet_name, 0, LOG_LOCAL0);
+               logmode = LOGMODE_SYSLOG;
+       }
 
-       if (argc - optind == 1)
+       if ((argc - optind) & 1)
                bb_show_usage();
 
        if (optind < argc) {
                char **a = argv + optind;
 
                while (*a) {
-
                        if (strlen(*a) > IF_NAMESIZE)
-                               serror("interface name `%s' too long", *a);
-                       ch = xcalloc(1, sizeof(mactable_t));
-                       ch->ifname = bb_xstrdup(*a++);
+                               bb_error_msg_and_die("interface name '%s' "
+                                           "too long", *a);
+                       ch = xzalloc(sizeof(mactable_t));
+                       ch->ifname = xstrdup(*a++);
                        ch->mac = cc_macaddr(*a++);
                        if (clist)
                                clist->prev = ch;
@@ -113,20 +90,23 @@ int nameif_main(int argc, char **argv)
                        clist = ch;
                }
        } else {
-               ifh = bb_xfopen(fname, "r");
+               ifh = xfopen(fname, "r");
 
-               while ((line = bb_get_line_from_file(ifh)) != NULL) {
+               while ((line = xmalloc_fgets(ifh)) != NULL) {
                        char *line_ptr;
                        size_t name_length;
 
                        line_ptr = line + strspn(line, " \t");
-                       if ((line_ptr[0] == '#') || (line_ptr[0] == '\n'))
+                       if ((line_ptr[0] == '#') || (line_ptr[0] == '\n')) {
+                               free(line);
                                continue;
+                       }
                        name_length = strcspn(line_ptr, " \t");
-                       ch = xcalloc(1, sizeof(mactable_t));
-                       ch->ifname = bb_xstrndup(line_ptr, name_length);
+                       ch = xzalloc(sizeof(mactable_t));
+                       ch->ifname = xstrndup(line_ptr, name_length);
                        if (name_length > IF_NAMESIZE)
-                               serror("interface name `%s' too long", ch->ifname);
+                               bb_error_msg_and_die("interface name '%s' "
+                                               "too long", ch->ifname);
                        line_ptr += name_length;
                        line_ptr += strspn(line_ptr, " \t");
                        name_length = strspn(line_ptr, "0123456789ABCDEFabcdef:");
@@ -141,8 +121,7 @@ int nameif_main(int argc, char **argv)
                fclose(ifh);
        }
 
-       if ((ctl_sk = socket(PF_INET, SOCK_DGRAM, 0)) == -1)
-               serror("socket: %m");
+       ctl_sk = xsocket(PF_INET, SOCK_DGRAM, 0);
 
        while (clist) {
                struct ifreq ifr;
@@ -169,9 +148,9 @@ int nameif_main(int argc, char **argv)
                        continue;
 
                strcpy(ifr.ifr_newname, ch->ifname);
-               if (ioctl(ctl_sk, SIOCSIFNAME, &ifr) < 0)
-                       serror("cannot change ifname %s to %s: %m",
-                                  ifr.ifr_name, ch->ifname);
+               ioctl_or_perror_and_die(ctl_sk, SIOCSIFNAME, &ifr,
+                                       "cannot change ifname %s to %s",
+                                       ifr.ifr_name, ch->ifname);
 
                /* Remove list entry of renamed interface */
                if (ch->prev != NULL) {
@@ -181,11 +160,11 @@ int nameif_main(int argc, char **argv)
                }
                if (ch->next != NULL)
                        (ch->next)->prev = ch->prev;
-#ifdef CONFIG_FEATURE_CLEAN_UP
-               free(ch->ifname);
-               free(ch->mac);
-               free(ch);
-#endif
+               if (ENABLE_FEATURE_CLEAN_UP) {
+                       free(ch->ifname);
+                       free(ch->mac);
+                       free(ch);
+               }
        }
 
        return 0;