last_patch95 from vodz:

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

diff --git a/networking/nameif.c b/networking/nameif.c
index f3b9271584373b2ed1bdfa2e363d36d1528a171f..dca7c8c08f95e31be9c2b538151502ccb37fb170 100644 (file)
--- a/networking/nameif.c
+++ b/networking/nameif.c
@@ -35,6 +35,15 @@
 
 #include "busybox.h"
 
+/* Older versions of net/if.h do not appear to define IF_NAMESIZE. */
+#ifndef IF_NAMESIZE
+#  ifdef IFNAMSIZ
+#    define IF_NAMESIZE IFNAMSIZ
+#  else
+#    define IF_NAMESIZE 16
+#  endif
+#endif
+
 /* take from linux/sockios.h */
 #define SIOCSIFNAME    0x8923  /* set interface name */
 
@@ -63,11 +72,11 @@ static void serror(const char *s, ...)
        va_start(ap, s);
 
        if (use_syslog) {
-               openlog(applet_name, 0, LOG_LOCAL0);
+               openlog(bb_applet_name, 0, LOG_LOCAL0);
                vsyslog(LOG_ERR, s, ap);
                closelog();
        } else {
-               verror_msg(s, ap);
+               bb_verror_msg(s, ap);
                putc('\n', stderr);
        }
 
@@ -111,12 +120,12 @@ int nameif_main(int argc, char **argv)
                        use_syslog = 1;
                        break;
                default:
-                       show_usage();
+                       bb_show_usage();
                }
        }
 
        if ((argc - optind) & 1)
-               show_usage();
+               bb_show_usage();
 
        if (optind < argc) {
                char **a = argv + optind;
@@ -126,7 +135,7 @@ int nameif_main(int argc, char **argv)
                        if (strlen(*a) > IF_NAMESIZE)
                                serror("interface name `%s' too long", *a);
                        ch = xcalloc(1, sizeof(mactable_t));
-                       ch->ifname = xstrdup(*a++);
+                       ch->ifname = bb_xstrdup(*a++);
                        ch->mac = cc_macaddr(*a++);
                        if (clist)
                                clist->prev = ch;
@@ -134,9 +143,9 @@ int nameif_main(int argc, char **argv)
                        clist = ch;
                }
        } else {
-               ifh = xfopen(fname, "r");
+               ifh = bb_xfopen(fname, "r");
 
-               while ((line = get_line_from_file(ifh)) != NULL) {
+               while ((line = bb_get_line_from_file(ifh)) != NULL) {
                        char *line_ptr;
                        size_t name_length;
 
@@ -145,7 +154,7 @@ int nameif_main(int argc, char **argv)
                                continue;
                        name_length = strcspn(line_ptr, " \t");
                        ch = xcalloc(1, sizeof(mactable_t));
-                       ch->ifname = xstrndup(line_ptr, name_length);
+                       ch->ifname = bb_xstrndup(line_ptr, name_length);
                        if (name_length > IF_NAMESIZE)
                                serror("interface name `%s' too long", ch->ifname);
                        line_ptr += name_length;