[SCM] The rsync repository. - branch master updated

[Rsync CVS commit messages]

The branch, master has been updated
       via  d6df073 Fix module-name splitting with --protect-args. Fixes bug 8838.
      from  d9ca1e4 Tweak --checksum-seed docs.

;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit d6df07392e4bbdd3056c501fc047e5a1ff45a371
Author: Wayne Davison <wayned at samba.org>
Date:   Sun Jun 2 15:53:40 2013 -0700

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

-----------------------------------------------------------------------

Summary of changes:
 t_stub.c |    1 +
 util.c   |    6 ++++++
 2 files changed, 7 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/t_stub.c b/t_stub.c
index 637e0d5..013c09d 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 0799dff..d0dee73 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");
 


-- 
The rsync repository.