The branch, master has been updated
via 035a13f7 Add a few new opts to rrsync.
via f14adfd7 Some var cleanup; move test-util vars into t_stub.c.
from d218be34 Update a few more copyright years.
https://git.samba.org/?p=rsync.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 035a13f7e483efa47847c5d77a8b0dd30ebd8925
Author: Wayne Davison <wa...@opencoder.net>
Date: Sun Apr 26 14:50:40 2020 -0700
Add a few new opts to rrsync.
commit f14adfd75e72d3bf5833eebe85f3ed9c1b4cb477
Author: Wayne Davison <wa...@opencoder.net>
Date: Sun Apr 26 14:05:27 2020 -0700
Some var cleanup; move test-util vars into t_stub.c.
-----------------------------------------------------------------------
Summary of changes:
Makefile.in | 6 +++---
log.c | 1 -
support/rrsync | 4 +++-
t_stub.c | 3 ++-
t_unsafe.c | 3 ---
tls.c | 5 -----
trimslash.c | 5 -----
7 files changed, 8 insertions(+), 19 deletions(-)
Changeset truncated at 500 lines:
diff --git a/Makefile.in b/Makefile.in
index 536be420..59649562 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -46,7 +46,7 @@ popt_OBJS=popt/findme.o popt/popt.o popt/poptconfig.o \
popt/popthelp.o popt/poptparse.o
OBJS=$(OBJS1) $(OBJS2) $(OBJS3) $(DAEMON_OBJ) $(LIBOBJ) @BUILD_ZLIB@
@BUILD_POPT@
-TLS_OBJ = tls.o syscall.o lib/compat.o lib/snprintf.o lib/permstring.o
lib/sysxattrs.o @BUILD_POPT@
+TLS_OBJ = tls.o syscall.o t_stub.o lib/compat.o lib/snprintf.o
lib/permstring.o lib/sysxattrs.o @BUILD_POPT@
# Programs we must have to run the test cases
CHECK_PROGS = rsync$(EXEEXT) tls$(EXEEXT) getgroups$(EXEEXT) getfsdev$(EXEEXT)
\
@@ -127,7 +127,7 @@ getgroups$(EXEEXT): getgroups.o
getfsdev$(EXEEXT): getfsdev.o
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ getfsdev.o $(LIBS)
-TRIMSLASH_OBJ = trimslash.o syscall.o lib/compat.o lib/snprintf.o
+TRIMSLASH_OBJ = trimslash.o syscall.o t_stub.o lib/compat.o lib/snprintf.o
trimslash$(EXEEXT): $(TRIMSLASH_OBJ)
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(TRIMSLASH_OBJ) $(LIBS)
@@ -283,7 +283,7 @@ check29: all $(CHECK_PROGS) $(CHECK_SYMLINKS)
check30: all $(CHECK_PROGS) $(CHECK_SYMLINKS)
rsync_bin=`pwd`/rsync$(EXEEXT) $(srcdir)/runtests.sh --protocol=30
-wildtest.o: wildtest.c lib/wildmatch.c rsync.h config.h
+wildtest.o: wildtest.c t_stub.o lib/wildmatch.c rsync.h config.h
wildtest$(EXEEXT): wildtest.o lib/compat.o lib/snprintf.o @BUILD_POPT@
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ wildtest.o lib/compat.o lib/snprintf.o
@BUILD_POPT@ $(LIBS)
diff --git a/log.c b/log.c
index ae6214da..059df046 100644
--- a/log.c
+++ b/log.c
@@ -47,7 +47,6 @@ extern int64 total_data_written;
extern int64 total_data_read;
extern mode_t orig_umask;
extern char *auth_user;
-extern char *checksum_choice;
extern char *stdout_format;
extern char *logfile_format;
extern char *logfile_name;
diff --git a/support/rrsync b/support/rrsync
index 3bbca2e0..a538fbba 100644
--- a/support/rrsync
+++ b/support/rrsync
@@ -62,7 +62,7 @@ die "$0 reading from write-only server not allowed\n" if
$only eq 'w' && $am_sen
# To disable a short-named option, add its letter to this string:
our $short_disabled = 's';
-our $short_no_arg = 'ACDEHIJKLORSWXbcdgklmnoprstuvxyz'; # DO NOT REMOVE ANY
+our $short_no_arg = 'ACDEHIJKLORSUWXbcdgklmnoprstuvxyz'; # DO NOT REMOVE ANY
our $short_with_num = '@B'; # DO NOT REMOVE ANY
# To disable a long-named option, change its value to a -1. The values mean:
@@ -122,6 +122,7 @@ our %long_opt = (
'numeric-ids' => 0,
'one-file-system' => 0,
'only-write-batch' => 1,
+ 'open-noatime' => 0,
'owner' => 0,
'partial' => 0,
'partial-dir' => 2,
@@ -144,6 +145,7 @@ our %long_opt = (
'times' => 0,
'use-qsort' => 0,
'usermap' => 1,
+ 'write-devices' => -1,
);
### END of options data produced by the cull_options script. ###
diff --git a/t_stub.c b/t_stub.c
index 84dd88f4..17baee82 100644
--- a/t_stub.c
+++ b/t_stub.c
@@ -28,9 +28,10 @@ int protect_args = 0;
int module_id = -1;
int relative_paths = 0;
int module_dirlen = 0;
-int preserve_acls = 0;
int preserve_times = 0;
int preserve_xattrs = 0;
+int preserve_perms = 0;
+int preserve_executability = 0;
int open_noatime = 0;
char *partial_dir;
char *module_dir;
diff --git a/t_unsafe.c b/t_unsafe.c
index 4ab6850a..0071bf60 100644
--- a/t_unsafe.c
+++ b/t_unsafe.c
@@ -28,9 +28,6 @@ int am_root = 0;
int am_sender = 1;
int read_only = 0;
int list_only = 0;
-int human_readable = 0;
-int preserve_perms = 0;
-int preserve_executability = 0;
short info_levels[COUNT_INFO], debug_levels[COUNT_DEBUG];
int
diff --git a/tls.c b/tls.c
index ac402eba..7d48dab8 100644
--- a/tls.c
+++ b/tls.c
@@ -49,11 +49,6 @@ int list_only = 0;
int link_times = 0;
int link_owner = 0;
int nsec_times = 0;
-int preserve_perms = 0;
-int preserve_executability = 0;
-int preallocate_files = 0;
-int open_noatime = 0;
-int inplace = 0;
#ifdef SUPPORT_XATTRS
diff --git a/trimslash.c b/trimslash.c
index 60a746cb..1ec928ca 100644
--- a/trimslash.c
+++ b/trimslash.c
@@ -26,11 +26,6 @@ int am_root = 0;
int am_sender = 1;
int read_only = 1;
int list_only = 0;
-int preserve_perms = 0;
-int preserve_executability = 0;
-int preallocate_files = 0;
-int open_noatime = 0;
-int inplace = 0;
int
main(int argc, char **argv)
--
The rsync repository.
_______________________________________________
rsync-cvs mailing list
rsync-cvs@lists.samba.org
https://lists.samba.org/mailman/listinfo/rsync-cvs
