X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/58cadc8608fbb2cbc7b74578cd92de4337a4b887..c53217a2b861ff7453cd35fcc35f2e79df419c4d:/options.c

diff --git a/options.c b/options.c
index b8c9f3da..c022ed06 100644
--- a/options.c
+++ b/options.c
@@ -62,7 +62,6 @@ int implied_dirs = 1;
 int numeric_ids = 0;
 int force_delete = 0;
 int io_timeout = 0;
-int io_error = 0;
 int read_only = 0;
 int module_id = -1;
 int am_server = 0;
@@ -162,7 +161,7 @@ static void print_rsync_version(enum logcode f)
 	rprintf(f, "%s  version %s  protocol version %d\n",
 		RSYNC_NAME, RSYNC_VERSION, PROTOCOL_VERSION);
 	rprintf(f,
-		"Copyright (C) 1996-2002 by Andrew Tridgell and others\n");
+		"Copyright (C) 1996-2004 by Andrew Tridgell and others\n");
 	rprintf(f, "<http://rsync.samba.org/>\n");
 	rprintf(f, "Capabilities: %d-bit files, %ssocketpairs, "
 		"%shard links, %ssymlinks, batchfiles, \n",
@@ -657,8 +656,11 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
 			usage(FERROR);
 			exit_cleanup(RERR_SYNTAX);
 		}
-		if (strcmp(files_from, "-") == 0)
+		if (strcmp(files_from, "-") == 0) {
 			filesfrom_fd = 0;
+			if (am_server)
+				remote_filesfrom_file = "-";
+		}
 		else if ((colon = find_colon(files_from)) != 0) {
 			if (am_server) {
 				usage(FERROR);