From: Wayne Davison <wayned@samba.org>
Date: Sun, 2 Jun 2013 22:53:40 +0000 (-0700)
Subject: Fix module-name splitting with --protect-args.
X-Git-Tag: v3.1.0pre1~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d6df07392e4bbdd3056c501fc047e5a1ff45a371;p=thirdparty%2Frsync.git

Fix module-name splitting with --protect-args.
Fixes bug 8838.
---

diff --git a/t_stub.c b/t_stub.c
index 637e0d55..013c09d1 100644
--- 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 0799dff5..d0dee734 100644
--- 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");