Attachment 3403 Details for Bug 5607 – Make --protocol=29 option disable sending of -e... to the server

[patch] Make --protocol=29 option disable sending of -e... to the server

e-option.patch (text/plain), 1.28 KB, created by Wayne Davison on 2008-07-10 17:13:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Wayne Davison

Created: 2008-07-10 17:13:29 UTC

Size: 1.28 KB

patch

obsolete

>--- a/options.c
>+++ b/options.c
>@@ -1838,22 +1838,28 @@ void server_options(char **args, int *argc_p)
> 	if (do_compression)
> 		argstr[x++] = 'z';
> 
>-	/* We make use of the -e option to let the server know about any
>-	 * pre-release protocol version && some behavior flags. */
>-	argstr[x++] = 'e';
>+	set_allow_inc_recurse();
>+
>+	/* Checking the pre-negotiated value allows --protocol=29 override. */
>+	if (protocol_version >= 30) {
>+		/* We make use of the -e option to let the server know about
>+		 * any pre-release protocol version && some behavior flags. */
>+		argstr[x++] = 'e';
> #if SUBPROTOCOL_VERSION != 0
>-	if (protocol_version == PROTOCOL_VERSION) {
>-		x += snprintf(argstr+x, sizeof argstr - x,
>-			      "%d.%d", PROTOCOL_VERSION, SUBPROTOCOL_VERSION);
>-	} else
>+		if (protocol_version == PROTOCOL_VERSION) {
>+			x += snprintf(argstr+x, sizeof argstr - x,
>+				      "%d.%d",
>+				      PROTOCOL_VERSION, SUBPROTOCOL_VERSION);
>+		} else
> #endif
>-		argstr[x++] = '.';
>-	set_allow_inc_recurse();
>-	if (allow_inc_recurse)
>-		argstr[x++] = 'i';
>+			argstr[x++] = '.';
>+		if (allow_inc_recurse)
>+			argstr[x++] = 'i';
> #if defined HAVE_LUTIMES && defined HAVE_UTIMES
>-	argstr[x++] = 'L';
>+		argstr[x++] = 'L';
> #endif
>+	}
>+
> 	argstr[x] = '\0';
> 
> 	if (x > (int)sizeof argstr) { /* Not possible... */

Actions: View

Attachments on bug 5607: 3403