Fix module-name splitting with --protect-args.

Fixes bug 8838.

diff --git a/t_stub.c b/t_stub.c
index 637e0d55754bc33ced466d69cc5133c564345a8c..013c09d156587a7652740b123f8ed569eada28f9 100644 (file)
--- a/t_stub.c
+++ b/t_stub.c
@@ -23,6 +23,7 @@
 
 int modify_window = 0;
 int preallocate_files = 0;
+int protect_args = 0;
 int module_id = -1;
 int relative_paths = 0;
 int module_dirlen = 0;

diff --git a/util.c b/util.c
index 0799dff561554462043fe319c5405396a90cb2e5..d0dee734bfa05440abe2108603127e1d9c76f049 100644 (file)
--- a/util.c
+++ b/util.c
@@ -26,6 +26,7 @@
 #include "inums.h"
 
 extern int module_id;
+extern int protect_args;
 extern int modify_window;
 extern int relative_paths;
 extern int preserve_times;
@@ -759,6 +760,11 @@ void glob_expand_module(char *base1, char *arg, char ***argv_p, int *argc_p, int
        if (strncmp(arg, base, base_len) == 0)
                arg += base_len;
 
+       if (protect_args) {
+               glob_expand(arg, argv_p, argc_p, maxargs_p);
+               return;
+       }
+
        if (!(arg = strdup(arg)))
                out_of_memory("glob_expand_module");