11 files changed, 17 insertions, 13 deletions

diff --git a/modutils/Kbuild.src b/modutils/Kbuild.src
index a512f6066..1a7ac8751 100644
--- a/modutils/Kbuild.src
+++ b/modutils/Kbuild.src
@@ -2,7 +2,7 @@
 #
 # Copyright (C) 1999-2005 by Erik Andersen <andersen@codepoet.org>
 #
-# Licensed under the GPL v2, see the file LICENSE in this tarball.
+# Licensed under GPLv2, see file LICENSE in this source tree.
 
 lib-y:=
 
diff --git a/modutils/depmod.c b/modutils/depmod.c
index 694f9ea5a..006a7bcc1 100644
--- a/modutils/depmod.c
+++ b/modutils/depmod.c
@@ -5,7 +5,7 @@
  * Copyrihgt (c) 2008 Timo Teras <timo.teras@iki.fi>
  * Copyright (c) 2008 Vladimir Dronnikov
  *
- * 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.
  */
 
 #include "libbb.h"
diff --git a/modutils/insmod.c b/modutils/insmod.c
index b88446c10..17fc18c09 100644
--- a/modutils/insmod.c
+++ b/modutils/insmod.c
@@ -4,7 +4,7 @@
  *
  * Copyright (C) 2008 Timo Teras <timo.teras@iki.fi>
  *
- * 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.
  */
 
 #include "libbb.h"
diff --git a/modutils/lsmod.c b/modutils/lsmod.c
index 97954c71f..9558a2510 100644
--- a/modutils/lsmod.c
+++ b/modutils/lsmod.c
@@ -5,7 +5,7 @@
  * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
  * Copyright (C) 2008 by Vladimir Dronnikov <dronnikov@gmail.com>
  *
- * 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.
  */
 #include "libbb.h"
 #include "unicode.h"
diff --git a/modutils/modinfo.c b/modutils/modinfo.c
index 454a1b366..37ba77edf 100644
--- a/modutils/modinfo.c
+++ b/modutils/modinfo.c
@@ -3,7 +3,7 @@
  * modinfo - retrieve module info
  * Copyright (c) 2008 Pascal Bellard
  *
- * 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.
  */
 
 //applet:IF_MODINFO(APPLET(modinfo, _BB_DIR_SBIN, _BB_SUID_DROP))
diff --git a/modutils/modprobe-small.c b/modutils/modprobe-small.c
index 0e1874ed4..05f2c34eb 100644
--- a/modutils/modprobe-small.c
+++ b/modutils/modprobe-small.c
@@ -5,7 +5,7 @@
  * Copyright (c) 2008 Vladimir Dronnikov
  * Copyright (c) 2008 Bernhard Reutner-Fischer (initial depmod code)
  *
- * Licensed under GPLv2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 
 #include "libbb.h"
diff --git a/modutils/modprobe.c b/modutils/modprobe.c
index 0a9424293..ab35628f4 100644
--- a/modutils/modprobe.c
+++ b/modutils/modprobe.c
@@ -5,7 +5,7 @@
  * Copyright (c) 2008 Timo Teras <timo.teras@iki.fi>
  * Copyright (c) 2008 Vladimir Dronnikov
  *
- * 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.
  */
 
 /* Note that unlike older versions of modules.dep/depmod (busybox and m-i-t),
diff --git a/modutils/modutils-24.c b/modutils/modutils-24.c
index c42d3c0bb..7228954d6 100644
--- a/modutils/modutils-24.c
+++ b/modutils/modutils-24.c
@@ -55,7 +55,7 @@
  *   Restructured (and partly rewritten) by:
  *   Björn Ekwall <bj0rn@blox.se> February 1999
  *
- * 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.
  */
 
 #include "libbb.h"
diff --git a/modutils/modutils.c b/modutils/modutils.c
index 850a8683b..565d0d22f 100644
--- a/modutils/modutils.c
+++ b/modutils/modutils.c
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2008 by Timo Teras <timo.teras@iki.fi>
  *
- * 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.
  */
 #include "modutils.h"
 
@@ -71,8 +71,12 @@ char* FAST_FUNC parse_cmdline_module_options(char **argv)
         optlen = 0;
         while (*++argv) {
                 options = xrealloc(options, optlen + 2 + strlen(*argv) + 2);
-                /* Spaces handled by "" pairs, but no way of escaping quotes */
-                optlen += sprintf(options + optlen, (strchr(*argv, ' ') ? "\"%s\" " : "%s "), *argv);
+                /* 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);
         }
         return options;
 }
diff --git a/modutils/modutils.h b/modutils/modutils.h
index d46870ca6..863bc26d3 100644
--- a/modutils/modutils.h
+++ b/modutils/modutils.h
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2008 by Timo Teras <timo.teras@iki.fi>
  *
- * 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.
  */
 
 #ifndef MODUTILS_H
diff --git a/modutils/rmmod.c b/modutils/rmmod.c
index ee32dfdef..aa1bb01d6 100644
--- a/modutils/rmmod.c
+++ b/modutils/rmmod.c
@@ -5,7 +5,7 @@
  * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
  * Copyright (C) 2008 Timo Teras <timo.teras@iki.fi>
  *
- * 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.
  */
 
 #include "libbb.h"