rsync - Mar 2004 - --from-files broken with remote sources

Using rsync 2.6.0 on both ends, I ran

    rsync -v --files-from files andrew@pimlott.net: .

and got an error from the remote rsync.  The reason is that the remote
rsync is run as

    rsync --server --sender -vvR --files-from=- --from0 .

which conflicts with a check in options.c that rsync must have two
non-option arguments when --files-from is used.  I tried again with the
latest nightly (rsync-HEAD-20040329-1635GMT.tar.gz) and had the same
problem.  In this version, the check is at line 725.  If I add "&&
!
am_server", it works, but I don't know if that is the correct fix.

Andrew

On Mon, Mar 29, 2004 at 03:51:18PM -0500, Andrew Pimlott
wrote:
>     rsync -v --files-from files andrew@pimlott.net: .
> and got an error from the remote rsync.
You can work around the problem by specifying a directory after the
colon ('.' would work).

This patch should fix things:

--- options.c	27 Mar 2004 19:42:13 -0000	1.141
+++ options.c	29 Mar 2004 23:42:37 -0000
@@ -720,7 +720,7 @@ int parse_arguments(int *argc, const cha
 
 	if (files_from) {
 		char *colon;
-		if (*argc != 2) {
+		if (*argc != 2 && (!am_server || !am_sender || *argc != 1)) {
 			usage(FERROR);
 			exit_cleanup(RERR_SYNTAX);
 		}

..wayne..