udhcpc: fix a problem with binary-encoded options #2

[oweals/busybox.git] / modutils / modutils.c

diff --git a/modutils/modutils.c b/modutils/modutils.c
index 565d0d22f3f852c8c8ae681ec6de81e2e51e1a5d..6187ca72fd3835fa28a18158205a5856913cfd75 100644 (file)
--- a/modutils/modutils.c
+++ b/modutils/modutils.c
@@ -62,7 +62,7 @@ char* FAST_FUNC filename2modname(const char *filename, char *modname)
        return modname;
 }
 
-char* FAST_FUNC parse_cmdline_module_options(char **argv)
+char* FAST_FUNC parse_cmdline_module_options(char **argv, int quote_spaces)
 {
        char *options;
        int optlen;
@@ -70,14 +70,31 @@ char* FAST_FUNC parse_cmdline_module_options(char **argv)
        options = xzalloc(1);
        optlen = 0;
        while (*++argv) {
-               options = xrealloc(options, optlen + 2 + strlen(*argv) + 2);
-               /* Older versions were enclosing space-containing *argv in "",
-                * but both modprobe and insmod from module-init-tools 3.11.1
-                * don't do this anymore. (As to extra trailing space,
-                * insmod adds it but modprobe does not. We do in both cases)
-                */
-               optlen += sprintf(options + optlen, "%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;
 }