From: Wayne Davison <wayne@opencoder.net>
Date: Sun, 28 Jun 2020 04:19:52 +0000 (-0700)
Subject: Some misc cleanup
X-Git-Tag: v3.2.2pre1~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=af57b55bdbcc832bdd7da28febe2c9a5c882c9cb;p=thirdparty%2Frsync.git

Some misc cleanup

Remove some extraneous vars, update some years, add an  rrsync opt, &
ensure some less options are set right when running release-rsync.
---

diff --git a/batch.c b/batch.c
index 582c8c16..a9711c56 100644
--- a/batch.c
+++ b/batch.c
@@ -38,13 +38,10 @@ extern int do_compression;
 extern int inplace;
 extern int append_mode;
 extern int write_batch;
-extern int xfersum_type;
 extern int protocol_version;
 extern int raw_argc, cooked_argc;
 extern char **raw_argv, **cooked_argv;
 extern char *batch_name;
-extern const char *checksum_choice;
-extern const char *compress_choice;
 #ifdef ICONV_OPTION
 extern char *iconv_opt;
 #endif
diff --git a/getgroups.c b/getgroups.c
index 1ccbc781..8a37ed0b 100644
--- a/getgroups.c
+++ b/getgroups.c
@@ -3,7 +3,7 @@
  * `id -G` on Linux, but it's too hard to find a portable equivalent.
  *
  * Copyright (C) 2002 Martin Pool
- * 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 version 3 as
diff --git a/ifuncs.h b/ifuncs.h
index 099fd07d..b9490588 100644
--- a/ifuncs.h
+++ b/ifuncs.h
@@ -1,6 +1,6 @@
 /* Inline functions for rsync.
  *
- * 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/packaging/release-rsync b/packaging/release-rsync
index 2ae5eb4c..629ee25d 100755
--- a/packaging/release-rsync
+++ b/packaging/release-rsync
@@ -13,6 +13,7 @@ sys.path = ['packaging'] + sys.path
 
 from pkglib import *
 
+os.environ['LESS'] = 'mqeiXR'; # Make sure that -F is turned off and -R is turned on.
 dest = os.environ['HOME'] + '/samba-rsync-ftp'
 ORIGINAL_PATH = os.environ['PATH']
 
diff --git a/support/rrsync b/support/rrsync
index 34e62300..eabec3dc 100644
--- a/support/rrsync
+++ b/support/rrsync
@@ -111,6 +111,7 @@ our %long_opt = (
   'list-only' => 0,
   'log-file' => $only eq 'r' ? -1 : 3,
   'log-format' => 1,
+  'max-alloc' => 1,
   'max-delete' => 1,
   'max-size' => 1,
   'min-size' => 1,
diff --git a/t_stub.c b/t_stub.c
index 5a9bad55..954b86da 100644
--- a/t_stub.c
+++ b/t_stub.c
@@ -33,7 +33,7 @@ int preserve_xattrs = 0;
 int preserve_perms = 0;
 int preserve_executability = 0;
 int open_noatime = 0;
-size_t max_alloc = 1024*1024*1024;
+size_t max_alloc = 1024*1024*1024; /* max_alloc is needed when combined with util2.o */
 char *partial_dir;
 char *module_dir;
 filter_rule_list daemon_filter_list;