X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/71605b0f4d554c06e0e4ee1f3180adbdb02d441d..14dfad3873691b5ea9fe0170d9c7f6f5c9ea3179:/main.c

diff --git a/main.c b/main.c
index bf3166f4..80224ca1 100644
--- a/main.c
+++ b/main.c
@@ -21,6 +21,7 @@
  */
 
 #include "rsync.h"
+#include "ifuncs.h"
 #include "io.h"
 #if defined CONFIG_LOCALE && defined HAVE_LOCALE_H
 #include <locale.h>
@@ -581,7 +582,8 @@ static char *get_local_name(struct file_list *flist, char *dest_path)
 			exit_cleanup(RERR_FILEIO);
 		}
 
-		if (strcmp(flist->files[0]->basename, ".") == 0)
+		if (flist->high >= flist->low
+		 && strcmp(flist->files[flist->low]->basename, ".") == 0)
 			flist->files[0]->flags |= FLAG_DIR_CREATED;
 
 		if (verbose)
@@ -1124,15 +1126,15 @@ static int start_client(int argc, char *argv[])
 	if (!read_batch) { /* for read_batch, NO source is specified */
 		char *path = check_for_hostspec(argv[0], &shell_machine, &rsync_port);
 		if (path) { /* source is remote */
-			char *dummy1;
-			int dummy2;
+			char *dummy_host;
+			int dummy_port = 0;
 			*argv = path;
 			remote_argv = argv;
 			remote_argc = argc;
 			argv += argc - 1;
 			if (argc == 1 || **argv == ':')
 				argc = 0; /* no dest arg */
-			else if (check_for_hostspec(*argv, &dummy1, &dummy2)) {
+			else if (check_for_hostspec(*argv, &dummy_host, &dummy_port)) {
 				rprintf(FERROR,
 					"The source and destination cannot both be remote.\n");
 				exit_cleanup(RERR_SYNTAX);
@@ -1195,26 +1197,41 @@ static int start_client(int argc, char *argv[])
 	}
 
 	if (am_sender) {
-		char *dummy1;
-		int dummy2;
+		char *dummy_host;
+		int dummy_port = rsync_port;
 		int i;
 		/* For local source, extra source args must not have hostspec. */
 		for (i = 1; i < argc; i++) {
-			if (check_for_hostspec(argv[i], &dummy1, &dummy2)) {
+			if (check_for_hostspec(argv[i], &dummy_host, &dummy_port)) {
 				rprintf(FERROR, "Unexpected remote arg: %s\n", argv[i]);
 				exit_cleanup(RERR_SYNTAX);
 			}
 		}
 	} else {
+		char *dummy_host;
+		int dummy_port = rsync_port;
 		int i;
-		/* For remote source, any extra source args must be ":SOURCE" args. */
+		/* For remote source, any extra source args must have either
+		 * the same hostname or an empty hostname. */
 		for (i = 1; i < remote_argc; i++) {
-			if (*remote_argv[i] != ':') {
+			char *arg = check_for_hostspec(remote_argv[i], &dummy_host, &dummy_port);
+			if (!arg) {
 				rprintf(FERROR, "Unexpected local arg: %s\n", remote_argv[i]);
 				rprintf(FERROR, "If arg is a remote file/dir, prefix it with a colon (:).\n");
 				exit_cleanup(RERR_SYNTAX);
 			}
-			remote_argv[i]++;
+			if (*dummy_host && strcmp(dummy_host, shell_machine) != 0) {
+				rprintf(FERROR, "All source args must come from the same machine.\n");
+				exit_cleanup(RERR_SYNTAX);
+			}
+			if (rsync_port != dummy_port) {
+				if (!rsync_port || !dummy_port)
+					rprintf(FERROR, "All source args must use the same hostspec format.\n");
+				else
+					rprintf(FERROR, "All source args must use the same port number.\n");
+				exit_cleanup(RERR_SYNTAX);
+			}
+			remote_argv[i] = arg;
 		}
 		if (argc == 0)
 			list_only |= 1;