Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/modutils/modinfo.c

Timestamp:

Jan 1, 2014, 12:47:38 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.21.1

File:

• branches/3.2/mindi-busybox/modutils/modinfo.c (modified) (8 diffs)

branches/3.2/mindi-busybox/modutils/modinfo.c

@@ -7 +7 @@
  */
 
-//applet:IF_MODINFO(APPLET(modinfo, _BB_DIR_SBIN, _BB_SUID_DROP))
+//applet:IF_MODINFO(APPLET(modinfo, BB_DIR_SBIN, BB_SUID_DROP))
 
 //kbuild:lib-$(CONFIG_MODINFO) += modinfo.o modutils.o
@@ -14 +14 @@
 //config:   bool "modinfo"
 //config:   default y
+//config:   select PLATFORM_LINUX
 //config:   help
 //config:     Show information about a Linux Kernel module
@@ -24 +25 @@
 
 enum {
-    OPT_TAGS = (1 << 6) - 1,
-    OPT_F = (1 << 6), /* field name */
-    OPT_0 = (1 << 7),  /* \0 as separator */
+    OPT_TAGS = (1 << 12) - 1, /* shortcut count */
+    OPT_F = (1 << 12), /* field name */
+    OPT_0 = (1 << 13), /* \0 as separator */
 };
 
@@ -45 +46 @@
 
 static void modinfo(const char *path, const char *version,
-            struct modinfo_env *env)
+            const struct modinfo_env *env)
 {
     static const char *const shortcuts[] = {
         "filename",
+        "license",
+        "author",
         "description",
-        "author",
-        "license",
+        "version",
+        "alias",
+        "srcversion",
+        "depends",
+        "uts_release",
         "vermagic",
         "parm",
+        "firmware",
     };
     size_t len;
@@ -81 +88 @@
         tags |= OPT_F;
     for (j = 1; (1<<j) & (OPT_TAGS + OPT_F); j++) {
-        const char *pattern = field;
+        const char *pattern;
+
+        if (!((1<<j) & tags))
+            continue;
+        pattern = field;
         if ((1<<j) & OPT_TAGS)
             pattern = shortcuts[j];
-        if (!((1<<j) & tags))
-            continue;
         length = strlen(pattern);
         ptr = the_module;
@@ -93 +102 @@
                 break;
             if (strncmp(ptr, pattern, length) == 0 && ptr[length] == '=') {
-                ptr += length + 1;
-                ptr += display(ptr, pattern, (1<<j) != tags);
+                /* field prefixes are 0x80 or 0x00 */
+                if ((ptr[-1] & 0x7F) == '\0') {
+                    ptr += length + 1;
+                    ptr += display(ptr, pattern, (1<<j) != tags);
+                }
             }
             ++ptr;
@@ -105 +117 @@
 //usage:       "[-adlp0] [-F keyword] MODULE"
 //usage:#define modinfo_full_usage "\n\n"
-//usage:       "Options:"
-//usage:     "\n    -a      Shortcut for '-F author'"
+//usage:       "    -a      Shortcut for '-F author'"
 //usage:     "\n    -d      Shortcut for '-F description'"
 //usage:     "\n    -l      Shortcut for '-F license'"
@@ -128 +139 @@
     env.field = NULL;
     opt_complementary = "-1"; /* minimum one param */
-    opts = getopt32(argv, "fdalvpF:0", &env.field);
+    opts = getopt32(argv, "nladvAsDumpF:0", &env.field);
     env.tags = opts & OPT_TAGS ? opts & OPT_TAGS : OPT_TAGS;
     argv += optind;