[SCM] The rsync repository. - branch master updated
Rsync CVS commit messages
rsync-cvs at lists.samba.org
Mon May 25 05:53:05 UTC 2020
The branch, master has been updated
via 97e8c55e Some minor tweaks & tidying up.
from 739fa967 Change odd-ball map_ptr() to use remainder like the others.
https://git.samba.org/?p=rsync.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 97e8c55ee8aa9e59d0a2f6f92cb9e04dcc426057
Author: Wayne Davison <wayne at opencoder.net>
Date: Sun May 24 22:31:28 2020 -0700
Some minor tweaks & tidying up.
-----------------------------------------------------------------------
Summary of changes:
batch.c | 2 +-
byteorder.h | 2 +-
checksum.c | 12 +++++-------
compat.c | 14 +++-----------
io.c | 2 +-
lib/mdfour.c | 2 +-
6 files changed, 12 insertions(+), 22 deletions(-)
Changeset truncated at 500 lines:
diff --git a/batch.c b/batch.c
index 8915d9e0..77ad4733 100644
--- a/batch.c
+++ b/batch.c
@@ -3,7 +3,7 @@
*
* Copyright (C) 1999 Weiss
* Copyright (C) 2004 Chris Shoemaker
- * Copyright (C) 2004-2019 Wayne Davison
+ * Copyright (C) 2004-2020 Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/byteorder.h b/byteorder.h
index 5684d2de..525eaba0 100644
--- a/byteorder.h
+++ b/byteorder.h
@@ -2,7 +2,7 @@
* Simple byteorder handling.
*
* Copyright (C) 1992-1995 Andrew Tridgell
- * Copyright (C) 2007-2019 Wayne Davison
+ * Copyright (C) 2007-2020 Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/checksum.c b/checksum.c
index fb771402..bde7c35f 100644
--- a/checksum.c
+++ b/checksum.c
@@ -36,9 +36,7 @@
#endif
extern int am_server;
-extern int local_server;
extern int whole_file;
-extern int read_batch;
extern int checksum_seed;
extern int protocol_version;
extern int proper_seed_order;
@@ -111,7 +109,9 @@ static const char *checksum_name(int num)
void parse_checksum_choice(int final_call)
{
- if (!valid_checksums.negotiated_name) {
+ if (valid_checksums.negotiated_name)
+ xfersum_type = checksum_type = valid_checksums.negotiated_num;
+ else {
char *cp = checksum_choice ? strchr(checksum_choice, ',') : NULL;
if (cp) {
xfersum_type = parse_csum_name(checksum_choice, cp - checksum_choice);
@@ -132,10 +132,8 @@ void parse_checksum_choice(int final_call)
checksum_choice ? "chosen" : "protocol-based",
checksum_name(xfersum_type));
} else {
- rprintf(FINFO, "%s chosen transfer checksum: %s\n",
- c_s, checksum_name(xfersum_type));
- rprintf(FINFO, "%s chosen pre-transfer checksum: %s\n",
- c_s, checksum_name(checksum_type));
+ rprintf(FINFO, "%s chosen transfer checksum: %s\n", c_s, checksum_name(xfersum_type));
+ rprintf(FINFO, "%s chosen pre-transfer checksum: %s\n", c_s, checksum_name(checksum_type));
}
}
}
diff --git a/compat.c b/compat.c
index c555732c..4e2fd4b8 100644
--- a/compat.c
+++ b/compat.c
@@ -47,8 +47,6 @@ extern int preserve_xattrs;
extern int xfer_flags_as_varint;
extern int need_messages_from_generator;
extern int delete_mode, delete_before, delete_during, delete_after;
-extern int xfersum_type;
-extern int checksum_type;
extern int do_compression;
extern char *shell_cmd;
extern char *partial_dir;
@@ -256,7 +254,7 @@ static int parse_nni_str(struct name_num_obj *nno, const char *from, char *tobuf
struct name_num_item *nni = get_nni_by_name(nno, tok, to - tok);
if (nni && !nno->saw[nni->num]) {
nno->saw[nni->num] = ++cnt;
- if (nni->main_name && *nni->main_name) {
+ if (nni->main_name) {
to = tok + strlcpy(tok, nni->main_name, tobuf_len - (tok - tobuf));
if (to - tobuf >= tobuf_len) {
to = tok - 1;
@@ -294,7 +292,7 @@ static void recv_negotiate_str(int f_in, struct name_num_obj *nno, char *tmpbuf,
if (len < 0)
len = read_vstring(f_in, tmpbuf, MAX_NSTR_STRLEN);
- if (DEBUG_GTE(NSTR, am_server ? 4 : 2)) {
+ if (DEBUG_GTE(NSTR, am_server ? 3 : 2)) {
if (am_server)
rprintf(FINFO, "Client %s list (on server): %s\n", nno->type, tmpbuf);
else
@@ -368,7 +366,7 @@ static void send_negotiate_str(int f_out, struct name_num_obj *nno, const char *
}
}
- if (DEBUG_GTE(NSTR, am_server ? 4 : 2)) {
+ if (DEBUG_GTE(NSTR, am_server ? 3 : 2)) {
if (am_server)
rprintf(FINFO, "Server %s list (on server): %s\n", nno->type, tmpbuf);
else
@@ -401,17 +399,11 @@ static void negotiate_the_strings(int f_in, int f_out)
char tmpbuf[MAX_NSTR_STRLEN];
recv_negotiate_str(f_in, &valid_checksums, tmpbuf, -1);
}
- if (valid_checksums.negotiated_name)
- xfersum_type = checksum_type = valid_checksums.negotiated_num;
if (valid_compressions.saw) {
char tmpbuf[MAX_NSTR_STRLEN];
recv_negotiate_str(f_in, &valid_compressions, tmpbuf, -1);
}
-#if 0
- if (valid_compressions.negotiated_name)
- compress_type = valid_checksums.negotiated_num;
-#endif
}
void setup_protocol(int f_out,int f_in)
diff --git a/io.c b/io.c
index 021330fb..ecab460a 100644
--- a/io.c
+++ b/io.c
@@ -4,7 +4,7 @@
* Copyright (C) 1996-2001 Andrew Tridgell
* Copyright (C) 1996 Paul Mackerras
* Copyright (C) 2001, 2002 Martin Pool <mbp at samba.org>
- * Copyright (C) 2003-2019 Wayne Davison
+ * Copyright (C) 2003-2020 Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/lib/mdfour.c b/lib/mdfour.c
index 70a8ba34..6203658d 100644
--- a/lib/mdfour.c
+++ b/lib/mdfour.c
@@ -4,7 +4,7 @@
* An implementation of MD4 designed for use in the SMB authentication protocol.
*
* Copyright (C) 1997-1998 Andrew Tridgell
- * Copyright (C) 2005-2019 Wayne Davison
+ * Copyright (C) 2005-2020 Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
--
The rsync repository.
More information about the rsync-cvs
mailing list