Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/modutils/modutils.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/modutils.c (modified) (2 diffs)

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

@@ -63 +63 @@
 }
 
-char* FAST_FUNC parse_cmdline_module_options(char **argv)
+char* FAST_FUNC parse_cmdline_module_options(char **argv, int quote_spaces)
 {
     char *options;
@@ -71 +71 @@
     optlen = 0;
     while (*++argv) {
-        options = xrealloc(options, optlen + 2 + strlen(*argv) + 2);
-        /* Spaces handled by "" pairs, but no way of escaping quotes */
-//TODO: module-init-tools version 3.11.1 quotes only value:
-//it generates var="val with spaces", not "var=val with spaces"
-//(and it won't quote var *name* even if it has spaces)
-        optlen += sprintf(options + optlen, (strchr(*argv, ' ') ? "\"%s\" " : "%s "), *argv);
-    }
+        const char *fmt;
+        const char *var;
+        const char *val;
+
+        var = *argv;
+        options = xrealloc(options, optlen + 2 + strlen(var) + 2);
+        fmt = "%.*s%s ";
+        val = strchrnul(var, '=');
+        if (quote_spaces) {
+            /*
+             * modprobe (module-init-tools version 3.11.1) compat:
+             * quote only value:
+             * var="val with spaces", not "var=val with spaces"
+             * (note: var *name* is not checked for spaces!)
+             */
+            if (*val) { /* has var=val format. skip '=' */
+                val++;
+                if (strchr(val, ' '))
+                    fmt = "%.*s\"%s\" ";
+            }
+        }
+        optlen += sprintf(options + optlen, fmt, (int)(val - var), var, val);
+    }
+    /* Remove trailing space. Disabled */
+    /* if (optlen != 0) options[optlen-1] = '\0'; */
     return options;
 }