Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/networking/vconfig.c

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/networking/vconfig.c (modified) (5 diffs)

branches/2.2.9/mindi-busybox/networking/vconfig.c

@@ -5 +5 @@
  * Copyright (C) 2001  Manuel Novoa III  <mjn3@codepoet.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.
  */
 
@@ -48 +48 @@
 };
 
-#define VLAN_GROUP_ARRAY_LEN 4096
-#define SIOCSIFVLAN 0x8983      /* Set 802.1Q VLAN options */
+#define VLAN_GROUP_ARRAY_LEN  4096
+#define SIOCSIFVLAN           0x8983  /* Set 802.1Q VLAN options */
 
-/* On entry, table points to the length of the current string plus
- * nul terminator plus data length for the subsequent entry.  The
- * return value is the last data entry for the matching string. */
+/* On entry, table points to the length of the current string
+ * plus NUL terminator plus data length for the subsequent entry.
+ * The return value is the last data entry for the matching string. */
 static const char *xfind_str(const char *table, const char *str)
 {
     while (strcasecmp(str, table+1) != 0) {
-        if (!*(table += table[0])) {
+        table += table[0];
+        if (!*table) {
             bb_show_usage();
         }
@@ -107 +108 @@
 static const char conf_file_name[] ALIGN1 = "/proc/net/vlan/config";
 
-int vconfig_main(int argc, char **argv);
+int vconfig_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int vconfig_main(int argc, char **argv)
 {
@@ -122 +123 @@
     xopen(conf_file_name, O_RDONLY);
 
-    memset(&ifr, 0, sizeof(struct vlan_ioctl_args));
+    memset(&ifr, 0, sizeof(ifr));
 
     ++argv;
@@ -134 +135 @@
         ifr.u.name_type = *xfind_str(name_types+1, argv[1]);
     } else {
-        if (strlen(argv[1]) >= IF_NAMESIZE) {
-            bb_error_msg_and_die("if_name >= %d chars", IF_NAMESIZE);
-        }
-        strcpy(ifr.device1, argv[1]);
+        strncpy_IFNAMSIZ(ifr.device1, argv[1]);
         p = argv[2];