X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/1b5814e33876c8f2637ec23e8b33556541b938f9..0e9480317dbb5b8003535a769f4a03bc720d5f5f:/util.c

diff --git a/util.c b/util.c
index 63073bd7..64473a30 100644
--- a/util.c
+++ b/util.c
@@ -84,6 +84,26 @@ int fd_pair(int fd[2])
 }
 
 
+void print_child_argv(char **cmd)
+{
+	rprintf(FINFO, RSYNC_NAME ": open connection using ");
+	for (; *cmd; cmd++) {
+		/* Look for characters that ought to be quoted.  This
+		* is not a great quoting algorithm, but it's
+		* sufficient for a log message. */
+		if (strspn(*cmd, "abcdefghijklmnopqrstuvwxyz"
+			   "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+			   "0123456789"
+			   ",.-_=+@/") != strlen(*cmd)) {
+			rprintf(FINFO, "\"%s\" ", *cmd);
+		} else {
+			rprintf(FINFO, "%s ", *cmd);
+		}
+	}
+	rprintf(FINFO, "\n");
+}
+
+
 /* this is derived from CVS code 
 
    note that in the child STDIN is set to blocking and STDOUT
@@ -100,6 +120,10 @@ pid_t piped_child(char **command, int *f_in, int *f_out)
 	int to_child_pipe[2];
 	int from_child_pipe[2];
 	extern int blocking_io;
+	
+	if (verbose > 0) {
+		print_child_argv(command);
+	}
 
 	if (fd_pair(to_child_pipe) < 0 || fd_pair(from_child_pipe) < 0) {
 		rprintf(FERROR, "pipe: %s\n", strerror(errno));
@@ -535,7 +559,7 @@ static void glob_expand_one(char *s, char **argv, int *argc, int maxargs)
 		globfree(&globbuf);
 		return;
 	}
-	for (i=0; i<(maxargs - (*argc)) && i<globbuf.gl_pathc;i++) {
+	for (i=0; i<(maxargs - (*argc)) && i < (int) globbuf.gl_pathc;i++) {
 		if (i == 0) free(argv[*argc]);
 		argv[(*argc) + i] = strdup(globbuf.gl_pathv[i]);
 		if (!argv[(*argc) + i]) out_of_memory("glob_expand");