mirror/rsync
1
0
Fork 0
mirror of https://github.com/RsyncProject/rsync.git synced 2026-04-26 17:20:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

Improved the SUBPROTOCOL_VERSION code a little, and bumped the value

Browse Source 
to 2.
This commit is contained in:
Wayne Davison
2007-04-23 19:54:07 +00:00
parent 486f8cd1ab
commit 2ed790f354
2 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
options.c
View File

@@ -198,7 +198,7 @@ char *bind_address;
static void print_rsync_version(enum logcode f)
{
char buf[32];
char *subprotocol = "";
char const *got_socketpair = "no ";
char const *have_inplace = "no ";
char const *hardlinks = "no ";
@@ -208,18 +208,18 @@ static void print_rsync_version(enum logcode f)
char const *ipv6 = "no ";
STRUCT_STAT *dumstat;
#if SUBPROTOCOL_VERSION != 0
asprintf(&subprotocol, ".PR%d", SUBPROTOCOL_VERSION);
#endif
#ifdef HAVE_SOCKETPAIR
got_socketpair = "";
#endif
#ifdef HAVE_FTRUNCATE
have_inplace = "";
#endif
#ifdef SUPPORT_HARD_LINKS
hardlinks = "";
#endif
#ifdef SUPPORT_ACLS
acls = "";
#endif
@@ -229,17 +229,12 @@ static void print_rsync_version(enum logcode f)
#ifdef SUPPORT_LINKS
links = "";
#endif
#ifdef INET6
ipv6 = "";
#endif
if (SUBPROTOCOL_VERSION)
snprintf(buf, sizeof buf, ".PR%d", SUBPROTOCOL_VERSION);
else
*buf = '\0';
rprintf(f, "%s version %s protocol version %d%s\n",
RSYNC_NAME, RSYNC_VERSION, PROTOCOL_VERSION, buf);
RSYNC_NAME, RSYNC_VERSION, PROTOCOL_VERSION, subprotocol);
rprintf(f, "Copyright (C) 1996-2007 by Andrew Tridgell, Wayne Davison, and others.\n");
rprintf(f, "Web site: http://rsync.samba.org/\n");
rprintf(f, "Capabilities:\n");
@@ -1650,12 +1645,14 @@ void server_options(char **args,int *argc)
argstr[x] = '\0';
#if SUBPROTOCOL_VERSION != 0
/* If we're speaking a pre-release version of a protocol, we tell
* the server about this by (ab)using the -e option. */
if (SUBPROTOCOL_VERSION && protocol_version == PROTOCOL_VERSION) {
if (protocol_version == PROTOCOL_VERSION) {
x += snprintf(argstr+x, sizeof argstr - x,
"e%d.%d", PROTOCOL_VERSION, SUBPROTOCOL_VERSION);
}
#endif
if (x != 1)
args[ac++] = argstr;

2
rsync.h
View File

@@ -86,7 +86,7 @@
/* This is used when working on a new protocol version in CVS, and should
* be a new non-zero value for each CVS change that affects the protocol.
* It must ALWAYS be 0 when the protocol goes final! */
#define SUBPROTOCOL_VERSION 1
#define SUBPROTOCOL_VERSION 2
/* We refuse to interoperate with versions that are not in this range.
* Note that we assume we'll work with later versions: the onus is on