summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2011-02-01 22:24:25 (GMT)
committer Denys Vlasenko <vda.linux@googlemail.com>2011-02-01 22:24:25 (GMT)
commit8ae386bf195c6ea53232bacd2eb8cf26676962e4 (patch)
treed3588803f6aa8e905710466f33ffc8bcc90ec290
parent55ae0e9238e1979f0200700ec5dbd0df8d32f7a2 (diff)
downloadbusybox-8ae386bf195c6ea53232bacd2eb8cf26676962e4.tar.gz
busybox-8ae386bf195c6ea53232bacd2eb8cf26676962e4.tar.bz2
revert commit 1396221d5a741ef8e1e8abca88836b341a3cab84
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--modutils/modutils.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/modutils/modutils.c b/modutils/modutils.c
index 565d0d2..415dbbe 100644
--- a/modutils/modutils.c
+++ b/modutils/modutils.c
@@ -71,12 +71,11 @@ char* FAST_FUNC parse_cmdline_module_options(char **argv)
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);
+ /* 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);
}
return options;
}