git.samba.org
/
rsync-patches.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
db01c27
)
The patches for 3.2.4pre4.
author
Wayne Davison
<wayne@opencoder.net>
Sun, 27 Mar 2022 22:00:03 +0000
(15:00 -0700)
committer
Wayne Davison
<wayne@opencoder.net>
Sun, 27 Mar 2022 22:00:03 +0000
(15:00 -0700)
28 files changed:
backup-deleted.diff
patch
|
blob
|
history
backup-dir-dels.diff
patch
|
blob
|
history
catch_crash_signals.diff
patch
|
blob
|
history
checksum-reading.diff
patch
|
blob
|
history
checksum-updating.diff
patch
|
blob
|
history
checksum-xattr.diff
patch
|
blob
|
history
clone-dest.diff
patch
|
blob
|
history
congestion.diff
patch
|
blob
|
history
date-only.diff
patch
|
blob
|
history
db.diff
patch
|
blob
|
history
detect-renamed-lax.diff
patch
|
blob
|
history
detect-renamed.diff
patch
|
blob
|
history
direct-io.diff
patch
|
blob
|
history
downdate.diff
patch
|
blob
|
history
fileflags.diff
patch
|
blob
|
history
filter-attribute-mods.diff
patch
|
blob
|
history
ignore-case.diff
patch
|
blob
|
history
kerberos.diff
patch
|
blob
|
history
link-by-hash.diff
patch
|
blob
|
history
omit-dir-changes.diff
patch
|
blob
|
history
slow-down.diff
patch
|
blob
|
history
slp.diff
patch
|
blob
|
history
soften-links.diff
patch
|
blob
|
history
source-backup.diff
patch
|
blob
|
history
source-filter_dest-filter.diff
patch
|
blob
|
history
sparse-block.diff
patch
|
blob
|
history
transliterate.diff
patch
|
blob
|
history
xxh3-safety-check.diff
patch
|
blob
|
history
diff --git
a/backup-deleted.diff
b/backup-deleted.diff
index 2556d92509b8268bbe01a23d1dd72d25d2944751..6824467f6d9fc61680bc880cf6147bc0e763cd1b 100644
(file)
--- a/
backup-deleted.diff
+++ b/
backup-deleted.diff
@@
-7,11
+7,11
@@
To use this patch, run these commands for a successful build:
./configure (optional if already run)
make
./configure (optional if already run)
make
-based-on:
55b2a06812e39f15f52e92b979600cb82be210cb
+based-on:
d821e4cbfbc66848cdf91a336af26fdb89dd9a8f
diff --git a/generator.c b/generator.c
--- a/generator.c
+++ b/generator.c
diff --git a/generator.c b/generator.c
--- a/generator.c
+++ b/generator.c
-@@ -18
37,7 +1837
,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
+@@ -18
43,7 +1843
,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
goto notify_others;
if (read_batch || whole_file) {
goto notify_others;
if (read_batch || whole_file) {
@@
-20,16
+20,16
@@
diff --git a/generator.c b/generator.c
if (!(backupptr = get_backup_name(fname)))
goto cleanup;
if (!(back_file = make_file(fname, NULL, NULL, 0, NO_FILTERS)))
if (!(backupptr = get_backup_name(fname)))
goto cleanup;
if (!(back_file = make_file(fname, NULL, NULL, 0, NO_FILTERS)))
-@@ -187
3,7 +1873
,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
+@@ -187
9,7 +1879
,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
goto notify_others;
}
- if (inplace && make_backups > 0 && fnamecmp_type == FNAMECMP_FNAME) {
+ if (inplace && make_backups > 1 && fnamecmp_type == FNAMECMP_FNAME) {
if (!(backupptr = get_backup_name(fname))) {
goto notify_others;
}
- if (inplace && make_backups > 0 && fnamecmp_type == FNAMECMP_FNAME) {
+ if (inplace && make_backups > 1 && fnamecmp_type == FNAMECMP_FNAME) {
if (!(backupptr = get_backup_name(fname))) {
- close(fd);
goto cleanup;
goto cleanup;
-@@ -1997,7 +1997,7 @@ int atomic_create(struct file_struct *file, char *fname, const char *slnk, const
+ }
+@@ -1999,7 +1999,7 @@ int atomic_create(struct file_struct *file, char *fname, const char *slnk, const
skip_atomic = 0;
if (del_for_flag) {
skip_atomic = 0;
if (del_for_flag) {
@@
-41,7
+41,7
@@
diff --git a/generator.c b/generator.c
diff --git a/options.c b/options.c
--- a/options.c
+++ b/options.c
diff --git a/options.c b/options.c
--- a/options.c
+++ b/options.c
-@@ -77
0,7 +770
,8 @@ static struct poptOption long_options[] = {
+@@ -77
2,7 +772
,8 @@ static struct poptOption long_options[] = {
{"no-i", 0, POPT_ARG_VAL, &itemize_changes, 0, 0, 0 },
{"bwlimit", 0, POPT_ARG_STRING, &bwlimit_arg, OPT_BWLIMIT, 0, 0 },
{"no-bwlimit", 0, POPT_ARG_VAL, &bwlimit, 0, 0, 0 },
{"no-i", 0, POPT_ARG_VAL, &itemize_changes, 0, 0, 0 },
{"bwlimit", 0, POPT_ARG_STRING, &bwlimit_arg, OPT_BWLIMIT, 0, 0 },
{"no-bwlimit", 0, POPT_ARG_VAL, &bwlimit, 0, 0, 0 },
@@
-51,7
+51,7
@@
diff --git a/options.c b/options.c
{"no-backup", 0, POPT_ARG_VAL, &make_backups, 0, 0, 0 },
{"backup-dir", 0, POPT_ARG_STRING, &backup_dir, 0, 0, 0 },
{"suffix", 0, POPT_ARG_STRING, &backup_suffix, 0, 0, 0 },
{"no-backup", 0, POPT_ARG_VAL, &make_backups, 0, 0, 0 },
{"backup-dir", 0, POPT_ARG_STRING, &backup_dir, 0, 0, 0 },
{"suffix", 0, POPT_ARG_STRING, &backup_suffix, 0, 0, 0 },
-@@ -27
56,6 +2757
,10 @@ void server_options(char **args, int *argc_p)
+@@ -27
60,6 +2761
,10 @@ void server_options(char **args, int *argc_p)
args[ac++] = safe_arg("--compress-choice", compress_choice);
if (am_sender) {
args[ac++] = safe_arg("--compress-choice", compress_choice);
if (am_sender) {
@@
-86,7
+86,7
@@
diff --git a/receiver.c b/receiver.c
diff --git a/rsync.1.md b/rsync.1.md
--- a/rsync.1.md
+++ b/rsync.1.md
diff --git a/rsync.1.md b/rsync.1.md
--- a/rsync.1.md
+++ b/rsync.1.md
-@@ -348,6 +348,7 @@ has its own detailed description later in this man
page.
+@@ -348,6 +348,7 @@ has its own detailed description later in this manpage.
--relative, -R use relative path names
--no-implied-dirs don't send implied dirs with --relative
--backup, -b make backups (see --suffix & --backup-dir)
--relative, -R use relative path names
--no-implied-dirs don't send implied dirs with --relative
--backup, -b make backups (see --suffix & --backup-dir)
@@
-94,7
+94,7
@@
diff --git a/rsync.1.md b/rsync.1.md
--backup-dir=DIR make backups into hierarchy based in DIR
--suffix=SUFFIX backup suffix (default ~ w/o --backup-dir)
--update, -u skip files that are newer on the receiver
--backup-dir=DIR make backups into hierarchy based in DIR
--suffix=SUFFIX backup suffix (default ~ w/o --backup-dir)
--update, -u skip files that are newer on the receiver
-@@ -91
3,6 +914
,13 @@ your home directory (remove the '=' for that).
+@@ -91
4,6 +915
,13 @@ your home directory (remove the '=' for that).
rules specify a trailing inclusion/exclusion of `*`, the auto-added rule
would never be reached).
rules specify a trailing inclusion/exclusion of `*`, the auto-added rule
would never be reached).
diff --git
a/backup-dir-dels.diff
b/backup-dir-dels.diff
index d26905d20e50c27cecb3b9d5baea52e473e45e16..253b50af5c211e8242eb32ef93207a459b967492 100644
(file)
--- a/
backup-dir-dels.diff
+++ b/
backup-dir-dels.diff
@@
-204,7
+204,7
@@
diff --git a/delete.c b/delete.c
diff --git a/options.c b/options.c
--- a/options.c
+++ b/options.c
diff --git a/options.c b/options.c
--- a/options.c
+++ b/options.c
-@@ -16
2,10 +162
,14 @@ int no_detach
+@@ -16
3,10 +163
,14 @@ int no_detach
int write_batch = 0;
int read_batch = 0;
int backup_dir_len = 0;
int write_batch = 0;
int read_batch = 0;
int backup_dir_len = 0;
@@
-219,7
+219,7
@@
diff --git a/options.c b/options.c
char *tmpdir = NULL;
char *partial_dir = NULL;
char *basis_dir[MAX_BASIS_DIRS+1];
char *tmpdir = NULL;
char *partial_dir = NULL;
char *basis_dir[MAX_BASIS_DIRS+1];
-@@ -17
8,7 +182
,9 @@ char *password_file = NULL;
+@@ -17
9,7 +183
,9 @@ char *password_file = NULL;
char *early_input_file = NULL;
char *rsync_path = RSYNC_PATH;
char *backup_dir = NULL;
char *early_input_file = NULL;
char *rsync_path = RSYNC_PATH;
char *backup_dir = NULL;
@@
-229,7
+229,7
@@
diff --git a/options.c b/options.c
char *sockopts = NULL;
char *usermap = NULL;
char *groupmap = NULL;
char *sockopts = NULL;
char *usermap = NULL;
char *groupmap = NULL;
-@@ -77
4,7 +780
,9 @@ static struct poptOption long_options[] = {
+@@ -77
6,7 +782
,9 @@ static struct poptOption long_options[] = {
{"backup-deleted", 0, POPT_ARG_VAL, &make_backups, 1, 0, 0 },
{"no-backup", 0, POPT_ARG_VAL, &make_backups, 0, 0, 0 },
{"backup-dir", 0, POPT_ARG_STRING, &backup_dir, 0, 0, 0 },
{"backup-deleted", 0, POPT_ARG_VAL, &make_backups, 1, 0, 0 },
{"no-backup", 0, POPT_ARG_VAL, &make_backups, 0, 0, 0 },
{"backup-dir", 0, POPT_ARG_STRING, &backup_dir, 0, 0, 0 },
@@
-239,7
+239,7
@@
diff --git a/options.c b/options.c
{"list-only", 0, POPT_ARG_VAL, &list_only, 2, 0, 0 },
{"read-batch", 0, POPT_ARG_STRING, &batch_name, OPT_READ_BATCH, 0, 0 },
{"write-batch", 0, POPT_ARG_STRING, &batch_name, OPT_WRITE_BATCH, 0, 0 },
{"list-only", 0, POPT_ARG_VAL, &list_only, 2, 0, 0 },
{"read-batch", 0, POPT_ARG_STRING, &batch_name, OPT_READ_BATCH, 0, 0 },
{"write-batch", 0, POPT_ARG_STRING, &batch_name, OPT_WRITE_BATCH, 0, 0 },
-@@ -222
4,6 +2232
,8 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+@@ -222
8,6 +2236
,8 @@ int parse_arguments(int *argc_p, const char ***argv_p)
tmpdir = sanitize_path(NULL, tmpdir, NULL, 0, SP_DEFAULT);
if (backup_dir)
backup_dir = sanitize_path(NULL, backup_dir, NULL, 0, SP_DEFAULT);
tmpdir = sanitize_path(NULL, tmpdir, NULL, 0, SP_DEFAULT);
if (backup_dir)
backup_dir = sanitize_path(NULL, backup_dir, NULL, 0, SP_DEFAULT);
@@
-248,7
+248,7
@@
diff --git a/options.c b/options.c
}
if (daemon_filter_list.head && !am_sender) {
filter_rule_list *elp = &daemon_filter_list;
}
if (daemon_filter_list.head && !am_sender) {
filter_rule_list *elp = &daemon_filter_list;
-@@ -224
5,6 +2255
,14 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+@@ -224
9,6 +2259
,14 @@ int parse_arguments(int *argc_p, const char ***argv_p)
if (check_filter(elp, FLOG, dir, 1) < 0)
goto options_rejected;
}
if (check_filter(elp, FLOG, dir, 1) < 0)
goto options_rejected;
}
@@
-263,7
+263,7
@@
diff --git a/options.c b/options.c
}
if (!backup_suffix)
}
if (!backup_suffix)
-@@ -22
56,6 +2274
,20 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+@@ -22
60,6 +2278
,20 @@ int parse_arguments(int *argc_p, const char ***argv_p)
backup_suffix);
return 0;
}
backup_suffix);
return 0;
}
@@
-284,7
+284,7
@@
diff --git a/options.c b/options.c
if (backup_dir) {
size_t len;
make_backups = 1; /* --backup-dir implies --backup */
if (backup_dir) {
size_t len;
make_backups = 1; /* --backup-dir implies --backup */
-@@ -229
2,6 +2324
,34 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+@@ -229
6,6 +2328
,34 @@ int parse_arguments(int *argc_p, const char ***argv_p)
"P *%s", backup_suffix);
parse_filter_str(&filter_list, backup_dir_buf, rule_template(0), 0);
}
"P *%s", backup_suffix);
parse_filter_str(&filter_list, backup_dir_buf, rule_template(0), 0);
}
@@
-319,7
+319,7
@@
diff --git a/options.c b/options.c
if (make_backups && !backup_dir)
omit_dir_times = -1; /* Implied, so avoid -O to sender. */
if (make_backups && !backup_dir)
omit_dir_times = -1; /* Implied, so avoid -O to sender. */
-@@ -274
1,11 +2801
,20 @@ void server_options(char **args, int *argc_p)
+@@ -274
5,11 +2805
,20 @@ void server_options(char **args, int *argc_p)
args[ac++] = "--backup-dir";
args[ac++] = safe_arg("", backup_dir);
}
args[ac++] = "--backup-dir";
args[ac++] = safe_arg("", backup_dir);
}
@@
-343,7
+343,7
@@
diff --git a/options.c b/options.c
diff --git a/rsync.1.md b/rsync.1.md
--- a/rsync.1.md
+++ b/rsync.1.md
diff --git a/rsync.1.md b/rsync.1.md
--- a/rsync.1.md
+++ b/rsync.1.md
-@@ -350,7 +350,9 @@ has its own detailed description later in this man
page.
+@@ -350,7 +350,9 @@ has its own detailed description later in this manpage.
--backup, -b make backups (see --suffix & --backup-dir)
--backup-deleted make backups only of deleted files
--backup-dir=DIR make backups into hierarchy based in DIR
--backup, -b make backups (see --suffix & --backup-dir)
--backup-deleted make backups only of deleted files
--backup-dir=DIR make backups into hierarchy based in DIR
@@
-353,7
+353,7
@@
diff --git a/rsync.1.md b/rsync.1.md
--update, -u skip files that are newer on the receiver
--inplace update destination files in-place
--append append data onto shorter files
--update, -u skip files that are newer on the receiver
--inplace update destination files in-place
--append append data onto shorter files
-@@ -93
5,6 +937
,11 @@ your home directory (remove the '=' for that).
+@@ -93
6,6 +938
,11 @@ your home directory (remove the '=' for that).
daemon is the receiver, the backup dir cannot go outside the module's path
hierarchy, so take extra care not to delete it or copy into it.
daemon is the receiver, the backup dir cannot go outside the module's path
hierarchy, so take extra care not to delete it or copy into it.
diff --git
a/catch_crash_signals.diff
b/catch_crash_signals.diff
index 65b42e2e0052a92dda2c93cb8e7001cbeab1eec9..24ec9237662bd97d2229803de104e44ce33079fe 100644
(file)
--- a/
catch_crash_signals.diff
+++ b/
catch_crash_signals.diff
@@
-25,7
+25,7
@@
To use this patch, run these commands for a successful build:
./configure (optional if already run)
make
./configure (optional if already run)
make
-based-on:
55b2a06812e39f15f52e92b979600cb82be210cb
+based-on:
d821e4cbfbc66848cdf91a336af26fdb89dd9a8f
diff --git a/errcode.h b/errcode.h
--- a/errcode.h
+++ b/errcode.h
diff --git a/errcode.h b/errcode.h
--- a/errcode.h
+++ b/errcode.h
diff --git
a/checksum-reading.diff
b/checksum-reading.diff
index 6b5a0fb924814c69656bc37faf375571a66d97a8..9f7b80ad69a01b373d3d6bd376e7b3c889448a21 100644
(file)
--- a/
checksum-reading.diff
+++ b/
checksum-reading.diff
@@
-16,7
+16,7
@@
To use this patch, run these commands for a successful build:
./configure (optional if already run)
make
./configure (optional if already run)
make
-based-on:
55b2a06812e39f15f52e92b979600cb82be210cb
+based-on:
d821e4cbfbc66848cdf91a336af26fdb89dd9a8f
diff --git a/clientserver.c b/clientserver.c
--- a/clientserver.c
+++ b/clientserver.c
diff --git a/clientserver.c b/clientserver.c
--- a/clientserver.c
+++ b/clientserver.c
@@
-69,7
+69,7
@@
diff --git a/flist.c b/flist.c
extern int checksum_type;
extern int module_id;
extern int ignore_errors;
extern int checksum_type;
extern int module_id;
extern int ignore_errors;
-@@ -6
2,6 +64
,7 @@ extern int implied_dirs;
+@@ -6
3,6 +65
,7 @@ extern int implied_dirs;
extern int ignore_perishable;
extern int non_perishable_cnt;
extern int prune_empty_dirs;
extern int ignore_perishable;
extern int non_perishable_cnt;
extern int prune_empty_dirs;
@@
-77,7
+77,7
@@
diff --git a/flist.c b/flist.c
extern int copy_links;
extern int copy_unsafe_links;
extern int protocol_version;
extern int copy_links;
extern int copy_unsafe_links;
extern int protocol_version;
-@@ -7
3,6 +76
,7 @@ extern int sender_symlink_iconv;
+@@ -7
4,6 +77
,7 @@ extern int sender_symlink_iconv;
extern int output_needs_newline;
extern int sender_keeps_checksum;
extern int unsort_ndx;
extern int output_needs_newline;
extern int sender_keeps_checksum;
extern int unsort_ndx;
@@
-85,7
+85,7
@@
diff --git a/flist.c b/flist.c
extern uid_t our_uid;
extern struct stats stats;
extern char *filesfrom_host;
extern uid_t our_uid;
extern struct stats stats;
extern char *filesfrom_host;
-@@ -9
0,6 +94
,20 @@ extern int filesfrom_convert;
+@@ -9
1,6 +95
,20 @@ extern int filesfrom_convert;
extern iconv_t ic_send, ic_recv;
#endif
extern iconv_t ic_send, ic_recv;
#endif
@@
-106,7
+106,7
@@
diff --git a/flist.c b/flist.c
#define PTR_SIZE (sizeof (struct file_struct *))
int io_error;
#define PTR_SIZE (sizeof (struct file_struct *))
int io_error;
-@@ -13
4,8 +152
,12 @@ static char empty_sum[MAX_DIGEST_LEN];
+@@ -13
5,8 +153
,12 @@ static char empty_sum[MAX_DIGEST_LEN];
static int flist_count_offset; /* for --delete --progress */
static int show_filelist_progress;
static int flist_count_offset; /* for --delete --progress */
static int show_filelist_progress;
@@
-120,7
+120,7
@@
diff --git a/flist.c b/flist.c
static void output_flist(struct file_list *flist);
void init_flist(void)
static void output_flist(struct file_list *flist);
void init_flist(void)
-@@ -32
6,6 +348
,235 @@ static void flist_done_allocating(struct file_list *flist)
+@@ -32
7,6 +349
,235 @@ static void flist_done_allocating(struct file_list *flist)
flist->pool_boundary = ptr;
}
flist->pool_boundary = ptr;
}
@@
-356,7
+356,7
@@
diff --git a/flist.c b/flist.c
/* Call this with EITHER (1) "file, NULL, 0" to chdir() to the file's
* F_PATHNAME(), or (2) "NULL, dir, dirlen" to chdir() to the supplied dir,
* with dir == NULL taken to be the starting directory, and dirlen < 0
/* Call this with EITHER (1) "file, NULL, 0" to chdir() to the file's
* F_PATHNAME(), or (2) "NULL, dir, dirlen" to chdir() to the supplied dir,
* with dir == NULL taken to be the starting directory, and dirlen < 0
-@@ -12
03,7 +1454
,7 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
+@@ -12
16,7 +1467
,7 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
STRUCT_STAT *stp, int flags, int filter_level)
{
static char *lastdir;
STRUCT_STAT *stp, int flags, int filter_level)
{
static char *lastdir;
@@
-365,7
+365,7
@@
diff --git a/flist.c b/flist.c
struct file_struct *file;
char thisname[MAXPATHLEN];
char linkname[MAXPATHLEN];
struct file_struct *file;
char thisname[MAXPATHLEN];
char linkname[MAXPATHLEN];
-@@ -13
49,9 +1600
,16 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
+@@ -13
62,9 +1613
,16 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
memcpy(lastdir, thisname, len);
lastdir[len] = '\0';
lastdir_len = len;
memcpy(lastdir, thisname, len);
lastdir[len] = '\0';
lastdir_len = len;
@@
-383,7
+383,7
@@
diff --git a/flist.c b/flist.c
basename_len = strlen(basename) + 1; /* count the '\0' */
#ifdef SUPPORT_LINKS
basename_len = strlen(basename) + 1; /* count the '\0' */
#ifdef SUPPORT_LINKS
-@@ -13
69,11 +1627
,8 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
+@@ -13
94,11 +1652
,8 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
extra_len += EXTRA_LEN;
#endif
extra_len += EXTRA_LEN;
#endif
@@
-397,7
+397,7
@@
diff --git a/flist.c b/flist.c
#if EXTRA_ROUNDING > 0
if (extra_len & (EXTRA_ROUNDING * EXTRA_LEN))
#if EXTRA_ROUNDING > 0
if (extra_len & (EXTRA_ROUNDING * EXTRA_LEN))
-@@ -14
62,8 +1717
,14 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
+@@ -14
87,8 +1742
,14 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
return NULL;
}
return NULL;
}
@@
-414,7
+414,7
@@
diff --git a/flist.c b/flist.c
if (unsort_ndx)
F_NDX(file) = stats.num_dirs;
if (unsort_ndx)
F_NDX(file) = stats.num_dirs;
-@@ -2
680,7 +2941
,7 @@ struct file_list *recv_file_list(int f, int dir_ndx)
+@@ -2
705,7 +2966
,7 @@ struct file_list *recv_file_list(int f, int dir_ndx)
/* The --relative option sends paths with a leading slash, so we need
* to specify the strip_root option here. We rejected leading slashes
* for a non-relative transfer in recv_file_entry(). */
/* The --relative option sends paths with a leading slash, so we need
* to specify the strip_root option here. We rejected leading slashes
* for a non-relative transfer in recv_file_entry(). */
@@
-423,7
+423,7
@@
diff --git a/flist.c b/flist.c
if (protocol_version < 30) {
/* Recv the io_error flag */
if (protocol_version < 30) {
/* Recv the io_error flag */
-@@ -29
25,7 +3186
,7 @@ void flist_free(struct file_list *flist)
+@@ -29
50,7 +3211
,7 @@ void flist_free(struct file_list *flist)
/* This routine ensures we don't have any duplicate names in our file list.
* duplicate names can cause corruption because of the pipelining. */
/* This routine ensures we don't have any duplicate names in our file list.
* duplicate names can cause corruption because of the pipelining. */
@@
-432,7
+432,7
@@
diff --git a/flist.c b/flist.c
{
char fbuf[MAXPATHLEN];
int i, prev_i;
{
char fbuf[MAXPATHLEN];
int i, prev_i;
-@@ -
2976,7 +3237
,7 @@ static void flist_sort_and_clean(struct file_list *flist, int strip_root)
+@@ -
3001,7 +3262
,7 @@ static void flist_sort_and_clean(struct file_list *flist, int strip_root)
/* If one is a dir and the other is not, we want to
* keep the dir because it might have contents in the
* list. Otherwise keep the first one. */
/* If one is a dir and the other is not, we want to
* keep the dir because it might have contents in the
* list. Otherwise keep the first one. */
@@
-441,7
+441,7
@@
diff --git a/flist.c b/flist.c
struct file_struct *fp = flist->sorted[j];
if (!S_ISDIR(fp->mode))
keep = i, drop = j;
struct file_struct *fp = flist->sorted[j];
if (!S_ISDIR(fp->mode))
keep = i, drop = j;
-@@ -
2992,8 +3253
,8 @@ static void flist_sort_and_clean(struct file_list *flist, int strip_root)
+@@ -
3017,8 +3278
,8 @@ static void flist_sort_and_clean(struct file_list *flist, int strip_root)
} else
keep = j, drop = i;
} else
keep = j, drop = i;
@@
-452,7
+452,7
@@
diff --git a/flist.c b/flist.c
rprintf(FINFO,
"removing duplicate name %s from file list (%d)\n",
f_name(file, fbuf), drop + flist->ndx_start);
rprintf(FINFO,
"removing duplicate name %s from file list (%d)\n",
f_name(file, fbuf), drop + flist->ndx_start);
-@@ -30
15,7 +3276
,7 @@ static void flist_sort_and_clean(struct file_list *flist, int strip_root)
+@@ -30
40,7 +3301
,7 @@ static void flist_sort_and_clean(struct file_list *flist, int strip_root)
}
flist->high = prev_i;
}
flist->high = prev_i;
@@
-607,7
+607,7
@@
diff --git a/generator.c b/generator.c
/* Sets fnamecmp_type to FNAMECMP_FUZZY or above. */
fuzzy_file = find_fuzzy(file, fuzzy_dirlist, &fnamecmp_type);
if (fuzzy_file) {
/* Sets fnamecmp_type to FNAMECMP_FUZZY or above. */
fuzzy_file = find_fuzzy(file, fuzzy_dirlist, &fnamecmp_type);
if (fuzzy_file) {
-@@ -1
797,7 +1804
,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
+@@ -1
803,7 +1810
,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
;
else if (fnamecmp_type >= FNAMECMP_FUZZY)
;
;
else if (fnamecmp_type >= FNAMECMP_FUZZY)
;
@@
-648,7
+648,7
@@
diff --git a/loadparm.c b/loadparm.c
diff --git a/options.c b/options.c
--- a/options.c
+++ b/options.c
diff --git a/options.c b/options.c
--- a/options.c
+++ b/options.c
-@@ -12
2,6 +122
,7 @@ size_t bwlimit_writemax = 0;
+@@ -12
3,6 +123
,7 @@ size_t bwlimit_writemax = 0;
int ignore_existing = 0;
int ignore_non_existing = 0;
int need_messages_from_generator = 0;
int ignore_existing = 0;
int ignore_non_existing = 0;
int need_messages_from_generator = 0;
@@
-656,7
+656,7
@@
diff --git a/options.c b/options.c
int max_delete = INT_MIN;
OFF_T max_size = -1;
OFF_T min_size = -1;
int max_delete = INT_MIN;
OFF_T max_size = -1;
OFF_T min_size = -1;
-@@ -57
7,7 +578
,7 @@ enum {OPT_SERVER = 1000, OPT_DAEMON, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM,
+@@ -57
8,7 +579
,7 @@ enum {OPT_SERVER = 1000, OPT_DAEMON, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM,
OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW, OPT_MIN_SIZE, OPT_CHMOD,
OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_ONLY_WRITE_BATCH, OPT_MAX_SIZE,
OPT_NO_D, OPT_APPEND, OPT_NO_ICONV, OPT_INFO, OPT_DEBUG, OPT_BLOCK_SIZE,
OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW, OPT_MIN_SIZE, OPT_CHMOD,
OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_ONLY_WRITE_BATCH, OPT_MAX_SIZE,
OPT_NO_D, OPT_APPEND, OPT_NO_ICONV, OPT_INFO, OPT_DEBUG, OPT_BLOCK_SIZE,
@@
-665,7
+665,7
@@
diff --git a/options.c b/options.c
OPT_OLD_COMPRESS, OPT_NEW_COMPRESS, OPT_NO_COMPRESS, OPT_OLD_ARGS,
OPT_STOP_AFTER, OPT_STOP_AT,
OPT_REFUSED_BASE = 9000};
OPT_OLD_COMPRESS, OPT_NEW_COMPRESS, OPT_NO_COMPRESS, OPT_OLD_ARGS,
OPT_STOP_AFTER, OPT_STOP_AT,
OPT_REFUSED_BASE = 9000};
-@@ -73
3,6 +734
,7 @@ static struct poptOption long_options[] = {
+@@ -73
5,6 +736
,7 @@ static struct poptOption long_options[] = {
{"no-c", 0, POPT_ARG_VAL, &always_checksum, 0, 0, 0 },
{"checksum-choice", 0, POPT_ARG_STRING, &checksum_choice, 0, 0, 0 },
{"cc", 0, POPT_ARG_STRING, &checksum_choice, 0, 0, 0 },
{"no-c", 0, POPT_ARG_VAL, &always_checksum, 0, 0, 0 },
{"checksum-choice", 0, POPT_ARG_STRING, &checksum_choice, 0, 0, 0 },
{"cc", 0, POPT_ARG_STRING, &checksum_choice, 0, 0, 0 },
@@
-673,7
+673,7
@@
diff --git a/options.c b/options.c
{"block-size", 'B', POPT_ARG_STRING, 0, OPT_BLOCK_SIZE, 0, 0 },
{"compare-dest", 0, POPT_ARG_STRING, 0, OPT_COMPARE_DEST, 0, 0 },
{"copy-dest", 0, POPT_ARG_STRING, 0, OPT_COPY_DEST, 0, 0 },
{"block-size", 'B', POPT_ARG_STRING, 0, OPT_BLOCK_SIZE, 0, 0 },
{"compare-dest", 0, POPT_ARG_STRING, 0, OPT_COMPARE_DEST, 0, 0 },
{"copy-dest", 0, POPT_ARG_STRING, 0, OPT_COPY_DEST, 0, 0 },
-@@ -17
36,6 +1738
,23 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+@@ -17
40,6 +1742
,23 @@ int parse_arguments(int *argc_p, const char ***argv_p)
}
break;
}
break;
@@
-697,7
+697,7
@@
diff --git a/options.c b/options.c
case OPT_INFO:
arg = poptGetOptArg(pc);
parse_output_words(info_words, info_levels, arg, USER_PRIORITY);
case OPT_INFO:
arg = poptGetOptArg(pc);
parse_output_words(info_words, info_levels, arg, USER_PRIORITY);
-@@ -20
89,6 +2108
,9 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+@@ -20
93,6 +2112
,9 @@ int parse_arguments(int *argc_p, const char ***argv_p)
}
#endif
}
#endif
@@
-710,7
+710,7
@@
diff --git a/options.c b/options.c
diff --git a/rsync.1.md b/rsync.1.md
--- a/rsync.1.md
+++ b/rsync.1.md
diff --git a/rsync.1.md b/rsync.1.md
--- a/rsync.1.md
+++ b/rsync.1.md
-@@ -342,6 +342,7 @@ has its own detailed description later in this man
page.
+@@ -342,6 +342,7 @@ has its own detailed description later in this manpage.
--quiet, -q suppress non-error messages
--no-motd suppress daemon-mode MOTD
--checksum, -c skip based on checksum, not mod-time & size
--quiet, -q suppress non-error messages
--no-motd suppress daemon-mode MOTD
--checksum, -c skip based on checksum, not mod-time & size
@@
-718,7
+718,7
@@
diff --git a/rsync.1.md b/rsync.1.md
--archive, -a archive mode is -rlptgoD (no -A,-X,-U,-N,-H)
--no-OPTION turn off an implied OPTION (e.g. --no-D)
--recursive, -r recurse into directories
--archive, -a archive mode is -rlptgoD (no -A,-X,-U,-N,-H)
--no-OPTION turn off an implied OPTION (e.g. --no-D)
--recursive, -r recurse into directories
-@@ -72
1,6 +722
,8 @@ your home directory (remove the '=' for that).
+@@ -72
2,6 +723
,8 @@ your home directory (remove the '=' for that).
file that has the same size as the corresponding sender's file: files with
either a changed size or a changed checksum are selected for transfer.
file that has the same size as the corresponding sender's file: files with
either a changed size or a changed checksum are selected for transfer.
@@
-727,7
+727,7
@@
diff --git a/rsync.1.md b/rsync.1.md
Note that rsync always verifies that each _transferred_ file was correctly
reconstructed on the receiving side by checking a whole-file checksum that
is generated as the file is transferred, but that automatic
Note that rsync always verifies that each _transferred_ file was correctly
reconstructed on the receiving side by checking a whole-file checksum that
is generated as the file is transferred, but that automatic
-@@ -73
2,6 +735
,38 @@ your home directory (remove the '=' for that).
+@@ -73
3,6 +736
,38 @@ your home directory (remove the '=' for that).
option or an environment variable that is discussed in that option's
section.
option or an environment variable that is discussed in that option's
section.
diff --git
a/checksum-updating.diff
b/checksum-updating.diff
index 02c70e33d401c1631191d19fc6604f801302baf2..9ec3d4a28f0cb0f7a9022f20020f6e5904edf61d 100644
(file)
--- a/
checksum-updating.diff
+++ b/
checksum-updating.diff
@@
-29,7
+29,7
@@
diff --git a/flist.c b/flist.c
extern int am_root;
extern int am_server;
extern int am_daemon;
extern int am_root;
extern int am_server;
extern int am_daemon;
-@@ -11
0,6 +111
,9 @@ extern iconv_t ic_send, ic_recv;
+@@ -11
1,6 +112
,9 @@ extern iconv_t ic_send, ic_recv;
#define PTR_SIZE (sizeof (struct file_struct *))
#define PTR_SIZE (sizeof (struct file_struct *))
@@
-39,7
+39,7
@@
diff --git a/flist.c b/flist.c
int io_error;
int flist_csum_len;
dev_t filesystem_dev; /* used to implement -x */
int io_error;
int flist_csum_len;
dev_t filesystem_dev; /* used to implement -x */
-@@ -15
2,8 +156
,13 @@ static char empty_sum[MAX_DIGEST_LEN];
+@@ -15
3,8 +157
,13 @@ static char empty_sum[MAX_DIGEST_LEN];
static int flist_count_offset; /* for --delete --progress */
static int show_filelist_progress;
static int flist_count_offset; /* for --delete --progress */
static int show_filelist_progress;
@@
-53,7
+53,7
@@
diff --git a/flist.c b/flist.c
} *csum_cache = NULL;
static struct file_list *flist_new(int flags, const char *msg);
} *csum_cache = NULL;
static struct file_list *flist_new(int flags, const char *msg);
-@@ -34
8,7 +357
,79 @@ static void flist_done_allocating(struct file_list *flist)
+@@ -34
9,7 +358
,79 @@ static void flist_done_allocating(struct file_list *flist)
flist->pool_boundary = ptr;
}
flist->pool_boundary = ptr;
}
@@
-134,7
+134,7
@@
diff --git a/flist.c b/flist.c
{
int slot, slots = am_sender ? 1 : basis_dir_cnt + 1;
{
int slot, slots = am_sender ? 1 : basis_dir_cnt + 1;
-@@ -3
59,6 +440
,9 @@ void reset_checksum_cache()
+@@ -3
60,6 +441
,9 @@ void reset_checksum_cache()
struct file_list *flist = csum_cache[slot].flist;
if (flist) {
struct file_list *flist = csum_cache[slot].flist;
if (flist) {
@@
-144,7
+144,7
@@
diff --git a/flist.c b/flist.c
/* Reset the pool memory and empty the file-list array. */
pool_free_old(flist->file_pool,
pool_boundary(flist->file_pool, 0));
/* Reset the pool memory and empty the file-list array. */
pool_free_old(flist->file_pool,
pool_boundary(flist->file_pool, 0));
-@@ -3
69,6 +453
,10 @@ void reset_checksum_cache()
+@@ -3
70,6 +454
,10 @@ void reset_checksum_cache()
flist->low = 0;
flist->high = -1;
flist->next = NULL;
flist->low = 0;
flist->high = -1;
flist->next = NULL;
@@
-155,7
+155,7
@@
diff --git a/flist.c b/flist.c
}
}
}
}
-@@ -37
6,7 +464
,7 @@ void reset_checksum_cache()
+@@ -37
7,7 +465
,7 @@ void reset_checksum_cache()
static int add_checksum(struct file_list *flist, const char *dirname,
const char *basename, int basename_len, OFF_T file_length,
time_t mtime, uint32 ctime, uint32 inode,
static int add_checksum(struct file_list *flist, const char *dirname,
const char *basename, int basename_len, OFF_T file_length,
time_t mtime, uint32 ctime, uint32 inode,
@@
-164,7
+164,7
@@
diff --git a/flist.c b/flist.c
{
struct file_struct *file;
int alloc_len, extra_len;
{
struct file_struct *file;
int alloc_len, extra_len;
-@@ -39
3,7 +481
,7 @@ static int add_checksum(struct file_list *flist, const char *dirname,
+@@ -39
4,7 +482
,7 @@ static int add_checksum(struct file_list *flist, const char *dirname,
if (extra_len & (EXTRA_ROUNDING * EXTRA_LEN))
extra_len = (extra_len | (EXTRA_ROUNDING * EXTRA_LEN)) + EXTRA_LEN;
#endif
if (extra_len & (EXTRA_ROUNDING * EXTRA_LEN))
extra_len = (extra_len | (EXTRA_ROUNDING * EXTRA_LEN)) + EXTRA_LEN;
#endif
@@
-173,7
+173,7
@@
diff --git a/flist.c b/flist.c
bp = pool_alloc(flist->file_pool, alloc_len, "add_checksum");
memset(bp, 0, extra_len + FILE_STRUCT_LEN);
bp = pool_alloc(flist->file_pool, alloc_len, "add_checksum");
memset(bp, 0, extra_len + FILE_STRUCT_LEN);
-@@ -40
2,7 +490
,14 @@ static int add_checksum(struct file_list *flist, const char *dirname,
+@@ -40
3,7 +491
,14 @@ static int add_checksum(struct file_list *flist, const char *dirname,
bp += FILE_STRUCT_LEN;
memcpy(bp, basename, basename_len);
bp += FILE_STRUCT_LEN;
memcpy(bp, basename, basename_len);
@@
-188,7
+188,7
@@
diff --git a/flist.c b/flist.c
file->mode = S_IFREG;
file->modtime = mtime;
file->len32 = (uint32)file_length;
file->mode = S_IFREG;
file->modtime = mtime;
file->len32 = (uint32)file_length;
-@@ -43
1,10 +526
,11 @@ static void read_checksums(int slot, struct file_list *flist, const char *dirnam
+@@ -43
2,10 +527
,11 @@ static void read_checksums(int slot, struct file_list *flist, const char *dirnam
char line[MAXPATHLEN+1024], fbuf[MAXPATHLEN], sum[MAX_DIGEST_LEN];
FILE *fp;
char *cp;
char line[MAXPATHLEN+1024], fbuf[MAXPATHLEN], sum[MAX_DIGEST_LEN];
FILE *fp;
char *cp;
@@
-201,7
+201,7
@@
diff --git a/flist.c b/flist.c
int dlen = dirname ? strlcpy(fbuf, dirname, sizeof fbuf) : 0;
if (dlen >= (int)(sizeof fbuf - 1 - RSYNCSUMS_LEN))
int dlen = dirname ? strlcpy(fbuf, dirname, sizeof fbuf) : 0;
if (dlen >= (int)(sizeof fbuf - 1 - RSYNCSUMS_LEN))
-@@ -45
5,7 +551
,7 @@ static void read_checksums(int slot, struct file_list *flist, const char *dirnam
+@@ -45
6,7 +552
,7 @@ static void read_checksums(int slot, struct file_list *flist, const char *dirnam
while (fgets(line, sizeof line, fp)) {
cp = line;
if (checksum_type == 5) {
while (fgets(line, sizeof line, fp)) {
cp = line;
if (checksum_type == 5) {
@@
-210,7
+210,7
@@
diff --git a/flist.c b/flist.c
if (*cp == '=')
while (*++cp == '=') {}
else
if (*cp == '=')
while (*++cp == '=') {}
else
-@@ -46
6,7 +562
,14 @@ static void read_checksums(int slot, struct file_list *flist, const char *dirnam
+@@ -46
7,7 +563
,14 @@ static void read_checksums(int slot, struct file_list *flist, const char *dirnam
}
if (*cp == '=') {
}
if (*cp == '=') {
@@
-226,7
+226,7
@@
diff --git a/flist.c b/flist.c
} else {
for (i = 0; i < flist_csum_len*2; i++, cp++) {
int x;
} else {
for (i = 0; i < flist_csum_len*2; i++, cp++) {
int x;
-@@ -48
4,13 +587
,14 @@ static void read_checksums(int slot, struct file_list *flist, const char *dirnam
+@@ -48
5,13 +588
,14 @@ static void read_checksums(int slot, struct file_list *flist, const char *dirnam
else
sum[i/2] = x << 4;
}
else
sum[i/2] = x << 4;
}
@@
-242,7
+242,7
@@
diff --git a/flist.c b/flist.c
if (*cp == '=')
while (*++cp == '=') {}
else
if (*cp == '=')
while (*++cp == '=') {}
else
-@@ -54
0,24 +644
,112 @@ static void read_checksums(int slot, struct file_list *flist, const char *dirnam
+@@ -54
1,24 +645
,112 @@ static void read_checksums(int slot, struct file_list *flist, const char *dirnam
continue;
strlcpy(fbuf+dlen, cp, sizeof fbuf - dlen);
continue;
strlcpy(fbuf+dlen, cp, sizeof fbuf - dlen);
@@
-357,7
+357,7
@@
diff --git a/flist.c b/flist.c
read_checksums(slot, flist, file->dirname);
}
read_checksums(slot, flist, file->dirname);
}
-@@ -5
69,12 +761
,31 @@ void get_cached_checksum(int slot, const char *fname, struct file_struct *file,
+@@ -5
70,12 +762
,31 @@ void get_cached_checksum(int slot, const char *fname, struct file_struct *file,
&& (checksum_files & CSF_LAX
|| (F_CTIME(fp) == (uint32)stp->st_ctime
&& F_INODE(fp) == (uint32)stp->st_ino))) {
&& (checksum_files & CSF_LAX
|| (F_CTIME(fp) == (uint32)stp->st_ctime
&& F_INODE(fp) == (uint32)stp->st_ino))) {
@@
-390,7
+390,7
@@
diff --git a/flist.c b/flist.c
}
/* Call this with EITHER (1) "file, NULL, 0" to chdir() to the file's
}
/* Call this with EITHER (1) "file, NULL, 0" to chdir() to the file's
-@@ -15
55,6 +1766
,8 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
+@@ -15
68,6 +1779
,8 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
if (is_excluded(thisname, S_ISDIR(st.st_mode) != 0, filter_level)) {
if (ignore_perishable)
non_perishable_cnt++;
if (is_excluded(thisname, S_ISDIR(st.st_mode) != 0, filter_level)) {
if (ignore_perishable)
non_perishable_cnt++;
@@
-399,7
+399,7
@@
diff --git a/flist.c b/flist.c
return NULL;
}
return NULL;
}
-@@ -16
01,13 +1814
,13 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
+@@ -16
14,13 +1827
,13 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
lastdir[len] = '\0';
lastdir_len = len;
if (checksum_files && am_sender && flist)
lastdir[len] = '\0';
lastdir_len = len;
if (checksum_files && am_sender && flist)
@@
-415,7
+415,7
@@
diff --git a/flist.c b/flist.c
}
}
basename_len = strlen(basename) + 1; /* count the '\0' */
}
}
basename_len = strlen(basename) + 1; /* count the '\0' */
-@@ -17
19,7 +1932
,7 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
+@@ -17
44,7 +1957
,7 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
if (always_checksum && am_sender && S_ISREG(st.st_mode)) {
if (flist && checksum_files)
if (always_checksum && am_sender && S_ISREG(st.st_mode)) {
if (flist && checksum_files)
@@
-424,7
+424,7
@@
diff --git a/flist.c b/flist.c
else
file_checksum(thisname, &st, tmp_sum);
if (sender_keeps_checksum)
else
file_checksum(thisname, &st, tmp_sum);
if (sender_keeps_checksum)
-@@ -21
11,6 +2324
,9 @@ static void send_directory(int f, struct file_list *flist, char *fbuf, int len,
+@@ -21
36,6 +2349
,9 @@ static void send_directory(int f, struct file_list *flist, char *fbuf, int len,
closedir(d);
closedir(d);
@@
-434,7
+434,7
@@
diff --git a/flist.c b/flist.c
if (f >= 0 && recurse && !divert_dirs) {
int i, end = flist->used - 1;
/* send_if_directory() bumps flist->used, so use "end". */
if (f >= 0 && recurse && !divert_dirs) {
int i, end = flist->used - 1;
/* send_if_directory() bumps flist->used, so use "end". */
-@@ -2
776,6 +2992
,9 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
+@@ -2
801,6 +3017
,9 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
rprintf(FINFO, "[%s] flist_eof=1\n", who_am_i());
}
rprintf(FINFO, "[%s] flist_eof=1\n", who_am_i());
}
@@
-482,7
+482,7
@@
diff --git a/generator.c b/generator.c
prior_dir_file = file;
goto cleanup;
}
prior_dir_file = file;
goto cleanup;
}
-@@ -181
0,6 +1813
,8 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
+@@ -181
6,6 +1819
,8 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
handle_partial_dir(partialptr, PDIR_DELETE);
}
set_file_attrs(fname, file, &sx, NULL, maybe_ATTRS_REPORT | maybe_ATTRS_ACCURATE_TIME);
handle_partial_dir(partialptr, PDIR_DELETE);
}
set_file_attrs(fname, file, &sx, NULL, maybe_ATTRS_REPORT | maybe_ATTRS_ACCURATE_TIME);
@@
-491,7
+491,7
@@
diff --git a/generator.c b/generator.c
if (itemizing)
itemize(fnamecmp, file, ndx, statret, &sx, 0, 0, NULL);
#ifdef SUPPORT_HARD_LINKS
if (itemizing)
itemize(fnamecmp, file, ndx, statret, &sx, 0, 0, NULL);
#ifdef SUPPORT_HARD_LINKS
-@@ -230
6,6 +2311
,7 @@ void generate_files(int f_out, const char *local_name)
+@@ -230
8,6 +2313
,7 @@ void generate_files(int f_out, const char *local_name)
} else
change_local_filter_dir(fbuf, strlen(fbuf), F_DEPTH(fp));
}
} else
change_local_filter_dir(fbuf, strlen(fbuf), F_DEPTH(fp));
}
@@
-499,7
+499,7
@@
diff --git a/generator.c b/generator.c
}
for (i = cur_flist->low; i <= cur_flist->high; i++) {
struct file_struct *file = cur_flist->sorted[i];
}
for (i = cur_flist->low; i <= cur_flist->high; i++) {
struct file_struct *file = cur_flist->sorted[i];
-@@ -240
0,6 +2406
,9 @@ void generate_files(int f_out, const char *local_name)
+@@ -240
2,6 +2408
,9 @@ void generate_files(int f_out, const char *local_name)
wait_for_receiver();
}
wait_for_receiver();
}
@@
-547,7
+547,7
@@
diff --git a/loadparm.c b/loadparm.c
diff --git a/options.c b/options.c
--- a/options.c
+++ b/options.c
diff --git a/options.c b/options.c
--- a/options.c
+++ b/options.c
-@@ -174
0,7 +1740
,15 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+@@ -174
4,7 +1744
,15 @@ int parse_arguments(int *argc_p, const char ***argv_p)
case OPT_SUMFILES:
arg = poptGetOptArg(pc);
case OPT_SUMFILES:
arg = poptGetOptArg(pc);
@@
-584,7
+584,7
@@
diff --git a/receiver.c b/receiver.c
|| (preserve_hard_links && F_IS_HLINKED(file)))
send_msg_int(MSG_SUCCESS, ndx);
handle_partial_dir(partialptr, PDIR_DELETE);
|| (preserve_hard_links && F_IS_HLINKED(file)))
send_msg_int(MSG_SUCCESS, ndx);
handle_partial_dir(partialptr, PDIR_DELETE);
-@@ -92
1,7 +922
,7 @@ int recv_files(int f_in, int f_out, char *local_name)
+@@ -92
3,7 +924
,7 @@ int recv_files(int f_in, int f_out, char *local_name)
case 2:
break;
case 1:
case 2:
break;
case 1:
@@
-596,7
+596,7
@@
diff --git a/receiver.c b/receiver.c
diff --git a/rsync.1.md b/rsync.1.md
--- a/rsync.1.md
+++ b/rsync.1.md
diff --git a/rsync.1.md b/rsync.1.md
--- a/rsync.1.md
+++ b/rsync.1.md
-@@ -74
6,9 +746
,13 @@ your home directory (remove the '=' for that).
+@@ -74
7,9 +747
,13 @@ your home directory (remove the '=' for that).
The MODE value is either "lax", for relaxed checking (which compares size
and mtime), "strict" (which also compares ctime and inode), or "none" to
The MODE value is either "lax", for relaxed checking (which compares size
and mtime), "strict" (which also compares ctime and inode), or "none" to
diff --git
a/checksum-xattr.diff
b/checksum-xattr.diff
index 6a9915d2e01ed31c760f2131f6ce02464bd16100..6e46123f45158b3da432bea5dddad3dcb6f8dc57 100644
(file)
--- a/
checksum-xattr.diff
+++ b/
checksum-xattr.diff
@@
-8,11
+8,11
@@
To use this patch, run these commands for a successful build:
./configure (optional if already run)
make
./configure (optional if already run)
make
-based-on:
55b2a06812e39f15f52e92b979600cb82be210cb
+based-on:
d821e4cbfbc66848cdf91a336af26fdb89dd9a8f
diff --git a/flist.c b/flist.c
--- a/flist.c
+++ b/flist.c
diff --git a/flist.c b/flist.c
--- a/flist.c
+++ b/flist.c
-@@ -13
70,7 +1370
,8 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
+@@ -13
95,7 +1395
,8 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
#endif
if (always_checksum && am_sender && S_ISREG(st.st_mode)) {
#endif
if (always_checksum && am_sender && S_ISREG(st.st_mode)) {
diff --git
a/clone-dest.diff
b/clone-dest.diff
index e7ffd4635df194ae542aa5900ead36748a5841cb..0f784a697637e25dacfa490dcfeff34cd05d1889 100644
(file)
--- a/
clone-dest.diff
+++ b/
clone-dest.diff
@@
-13,7
+13,7
@@
To use this patch, run these commands for a successful build:
./configure (optional if already run)
make
./configure (optional if already run)
make
-based-on:
55b2a06812e39f15f52e92b979600cb82be210cb
+based-on:
d821e4cbfbc66848cdf91a336af26fdb89dd9a8f
diff --git a/Makefile.in b/Makefile.in
--- a/Makefile.in
+++ b/Makefile.in
diff --git a/Makefile.in b/Makefile.in
--- a/Makefile.in
+++ b/Makefile.in
@@
-79,7
+79,7
@@
diff --git a/generator.c b/generator.c
diff --git a/options.c b/options.c
--- a/options.c
+++ b/options.c
diff --git a/options.c b/options.c
--- a/options.c
+++ b/options.c
-@@ -57
7,7 +577
,7 @@ enum {OPT_SERVER = 1000, OPT_DAEMON, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM,
+@@ -57
8,7 +578
,7 @@ enum {OPT_SERVER = 1000, OPT_DAEMON, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM,
OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW, OPT_MIN_SIZE, OPT_CHMOD,
OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_ONLY_WRITE_BATCH, OPT_MAX_SIZE,
OPT_NO_D, OPT_APPEND, OPT_NO_ICONV, OPT_INFO, OPT_DEBUG, OPT_BLOCK_SIZE,
OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW, OPT_MIN_SIZE, OPT_CHMOD,
OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_ONLY_WRITE_BATCH, OPT_MAX_SIZE,
OPT_NO_D, OPT_APPEND, OPT_NO_ICONV, OPT_INFO, OPT_DEBUG, OPT_BLOCK_SIZE,
@@
-88,7
+88,7
@@
diff --git a/options.c b/options.c
OPT_OLD_COMPRESS, OPT_NEW_COMPRESS, OPT_NO_COMPRESS, OPT_OLD_ARGS,
OPT_STOP_AFTER, OPT_STOP_AT,
OPT_REFUSED_BASE = 9000};
OPT_OLD_COMPRESS, OPT_NEW_COMPRESS, OPT_NO_COMPRESS, OPT_OLD_ARGS,
OPT_STOP_AFTER, OPT_STOP_AT,
OPT_REFUSED_BASE = 9000};
-@@ -73
7,6 +737
,7 @@ static struct poptOption long_options[] = {
+@@ -73
9,6 +739
,7 @@ static struct poptOption long_options[] = {
{"compare-dest", 0, POPT_ARG_STRING, 0, OPT_COMPARE_DEST, 0, 0 },
{"copy-dest", 0, POPT_ARG_STRING, 0, OPT_COPY_DEST, 0, 0 },
{"link-dest", 0, POPT_ARG_STRING, 0, OPT_LINK_DEST, 0, 0 },
{"compare-dest", 0, POPT_ARG_STRING, 0, OPT_COMPARE_DEST, 0, 0 },
{"copy-dest", 0, POPT_ARG_STRING, 0, OPT_COPY_DEST, 0, 0 },
{"link-dest", 0, POPT_ARG_STRING, 0, OPT_LINK_DEST, 0, 0 },
@@
-96,7
+96,7
@@
diff --git a/options.c b/options.c
{"fuzzy", 'y', POPT_ARG_NONE, 0, 'y', 0, 0 },
{"no-fuzzy", 0, POPT_ARG_VAL, &fuzzy_basis, 0, 0, 0 },
{"no-y", 0, POPT_ARG_VAL, &fuzzy_basis, 0, 0, 0 },
{"fuzzy", 'y', POPT_ARG_NONE, 0, 'y', 0, 0 },
{"no-fuzzy", 0, POPT_ARG_VAL, &fuzzy_basis, 0, 0, 0 },
{"no-y", 0, POPT_ARG_VAL, &fuzzy_basis, 0, 0, 0 },
-@@ -99
3,6 +994
,9 @@ static void set_refuse_options(void)
+@@ -99
7,6 +998
,9 @@ static void set_refuse_options(void)
#ifndef SUPPORT_HARD_LINKS
parse_one_refuse_match(0, "link-dest", list_end);
#endif
#ifndef SUPPORT_HARD_LINKS
parse_one_refuse_match(0, "link-dest", list_end);
#endif
@@
-106,7
+106,7
@@
diff --git a/options.c b/options.c
#ifndef HAVE_MKTIME
parse_one_refuse_match(0, "stop-at", list_end);
#endif
#ifndef HAVE_MKTIME
parse_one_refuse_match(0, "stop-at", list_end);
#endif
-@@ -132
2,6 +1326
,8 @@ char *alt_dest_opt(int type)
+@@ -132
6,6 +1330
,8 @@ char *alt_dest_opt(int type)
return "--copy-dest";
case LINK_DEST:
return "--link-dest";
return "--copy-dest";
case LINK_DEST:
return "--link-dest";
@@
-115,7
+115,7
@@
diff --git a/options.c b/options.c
default:
NOISY_DEATH("Unknown alt_dest_opt type");
}
default:
NOISY_DEATH("Unknown alt_dest_opt type");
}
-@@ -1
699,6 +1705
,10 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+@@ -1
703,6 +1709
,10 @@ int parse_arguments(int *argc_p, const char ***argv_p)
want_dest_type = LINK_DEST;
goto set_dest_dir;
want_dest_type = LINK_DEST;
goto set_dest_dir;
@@
-129,7
+129,7
@@
diff --git a/options.c b/options.c
diff --git a/rsync.1.md b/rsync.1.md
--- a/rsync.1.md
+++ b/rsync.1.md
diff --git a/rsync.1.md b/rsync.1.md
--- a/rsync.1.md
+++ b/rsync.1.md
-@@ -4
29,6 +429,7 @@ has its own detailed description later in this man
page.
+@@ -4
30,6 +430,7 @@ has its own detailed description later in this man
page.
--compare-dest=DIR also compare destination files relative to DIR
--copy-dest=DIR ... and include copies of unchanged files
--link-dest=DIR hardlink to files in DIR when unchanged
--compare-dest=DIR also compare destination files relative to DIR
--copy-dest=DIR ... and include copies of unchanged files
--link-dest=DIR hardlink to files in DIR when unchanged
@@
-137,7
+137,7
@@
diff --git a/rsync.1.md b/rsync.1.md
--compress, -z compress file data during the transfer
--compress-choice=STR choose the compression algorithm (aka --zc)
--compress-level=NUM explicitly set compression level (aka --zl)
--compress, -z compress file data during the transfer
--compress-choice=STR choose the compression algorithm (aka --zc)
--compress-level=NUM explicitly set compression level (aka --zl)
-@@ -25
23,6 +2524
,18 @@ your home directory (remove the '=' for that).
+@@ -25
32,6 +2533
,18 @@ your home directory (remove the '=' for that).
this bug by avoiding the `-o` option (or using `--no-o`) when sending to an
old rsync.
this bug by avoiding the `-o` option (or using `--no-o`) when sending to an
old rsync.
diff --git
a/congestion.diff
b/congestion.diff
index 0c1da5796a2aa4de21e3ead614dd0c1ede1ae377..d1d072ee5ec8f7c641fc9cc3a10ece23ab5038a9 100644
(file)
--- a/
congestion.diff
+++ b/
congestion.diff
@@
-27,7
+27,7
@@
To use this patch, run these commands for a successful build:
./configure (optional if already run)
make
./configure (optional if already run)
make
-based-on:
55b2a06812e39f15f52e92b979600cb82be210cb
+based-on:
d821e4cbfbc66848cdf91a336af26fdb89dd9a8f
diff --git a/daemon-parm.txt b/daemon-parm.txt
--- a/daemon-parm.txt
+++ b/daemon-parm.txt
diff --git a/daemon-parm.txt b/daemon-parm.txt
--- a/daemon-parm.txt
+++ b/daemon-parm.txt
@@
-50,7
+50,7
@@
diff --git a/daemon-parm.txt b/daemon-parm.txt
diff --git a/options.c b/options.c
--- a/options.c
+++ b/options.c
diff --git a/options.c b/options.c
--- a/options.c
+++ b/options.c
-@@ -7
5,6 +75
,8 @@ int delete_during = 0;
+@@ -7
6,6 +76
,8 @@ int delete_during = 0;
int delete_before = 0;
int delete_after = 0;
int delete_excluded = 0;
int delete_before = 0;
int delete_after = 0;
int delete_excluded = 0;
@@
-59,7
+59,7
@@
diff --git a/options.c b/options.c
int remove_source_files = 0;
int one_file_system = 0;
int protocol_version = PROTOCOL_VERSION;
int remove_source_files = 0;
int one_file_system = 0;
int protocol_version = PROTOCOL_VERSION;
-@@ -82
3,6 +825
,8 @@ static struct poptOption long_options[] = {
+@@ -82
5,6 +827
,8 @@ static struct poptOption long_options[] = {
{"outbuf", 0, POPT_ARG_STRING, &outbuf_mode, 0, 0, 0 },
{"remote-option", 'M', POPT_ARG_STRING, 0, 'M', 0, 0 },
{"protocol", 0, POPT_ARG_INT, &protocol_version, 0, 0, 0 },
{"outbuf", 0, POPT_ARG_STRING, &outbuf_mode, 0, 0, 0 },
{"remote-option", 'M', POPT_ARG_STRING, 0, 'M', 0, 0 },
{"protocol", 0, POPT_ARG_INT, &protocol_version, 0, 0, 0 },
@@
-71,7
+71,7
@@
diff --git a/options.c b/options.c
diff --git a/rsync.1.md b/rsync.1.md
--- a/rsync.1.md
+++ b/rsync.1.md
diff --git a/rsync.1.md b/rsync.1.md
--- a/rsync.1.md
+++ b/rsync.1.md
-@@ -4
49,6 +449,8 @@ has its own detailed description later in this man
page.
+@@ -4
50,6 +450,8 @@ has its own detailed description later in this man
page.
--address=ADDRESS bind address for outgoing socket to daemon
--port=PORT specify double-colon alternate port number
--sockopts=OPTIONS specify custom TCP options
--address=ADDRESS bind address for outgoing socket to daemon
--port=PORT specify double-colon alternate port number
--sockopts=OPTIONS specify custom TCP options
diff --git
a/date-only.diff
b/date-only.diff
index 5118d14f202861fc7afaf41ccb333a59d5465bcf..7f2d91e2ad5611d9843988156bc4699f239e7390 100644
(file)
--- a/
date-only.diff
+++ b/
date-only.diff
@@
-14,7
+14,7
@@
To use this patch, run these commands for a successful build:
./configure (optional if already run)
make
./configure (optional if already run)
make
-based-on:
55b2a06812e39f15f52e92b979600cb82be210cb
+based-on:
d821e4cbfbc66848cdf91a336af26fdb89dd9a8f
diff --git a/generator.c b/generator.c
--- a/generator.c
+++ b/generator.c
diff --git a/generator.c b/generator.c
--- a/generator.c
+++ b/generator.c
@@
-39,7
+39,7
@@
diff --git a/generator.c b/generator.c
diff --git a/options.c b/options.c
--- a/options.c
+++ b/options.c
diff --git a/options.c b/options.c
--- a/options.c
+++ b/options.c
-@@ -11
5,6 +115
,7 @@ int safe_symlinks = 0;
+@@ -11
6,6 +116
,7 @@ int safe_symlinks = 0;
int copy_unsafe_links = 0;
int munge_symlinks = 0;
int size_only = 0;
int copy_unsafe_links = 0;
int munge_symlinks = 0;
int size_only = 0;
@@
-47,7
+47,7
@@
diff --git a/options.c b/options.c
int daemon_bwlimit = 0;
int bwlimit = 0;
int fuzzy_basis = 0;
int daemon_bwlimit = 0;
int bwlimit = 0;
int fuzzy_basis = 0;
-@@ -68
3,6 +684
,7 @@ static struct poptOption long_options[] = {
+@@ -68
5,6 +686
,7 @@ static struct poptOption long_options[] = {
{"chmod", 0, POPT_ARG_STRING, 0, OPT_CHMOD, 0, 0 },
{"ignore-times", 'I', POPT_ARG_NONE, &ignore_times, 0, 0, 0 },
{"size-only", 0, POPT_ARG_NONE, &size_only, 0, 0, 0 },
{"chmod", 0, POPT_ARG_STRING, 0, OPT_CHMOD, 0, 0 },
{"ignore-times", 'I', POPT_ARG_NONE, &ignore_times, 0, 0, 0 },
{"size-only", 0, POPT_ARG_NONE, &size_only, 0, 0, 0 },
@@
-55,7
+55,7
@@
diff --git a/options.c b/options.c
{"one-file-system", 'x', POPT_ARG_NONE, 0, 'x', 0, 0 },
{"no-one-file-system",0, POPT_ARG_VAL, &one_file_system, 0, 0, 0 },
{"no-x", 0, POPT_ARG_VAL, &one_file_system, 0, 0, 0 },
{"one-file-system", 'x', POPT_ARG_NONE, 0, 'x', 0, 0 },
{"no-one-file-system",0, POPT_ARG_VAL, &one_file_system, 0, 0, 0 },
{"no-x", 0, POPT_ARG_VAL, &one_file_system, 0, 0, 0 },
-@@ -280
3,6 +2805
,9 @@ void server_options(char **args, int *argc_p)
+@@ -280
7,6 +2809
,9 @@ void server_options(char **args, int *argc_p)
else if (missing_args == 1 && !am_sender)
args[ac++] = "--ignore-missing-args";
else if (missing_args == 1 && !am_sender)
args[ac++] = "--ignore-missing-args";
@@
-68,7
+68,7
@@
diff --git a/options.c b/options.c
diff --git a/rsync.1.md b/rsync.1.md
--- a/rsync.1.md
+++ b/rsync.1.md
diff --git a/rsync.1.md b/rsync.1.md
--- a/rsync.1.md
+++ b/rsync.1.md
-@@ -42
3,6 +423,7 @@ has its own detailed description later in this man
page.
+@@ -42
4,6 +424,7 @@ has its own detailed description later in this man
page.
--contimeout=SECONDS set daemon connection timeout in seconds
--ignore-times, -I don't skip files that match size and time
--size-only skip files that match in size
--contimeout=SECONDS set daemon connection timeout in seconds
--ignore-times, -I don't skip files that match size and time
--size-only skip files that match in size
@@
-76,7
+76,7
@@
diff --git a/rsync.1.md b/rsync.1.md
--modify-window=NUM, -@ set the accuracy for mod-time comparisons
--temp-dir=DIR, -T create temporary files in directory DIR
--fuzzy, -y find similar file for basis if no dest file
--modify-window=NUM, -@ set the accuracy for mod-time comparisons
--temp-dir=DIR, -T create temporary files in directory DIR
--fuzzy, -y find similar file for basis if no dest file
-@@ -68
3,6 +684
,14 @@ your home directory (remove the '=' for that).
+@@ -68
4,6 +685
,14 @@ your home directory (remove the '=' for that).
after using another mirroring system which may not preserve timestamps
exactly.
after using another mirroring system which may not preserve timestamps
exactly.
diff --git
a/db.diff
b/db.diff
index 394f05257dd5d81ec7c15774432536c512002895..e9a702e82cd49a4e7009ae236b48816fcd3655e5 100644
(file)
--- a/
db.diff
+++ b/
db.diff
@@
-21,11
+21,11
@@
To use this patch, run these commands for a successful build:
./configure
make
./configure
make
-based-on:
55b2a06812e39f15f52e92b979600cb82be210cb
+based-on:
d821e4cbfbc66848cdf91a336af26fdb89dd9a8f
diff --git a/.gitignore b/.gitignore
--- a/.gitignore
+++ b/.gitignore
diff --git a/.gitignore b/.gitignore
--- a/.gitignore
+++ b/.gitignore
-@@ -3
2,6 +32
,7 @@ aclocal.m4
+@@ -3
3,6 +33
,7 @@ aclocal.m4
/gists
/gmon.out
/rsync
/gists
/gmon.out
/rsync
@@
-2249,7
+2249,7
@@
new file mode 100644
diff --git a/flist.c b/flist.c
--- a/flist.c
+++ b/flist.c
diff --git a/flist.c b/flist.c
--- a/flist.c
+++ b/flist.c
-@@ -5
4,6 +54
,7 @@ extern int preserve_devices;
+@@ -5
5,6 +55
,7 @@ extern int preserve_devices;
extern int preserve_specials;
extern int delete_during;
extern int missing_args;
extern int preserve_specials;
extern int delete_during;
extern int missing_args;
@@
-2257,7
+2257,7
@@
diff --git a/flist.c b/flist.c
extern int eol_nulls;
extern int atimes_ndx;
extern int crtimes_ndx;
extern int eol_nulls;
extern int atimes_ndx;
extern int crtimes_ndx;
-@@ -13
69,11 +1370
,8 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
+@@ -13
94,11 +1395
,8 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
extra_len += EXTRA_LEN;
#endif
extra_len += EXTRA_LEN;
#endif
@@
-2271,7
+2271,7
@@
diff --git a/flist.c b/flist.c
#if EXTRA_ROUNDING > 0
if (extra_len & (EXTRA_ROUNDING * EXTRA_LEN))
#if EXTRA_ROUNDING > 0
if (extra_len & (EXTRA_ROUNDING * EXTRA_LEN))
-@@ -14
62,8 +1460
,12 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
+@@ -14
87,8 +1485
,12 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
return NULL;
}
return NULL;
}
@@
-2286,7
+2286,7
@@
diff --git a/flist.c b/flist.c
if (unsort_ndx)
F_NDX(file) = stats.num_dirs;
if (unsort_ndx)
F_NDX(file) = stats.num_dirs;
-@@ -21
47,6 +2149
,9 @@ void send_extra_file_list(int f, int at_least)
+@@ -21
72,6 +2174
,9 @@ void send_extra_file_list(int f, int at_least)
finish:
if (io_error != save_io_error && protocol_version == 30 && !ignore_errors)
send_msg_int(MSG_IO_ERROR, io_error);
finish:
if (io_error != save_io_error && protocol_version == 30 && !ignore_errors)
send_msg_int(MSG_IO_ERROR, io_error);
@@
-2296,7
+2296,7
@@
diff --git a/flist.c b/flist.c
}
struct file_list *send_file_list(int f, int argc, char *argv[])
}
struct file_list *send_file_list(int f, int argc, char *argv[])
-@@ -21
70,6 +2175
,13 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
+@@ -21
95,6 +2200
,13 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
| (eol_nulls || reading_remotely ? RL_EOL_NULLS : 0);
int implied_dot_dir = 0;
| (eol_nulls || reading_remotely ? RL_EOL_NULLS : 0);
int implied_dot_dir = 0;
@@
-2310,7
+2310,7
@@
diff --git a/flist.c b/flist.c
rprintf(FLOG, "building file list\n");
if (show_filelist_progress)
start_filelist_progress("building file list");
rprintf(FLOG, "building file list\n");
if (show_filelist_progress)
start_filelist_progress("building file list");
-@@ -25
15,6 +2527
,9 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
+@@ -25
40,6 +2552
,9 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
rprintf(FINFO, "[%s] flist_eof=1\n", who_am_i());
}
rprintf(FINFO, "[%s] flist_eof=1\n", who_am_i());
}
@@
-2340,7
+2340,7
@@
diff --git a/generator.c b/generator.c
return memcmp(sum, F_SUM(file), flist_csum_len) == 0;
}
return memcmp(sum, F_SUM(file), flist_csum_len) == 0;
}
-@@ -22
68,6 +2271
,13 @@ void generate_files(int f_out, const char *local_name)
+@@ -22
70,6 +2273
,13 @@ void generate_files(int f_out, const char *local_name)
: "enabled");
}
: "enabled");
}
@@
-2354,7
+2354,7
@@
diff --git a/generator.c b/generator.c
dflt_perms = (ACCESSPERMS & ~orig_umask);
do {
dflt_perms = (ACCESSPERMS & ~orig_umask);
do {
-@@ -239
3,6 +2403
,9 @@ void generate_files(int f_out, const char *local_name)
+@@ -239
5,6 +2405
,9 @@ void generate_files(int f_out, const char *local_name)
wait_for_receiver();
}
wait_for_receiver();
}
@@
-2469,7
+2469,7
@@
diff --git a/main.c b/main.c
diff --git a/options.c b/options.c
--- a/options.c
+++ b/options.c
diff --git a/options.c b/options.c
--- a/options.c
+++ b/options.c
-@@ -8
6,6 +86
,7 @@ int am_root = 0; /* 0 = normal, 1 = root, 2 = --super, -1 = --fake-super */
+@@ -8
7,6 +87
,7 @@ int am_root = 0; /* 0 = normal, 1 = root, 2 = --super, -1 = --fake-super */
int am_server = 0;
int am_sender = 0;
int am_starting_up = 1;
int am_server = 0;
int am_sender = 0;
int am_starting_up = 1;
@@
-2477,7
+2477,7
@@
diff --git a/options.c b/options.c
int relative_paths = -1;
int implied_dirs = 1;
int missing_args = 0; /* 0 = FERROR_XFER, 1 = ignore, 2 = delete */
int relative_paths = -1;
int implied_dirs = 1;
int missing_args = 0; /* 0 = FERROR_XFER, 1 = ignore, 2 = delete */
-@@ -10
0,6 +101
,7 @@ int use_qsort = 0;
+@@ -10
1,6 +102
,7 @@ int use_qsort = 0;
char *files_from = NULL;
int filesfrom_fd = -1;
char *filesfrom_host = NULL;
char *files_from = NULL;
int filesfrom_fd = -1;
char *filesfrom_host = NULL;
@@
-2485,7
+2485,7
@@
diff --git a/options.c b/options.c
int eol_nulls = 0;
int protect_args = -1;
int old_style_args = -1;
int eol_nulls = 0;
int protect_args = -1;
int old_style_args = -1;
-@@ -1
09,6 +111
,9 @@ int mkpath_dest_arg = 0;
+@@ -1
10,6 +112
,9 @@ int mkpath_dest_arg = 0;
int allow_inc_recurse = 1;
int xfer_dirs = -1;
int am_daemon = 0;
int allow_inc_recurse = 1;
int xfer_dirs = -1;
int am_daemon = 0;
@@
-2495,7
+2495,7
@@
diff --git a/options.c b/options.c
int connect_timeout = 0;
int keep_partial = 0;
int safe_symlinks = 0;
int connect_timeout = 0;
int keep_partial = 0;
int safe_symlinks = 0;
-@@ -28
8,6 +293
,7 @@ static struct output_struct debug_words[COUNT_DEBUG+1] = {
+@@ -28
9,6 +294
,7 @@ static struct output_struct debug_words[COUNT_DEBUG+1] = {
DEBUG_WORD(CHDIR, W_CLI|W_SRV, "Debug when the current directory changes"),
DEBUG_WORD(CONNECT, W_CLI, "Debug connection events (levels 1-2)"),
DEBUG_WORD(CMD, W_CLI, "Debug commands+options that are issued (levels 1-2)"),
DEBUG_WORD(CHDIR, W_CLI|W_SRV, "Debug when the current directory changes"),
DEBUG_WORD(CONNECT, W_CLI, "Debug connection events (levels 1-2)"),
DEBUG_WORD(CMD, W_CLI, "Debug commands+options that are issued (levels 1-2)"),
@@
-2503,7
+2503,7
@@
diff --git a/options.c b/options.c
DEBUG_WORD(DEL, W_REC, "Debug delete actions (levels 1-3)"),
DEBUG_WORD(DELTASUM, W_SND|W_REC, "Debug delta-transfer checksumming (levels 1-4)"),
DEBUG_WORD(DUP, W_REC, "Debug weeding of duplicate names"),
DEBUG_WORD(DEL, W_REC, "Debug delete actions (levels 1-3)"),
DEBUG_WORD(DELTASUM, W_SND|W_REC, "Debug delta-transfer checksumming (levels 1-4)"),
DEBUG_WORD(DUP, W_REC, "Debug weeding of duplicate names"),
-@@ -57
7,6 +583
,7 @@ enum {OPT_SERVER = 1000, OPT_DAEMON, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM,
+@@ -57
8,6 +584
,7 @@ enum {OPT_SERVER = 1000, OPT_DAEMON, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM,
OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW, OPT_MIN_SIZE, OPT_CHMOD,
OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_ONLY_WRITE_BATCH, OPT_MAX_SIZE,
OPT_NO_D, OPT_APPEND, OPT_NO_ICONV, OPT_INFO, OPT_DEBUG, OPT_BLOCK_SIZE,
OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW, OPT_MIN_SIZE, OPT_CHMOD,
OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_ONLY_WRITE_BATCH, OPT_MAX_SIZE,
OPT_NO_D, OPT_APPEND, OPT_NO_ICONV, OPT_INFO, OPT_DEBUG, OPT_BLOCK_SIZE,
@@
-2511,7
+2511,7
@@
diff --git a/options.c b/options.c
OPT_USERMAP, OPT_GROUPMAP, OPT_CHOWN, OPT_BWLIMIT, OPT_STDERR,
OPT_OLD_COMPRESS, OPT_NEW_COMPRESS, OPT_NO_COMPRESS, OPT_OLD_ARGS,
OPT_STOP_AFTER, OPT_STOP_AT,
OPT_USERMAP, OPT_GROUPMAP, OPT_CHOWN, OPT_BWLIMIT, OPT_STDERR,
OPT_OLD_COMPRESS, OPT_NEW_COMPRESS, OPT_NO_COMPRESS, OPT_OLD_ARGS,
OPT_STOP_AFTER, OPT_STOP_AT,
-@@ -73
3,6 +740
,10 @@ static struct poptOption long_options[] = {
+@@ -73
5,6 +742
,10 @@ static struct poptOption long_options[] = {
{"no-c", 0, POPT_ARG_VAL, &always_checksum, 0, 0, 0 },
{"checksum-choice", 0, POPT_ARG_STRING, &checksum_choice, 0, 0, 0 },
{"cc", 0, POPT_ARG_STRING, &checksum_choice, 0, 0, 0 },
{"no-c", 0, POPT_ARG_VAL, &always_checksum, 0, 0, 0 },
{"checksum-choice", 0, POPT_ARG_STRING, &checksum_choice, 0, 0, 0 },
{"cc", 0, POPT_ARG_STRING, &checksum_choice, 0, 0, 0 },
@@
-2522,7
+2522,7
@@
diff --git a/options.c b/options.c
{"block-size", 'B', POPT_ARG_STRING, 0, OPT_BLOCK_SIZE, 0, 0 },
{"compare-dest", 0, POPT_ARG_STRING, 0, OPT_COMPARE_DEST, 0, 0 },
{"copy-dest", 0, POPT_ARG_STRING, 0, OPT_COPY_DEST, 0, 0 },
{"block-size", 'B', POPT_ARG_STRING, 0, OPT_BLOCK_SIZE, 0, 0 },
{"compare-dest", 0, POPT_ARG_STRING, 0, OPT_COMPARE_DEST, 0, 0 },
{"copy-dest", 0, POPT_ARG_STRING, 0, OPT_COPY_DEST, 0, 0 },
-@@ -83
2,6 +843
,9 @@ static struct poptOption long_options[] = {
+@@ -83
4,6 +845
,9 @@ static struct poptOption long_options[] = {
{"dparam", 0, POPT_ARG_STRING, 0, OPT_DAEMON, 0, 0 },
{"detach", 0, POPT_ARG_NONE, 0, OPT_DAEMON, 0, 0 },
{"no-detach", 0, POPT_ARG_NONE, 0, OPT_DAEMON, 0, 0 },
{"dparam", 0, POPT_ARG_STRING, 0, OPT_DAEMON, 0, 0 },
{"detach", 0, POPT_ARG_NONE, 0, OPT_DAEMON, 0, 0 },
{"no-detach", 0, POPT_ARG_NONE, 0, OPT_DAEMON, 0, 0 },
@@
-2532,7
+2532,7
@@
diff --git a/options.c b/options.c
{0,0,0,0, 0, 0, 0}
};
{0,0,0,0, 0, 0, 0}
};
-@@ -86
0,6 +874
,31 @@ static struct poptOption long_daemon_options[] = {
+@@ -86
2,6 +876
,31 @@ static struct poptOption long_daemon_options[] = {
{0,0,0,0, 0, 0, 0}
};
{0,0,0,0, 0, 0, 0}
};
@@
-2564,7
+2564,7
@@
diff --git a/options.c b/options.c
static char err_buf[200];
static char err_buf[200];
-@@ -98
5,6 +1024
,8 @@ static void set_refuse_options(void)
+@@ -98
9,6 +1028
,8 @@ static void set_refuse_options(void)
parse_one_refuse_match(0, "iconv", list_end);
#endif
parse_one_refuse_match(0, "log-file*", list_end);
parse_one_refuse_match(0, "iconv", list_end);
#endif
parse_one_refuse_match(0, "log-file*", list_end);
@@
-2573,7
+2573,7
@@
diff --git a/options.c b/options.c
}
#ifndef SUPPORT_ATIMES
}
#ifndef SUPPORT_ATIMES
-@@ -129
2,6 +1333
,102 @@ static void create_refuse_error(int which)
+@@ -129
6,6 +1337
,102 @@ static void create_refuse_error(int which)
snprintf(err_buf + n, sizeof err_buf - n, " (-%c)\n", op->shortName);
}
snprintf(err_buf + n, sizeof err_buf - n, " (-%c)\n", op->shortName);
}
@@
-2676,7
+2676,7
@@
diff --git a/options.c b/options.c
/* This is used to make sure that --daemon & --server cannot be aliased to
* something else. These options have always disabled popt aliases for the
* parsing of a daemon or server command-line, but we have to make sure that
/* This is used to make sure that --daemon & --server cannot be aliased to
* something else. These options have always disabled popt aliases for the
* parsing of a daemon or server command-line, but we have to make sure that
-@@ -13
48,6 +1485
,12 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+@@ -13
52,6 +1489
,12 @@ int parse_arguments(int *argc_p, const char ***argv_p)
return 0;
}
return 0;
}
@@
-2689,7
+2689,7
@@
diff --git a/options.c b/options.c
set_refuse_options();
#ifdef ICONV_OPTION
set_refuse_options();
#ifdef ICONV_OPTION
-@@ -14
66,6 +1609
,12 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+@@ -14
70,6 +1613
,12 @@ int parse_arguments(int *argc_p, const char ***argv_p)
am_daemon = 1;
return 1;
am_daemon = 1;
return 1;
@@
-2702,7
+2702,7
@@
diff --git a/options.c b/options.c
case OPT_MODIFY_WINDOW:
/* The value has already been set by popt, but
* we need to remember that we're using a
case OPT_MODIFY_WINDOW:
/* The value has already been set by popt, but
* we need to remember that we're using a
-@@ -15
38,6 +1687
,10 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+@@ -15
42,6 +1691
,10 @@ int parse_arguments(int *argc_p, const char ***argv_p)
preserve_devices = preserve_specials = 0;
break;
preserve_devices = preserve_specials = 0;
break;
@@
-2791,7
+2791,7
@@
diff --git a/receiver.c b/receiver.c
progress_init();
while (1) {
progress_init();
while (1) {
-@@ -89
3,6 +903
,8 @@ int recv_files(int f_in, int f_out, char *local_name)
+@@ -89
5,6 +905
,8 @@ int recv_files(int f_in, int f_out, char *local_name)
do_unlink(partialptr);
handle_partial_dir(partialptr, PDIR_DELETE);
}
do_unlink(partialptr);
handle_partial_dir(partialptr, PDIR_DELETE);
}
@@
-2800,7
+2800,7
@@
diff --git a/receiver.c b/receiver.c
} else if (keep_partial && partialptr && (!one_inplace || delay_updates)) {
if (!handle_partial_dir(partialptr, PDIR_CREATE)) {
rprintf(FERROR,
} else if (keep_partial && partialptr && (!one_inplace || delay_updates)) {
if (!handle_partial_dir(partialptr, PDIR_CREATE)) {
rprintf(FERROR,
-@@ -90
6,6 +918
,8 @@ int recv_files(int f_in, int f_out, char *local_name)
+@@ -90
8,6 +920
,8 @@ int recv_files(int f_in, int f_out, char *local_name)
recv_ok = -1;
else if (delay_updates && recv_ok) {
bitbag_set_bit(delayed_bits, ndx);
recv_ok = -1;
else if (delay_updates && recv_ok) {
bitbag_set_bit(delayed_bits, ndx);
@@
-2812,7
+2812,7
@@
diff --git a/receiver.c b/receiver.c
diff --git a/rsync.1.md b/rsync.1.md
--- a/rsync.1.md
+++ b/rsync.1.md
diff --git a/rsync.1.md b/rsync.1.md
--- a/rsync.1.md
+++ b/rsync.1.md
-@@ -3
89,6 +389,9 @@ has its own detailed description later in this man
page.
+@@ -3
90,6 +390,9 @@ has its own detailed description later in this man
page.
--dry-run, -n perform a trial run with no changes made
--whole-file, -W copy files whole (w/o delta-xfer algorithm)
--checksum-choice=STR choose the checksum algorithm (aka --cc)
--dry-run, -n perform a trial run with no changes made
--whole-file, -W copy files whole (w/o delta-xfer algorithm)
--checksum-choice=STR choose the checksum algorithm (aka --cc)
@@
-3203,7
+3203,7
@@
diff --git a/usage.c b/usage.c
#ifndef USE_ROLL_SIMD
@@ -261,6 +271,14 @@ void daemon_usage(enum logcode F)
#ifndef USE_ROLL_SIMD
@@ -261,6 +271,14 @@ void daemon_usage(enum logcode F)
- rprintf(F,"daemon-specific rsync options. See also the rsyncd.conf(5) man
page.\n");
+ rprintf(F,"daemon-specific rsync options. See also the rsyncd.conf(5) manpage.\n");
}
+void dbonly_usage(enum logcode F)
}
+void dbonly_usage(enum logcode F)
diff --git
a/detect-renamed-lax.diff
b/detect-renamed-lax.diff
index 533a1bc5f02b5c38e4b262978b156db3055b0de1..4b8a4f77058eefd08258c771b992302c3edfdffb 100644
(file)
--- a/
detect-renamed-lax.diff
+++ b/
detect-renamed-lax.diff
@@
-35,7
+35,7
@@
diff --git a/generator.c b/generator.c
diff = u_strcmp(fmid->basename, f->basename);
if (diff == 0) {
good_match = mid;
diff = u_strcmp(fmid->basename, f->basename);
if (diff == 0) {
good_match = mid;
-@@ -198
2,6 +1984
,21 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
+@@ -198
8,6 +1990
,21 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
fnamecmp = partialptr;
fnamecmp_type = FNAMECMP_PARTIAL_DIR;
statret = 0;
fnamecmp = partialptr;
fnamecmp_type = FNAMECMP_PARTIAL_DIR;
statret = 0;
@@
-60,7
+60,7
@@
diff --git a/generator.c b/generator.c
diff --git a/options.c b/options.c
--- a/options.c
+++ b/options.c
diff --git a/options.c b/options.c
--- a/options.c
+++ b/options.c
-@@ -7
38,7 +738
,9 @@ static struct poptOption long_options[] = {
+@@ -7
40,7 +740
,9 @@ static struct poptOption long_options[] = {
{"compare-dest", 0, POPT_ARG_STRING, 0, OPT_COMPARE_DEST, 0, 0 },
{"copy-dest", 0, POPT_ARG_STRING, 0, OPT_COPY_DEST, 0, 0 },
{"link-dest", 0, POPT_ARG_STRING, 0, OPT_LINK_DEST, 0, 0 },
{"compare-dest", 0, POPT_ARG_STRING, 0, OPT_COMPARE_DEST, 0, 0 },
{"copy-dest", 0, POPT_ARG_STRING, 0, OPT_COPY_DEST, 0, 0 },
{"link-dest", 0, POPT_ARG_STRING, 0, OPT_LINK_DEST, 0, 0 },
@@
-71,7
+71,7
@@
diff --git a/options.c b/options.c
{"fuzzy", 'y', POPT_ARG_NONE, 0, 'y', 0, 0 },
{"no-fuzzy", 0, POPT_ARG_VAL, &fuzzy_basis, 0, 0, 0 },
{"no-y", 0, POPT_ARG_VAL, &fuzzy_basis, 0, 0, 0 },
{"fuzzy", 'y', POPT_ARG_NONE, 0, 'y', 0, 0 },
{"no-fuzzy", 0, POPT_ARG_VAL, &fuzzy_basis, 0, 0, 0 },
{"no-y", 0, POPT_ARG_VAL, &fuzzy_basis, 0, 0, 0 },
-@@ -27
89,8 +2791
,14 @@ void server_options(char **args, int *argc_p)
+@@ -27
93,8 +2795
,14 @@ void server_options(char **args, int *argc_p)
args[ac++] = "--super";
if (size_only)
args[ac++] = "--size-only";
args[ac++] = "--super";
if (size_only)
args[ac++] = "--size-only";
@@
-91,7
+91,7
@@
diff --git a/options.c b/options.c
diff --git a/rsync.1.md b/rsync.1.md
--- a/rsync.1.md
+++ b/rsync.1.md
diff --git a/rsync.1.md b/rsync.1.md
--- a/rsync.1.md
+++ b/rsync.1.md
-@@ -42
7,6 +427,8 @@ has its own detailed description later in this man
page.
+@@ -42
8,6 +428,8 @@ has its own detailed description later in this man
page.
--temp-dir=DIR, -T create temporary files in directory DIR
--fuzzy, -y find similar file for basis if no dest file
--detect-renamed try to find renamed files to speed the xfer
--temp-dir=DIR, -T create temporary files in directory DIR
--fuzzy, -y find similar file for basis if no dest file
--detect-renamed try to find renamed files to speed the xfer
@@
-100,7
+100,7
@@
diff --git a/rsync.1.md b/rsync.1.md
--compare-dest=DIR also compare destination files relative to DIR
--copy-dest=DIR ... and include copies of unchanged files
--link-dest=DIR hardlink to files in DIR when unchanged
--compare-dest=DIR also compare destination files relative to DIR
--copy-dest=DIR ... and include copies of unchanged files
--link-dest=DIR hardlink to files in DIR when unchanged
-@@ -24
55,6 +2457
,20 @@ your home directory (remove the '=' for that).
+@@ -24
64,6 +2466
,20 @@ your home directory (remove the '=' for that).
otential alternate-basis files will be removed as the transfer progresses.
This option conflicts with [`--inplace`](#opt) and [`--append`](#opt).
otential alternate-basis files will be removed as the transfer progresses.
This option conflicts with [`--inplace`](#opt) and [`--append`](#opt).
diff --git
a/detect-renamed.diff
b/detect-renamed.diff
index bb06899e006b23d2badcf353163b610d30ce5c97..f898d36049baeb3074a4651b6b009456bd23664f 100644
(file)
--- a/
detect-renamed.diff
+++ b/
detect-renamed.diff
@@
-38,7
+38,7
@@
TODO:
a file that can't use it, while missing out on giving it to a file
that could use it.
a file that can't use it, while missing out on giving it to a file
that could use it.
-based-on:
55b2a06812e39f15f52e92b979600cb82be210cb
+based-on:
d821e4cbfbc66848cdf91a336af26fdb89dd9a8f
diff --git a/backup.c b/backup.c
--- a/backup.c
+++ b/backup.c
diff --git a/backup.c b/backup.c
--- a/backup.c
+++ b/backup.c
@@
-132,7
+132,7
@@
diff --git a/delete.c b/delete.c
diff --git a/flist.c b/flist.c
--- a/flist.c
+++ b/flist.c
diff --git a/flist.c b/flist.c
--- a/flist.c
+++ b/flist.c
-@@ -6
4,6 +64
,7 @@ extern int non_perishable_cnt;
+@@ -6
5,6 +65
,7 @@ extern int non_perishable_cnt;
extern int prune_empty_dirs;
extern int copy_links;
extern int copy_unsafe_links;
extern int prune_empty_dirs;
extern int copy_links;
extern int copy_unsafe_links;
@@
-140,7
+140,7
@@
diff --git a/flist.c b/flist.c
extern int protocol_version;
extern int sanitize_paths;
extern int munge_symlinks;
extern int protocol_version;
extern int sanitize_paths;
extern int munge_symlinks;
-@@ -13
0,6 +131
,8 @@ static int64 tmp_dev = -1, tmp_ino;
+@@ -13
1,6 +132
,8 @@ static int64 tmp_dev = -1, tmp_ino;
#endif
static char tmp_sum[MAX_DIGEST_LEN];
#endif
static char tmp_sum[MAX_DIGEST_LEN];
@@
-149,7
+149,7
@@
diff --git a/flist.c b/flist.c
static char empty_sum[MAX_DIGEST_LEN];
static int flist_count_offset; /* for --delete --progress */
static int show_filelist_progress;
static char empty_sum[MAX_DIGEST_LEN];
static int flist_count_offset; /* for --delete --progress */
static int show_filelist_progress;
-@@ -27
7,6 +280
,45 @@ static inline int is_excluded(const char *fname, int is_dir, int filter_level)
+@@ -27
8,6 +281
,45 @@ static inline int is_excluded(const char *fname, int is_dir, int filter_level)
return name_is_excluded(fname, is_dir ? NAME_IS_DIR : NAME_IS_FILE, filter_level);
}
return name_is_excluded(fname, is_dir ? NAME_IS_DIR : NAME_IS_FILE, filter_level);
}
@@
-195,7
+195,7
@@
diff --git a/flist.c b/flist.c
static void send_directory(int f, struct file_list *flist,
char *fbuf, int len, int flags);
static void send_directory(int f, struct file_list *flist,
char *fbuf, int len, int flags);
-@@ -2
682,6 +2724
,23 @@ struct file_list *recv_file_list(int f, int dir_ndx)
+@@ -2
707,6 +2749
,23 @@ struct file_list *recv_file_list(int f, int dir_ndx)
* for a non-relative transfer in recv_file_entry(). */
flist_sort_and_clean(flist, relative_paths);
* for a non-relative transfer in recv_file_entry(). */
flist_sort_and_clean(flist, relative_paths);
@@
-532,7
+532,7
@@
diff --git a/generator.c b/generator.c
rsyserr(FERROR_XFER, stat_errno, "recv_generator: failed to stat %s",
full_fname(fname));
goto cleanup;
rsyserr(FERROR_XFER, stat_errno, "recv_generator: failed to stat %s",
full_fname(fname));
goto cleanup;
-@@ -225
1,6 +2402
,12 @@ void generate_files(int f_out, const char *local_name)
+@@ -225
3,6 +2404
,12 @@ void generate_files(int f_out, const char *local_name)
if (DEBUG_GTE(GENR, 1))
rprintf(FINFO, "generator starting pid=%d\n", (int)getpid());
if (DEBUG_GTE(GENR, 1))
rprintf(FINFO, "generator starting pid=%d\n", (int)getpid());
@@
-545,7
+545,7
@@
diff --git a/generator.c b/generator.c
if (delete_before && !solo_file && cur_flist->used > 0)
do_delete_pass();
if (delete_during == 2) {
if (delete_before && !solo_file && cur_flist->used > 0)
do_delete_pass();
if (delete_during == 2) {
-@@ -22
59,7 +2416
,7 @@ void generate_files(int f_out, const char *local_name)
+@@ -22
61,7 +2418
,7 @@ void generate_files(int f_out, const char *local_name)
}
info_levels[INFO_FLIST] = info_levels[INFO_PROGRESS] = 0;
}
info_levels[INFO_FLIST] = info_levels[INFO_PROGRESS] = 0;
@@
-554,7
+554,7
@@
diff --git a/generator.c b/generator.c
whole_file = 0;
if (DEBUG_GTE(FLIST, 1)) {
rprintf(FINFO, "delta-transmission %s\n",
whole_file = 0;
if (DEBUG_GTE(FLIST, 1)) {
rprintf(FINFO, "delta-transmission %s\n",
-@@ -229
5,7 +2452
,7 @@ void generate_files(int f_out, const char *local_name)
+@@ -229
7,7 +2454
,7 @@ void generate_files(int f_out, const char *local_name)
dirdev = MAKEDEV(DEV_MAJOR(devp), DEV_MINOR(devp));
} else
dirdev = MAKEDEV(0, 0);
dirdev = MAKEDEV(DEV_MAJOR(devp), DEV_MINOR(devp));
} else
dirdev = MAKEDEV(0, 0);
@@
-563,7
+563,7
@@
diff --git a/generator.c b/generator.c
} else
change_local_filter_dir(fbuf, strlen(fbuf), F_DEPTH(fp));
}
} else
change_local_filter_dir(fbuf, strlen(fbuf), F_DEPTH(fp));
}
-@@ -234
2,7 +2499
,21 @@ void generate_files(int f_out, const char *local_name)
+@@ -234
4,7 +2501
,21 @@ void generate_files(int f_out, const char *local_name)
} while ((cur_flist = cur_flist->next) != NULL);
if (delete_during)
} while ((cur_flist = cur_flist->next) != NULL);
if (delete_during)
@@
-601,7
+601,7
@@
diff --git a/main.c b/main.c
diff --git a/options.c b/options.c
--- a/options.c
+++ b/options.c
diff --git a/options.c b/options.c
--- a/options.c
+++ b/options.c
-@@ -8
7,6 +87
,7 @@ int am_server = 0;
+@@ -8
8,6 +88
,7 @@ int am_server = 0;
int am_sender = 0;
int am_starting_up = 1;
int relative_paths = -1;
int am_sender = 0;
int am_starting_up = 1;
int relative_paths = -1;
@@
-609,7
+609,7
@@
diff --git a/options.c b/options.c
int implied_dirs = 1;
int missing_args = 0; /* 0 = FERROR_XFER, 1 = ignore, 2 = delete */
int numeric_ids = 0;
int implied_dirs = 1;
int missing_args = 0; /* 0 = FERROR_XFER, 1 = ignore, 2 = delete */
int numeric_ids = 0;
-@@ -73
7,6 +738
,7 @@ static struct poptOption long_options[] = {
+@@ -73
9,6 +740
,7 @@ static struct poptOption long_options[] = {
{"compare-dest", 0, POPT_ARG_STRING, 0, OPT_COMPARE_DEST, 0, 0 },
{"copy-dest", 0, POPT_ARG_STRING, 0, OPT_COPY_DEST, 0, 0 },
{"link-dest", 0, POPT_ARG_STRING, 0, OPT_LINK_DEST, 0, 0 },
{"compare-dest", 0, POPT_ARG_STRING, 0, OPT_COMPARE_DEST, 0, 0 },
{"copy-dest", 0, POPT_ARG_STRING, 0, OPT_COPY_DEST, 0, 0 },
{"link-dest", 0, POPT_ARG_STRING, 0, OPT_LINK_DEST, 0, 0 },
@@
-617,7
+617,7
@@
diff --git a/options.c b/options.c
{"fuzzy", 'y', POPT_ARG_NONE, 0, 'y', 0, 0 },
{"no-fuzzy", 0, POPT_ARG_VAL, &fuzzy_basis, 0, 0, 0 },
{"no-y", 0, POPT_ARG_VAL, &fuzzy_basis, 0, 0, 0 },
{"fuzzy", 'y', POPT_ARG_NONE, 0, 'y', 0, 0 },
{"no-fuzzy", 0, POPT_ARG_VAL, &fuzzy_basis, 0, 0, 0 },
{"no-y", 0, POPT_ARG_VAL, &fuzzy_basis, 0, 0, 0 },
-@@ -237
1,7 +2373
,7 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+@@ -237
5,7 +2377
,7 @@ int parse_arguments(int *argc_p, const char ***argv_p)
inplace = 1;
}
inplace = 1;
}
@@
-626,7
+626,7
@@
diff --git a/options.c b/options.c
partial_dir = tmp_partialdir;
if (inplace) {
partial_dir = tmp_partialdir;
if (inplace) {
-@@ -238
0,6 +2382
,7 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+@@ -238
4,6 +2386
,7 @@ int parse_arguments(int *argc_p, const char ***argv_p)
snprintf(err_buf, sizeof err_buf,
"--%s cannot be used with --%s\n",
append_mode ? "append" : "inplace",
snprintf(err_buf, sizeof err_buf,
"--%s cannot be used with --%s\n",
append_mode ? "append" : "inplace",
@@
-634,7
+634,7
@@
diff --git a/options.c b/options.c
delay_updates ? "delay-updates" : "partial-dir");
return 0;
}
delay_updates ? "delay-updates" : "partial-dir");
return 0;
}
-@@ -27
86,6 +2789
,8 @@ void server_options(char **args, int *argc_p)
+@@ -27
90,6 +2793
,8 @@ void server_options(char **args, int *argc_p)
args[ac++] = "--super";
if (size_only)
args[ac++] = "--size-only";
args[ac++] = "--super";
if (size_only)
args[ac++] = "--size-only";
@@
-658,7
+658,7
@@
diff --git a/receiver.c b/receiver.c
diff --git a/rsync.1.md b/rsync.1.md
--- a/rsync.1.md
+++ b/rsync.1.md
diff --git a/rsync.1.md b/rsync.1.md
--- a/rsync.1.md
+++ b/rsync.1.md
-@@ -42
6,6 +426,7 @@ has its own detailed description later in this man
page.
+@@ -42
7,6 +427,7 @@ has its own detailed description later in this man
page.
--modify-window=NUM, -@ set the accuracy for mod-time comparisons
--temp-dir=DIR, -T create temporary files in directory DIR
--fuzzy, -y find similar file for basis if no dest file
--modify-window=NUM, -@ set the accuracy for mod-time comparisons
--temp-dir=DIR, -T create temporary files in directory DIR
--fuzzy, -y find similar file for basis if no dest file
@@
-666,7
+666,7
@@
diff --git a/rsync.1.md b/rsync.1.md
--compare-dest=DIR also compare destination files relative to DIR
--copy-dest=DIR ... and include copies of unchanged files
--link-dest=DIR hardlink to files in DIR when unchanged
--compare-dest=DIR also compare destination files relative to DIR
--copy-dest=DIR ... and include copies of unchanged files
--link-dest=DIR hardlink to files in DIR when unchanged
-@@ -24
38,6 +2439
,22 @@ your home directory (remove the '=' for that).
+@@ -24
47,6 +2448
,22 @@ your home directory (remove the '=' for that).
potential fuzzy-match files, so either use [`--delete-after`](#opt) or
specify some filename exclusions if you need to prevent this.
potential fuzzy-match files, so either use [`--delete-after`](#opt) or
specify some filename exclusions if you need to prevent this.
@@
-739,7
+739,7
@@
diff --git a/util1.c b/util1.c
ret = -ret - 1;
else
ret++;
ret = -ret - 1;
else
ret++;
-@@ -11
76,6 +1176
,32 @@ char *normalize_path(char *path, BOOL force_newbuf, unsigned int *len_ptr)
+@@ -11
97,6 +1197
,32 @@ char *normalize_path(char *path, BOOL force_newbuf, unsigned int *len_ptr)
return path;
}
return path;
}
@@
-772,7
+772,7
@@
diff --git a/util1.c b/util1.c
/**
* Return a quoted string with the full pathname of the indicated filename.
* The string " (in MODNAME)" may also be appended. The returned pointer
/**
* Return a quoted string with the full pathname of the indicated filename.
* The string " (in MODNAME)" may also be appended. The returned pointer
-@@ -12
69,7 +1295
,7 @@ int handle_partial_dir(const char *fname, int create)
+@@ -12
90,7 +1316
,7 @@ int handle_partial_dir(const char *fname, int create)
}
statret = -1;
}
}
statret = -1;
}
diff --git
a/direct-io.diff
b/direct-io.diff
index 7dff6218aa4e747b35f5217e7f5c19d3cafe3816..f0f1d15dc5ee432b367f55af38cd8242defffe05 100644
(file)
--- a/
direct-io.diff
+++ b/
direct-io.diff
@@
-10,7
+10,7
@@
To use this patch, run these commands for a successful build:
./configure (optional if already run)
make
./configure (optional if already run)
make
-based-on:
55b2a06812e39f15f52e92b979600cb82be210cb
+based-on:
d821e4cbfbc66848cdf91a336af26fdb89dd9a8f
diff --git a/options.c b/options.c
--- a/options.c
+++ b/options.c
diff --git a/options.c b/options.c
--- a/options.c
+++ b/options.c
@@
-22,7
+22,7
@@
diff --git a/options.c b/options.c
extern int module_id;
extern int local_server;
extern int sanitize_paths;
extern int module_id;
extern int local_server;
extern int sanitize_paths;
-@@ -7
58,6 +759
,8 @@ static struct poptOption long_options[] = {
+@@ -7
60,6 +761
,8 @@ static struct poptOption long_options[] = {
{"partial-dir", 0, POPT_ARG_STRING, &partial_dir, 0, 0, 0 },
{"delay-updates", 0, POPT_ARG_VAL, &delay_updates, 1, 0, 0 },
{"no-delay-updates", 0, POPT_ARG_VAL, &delay_updates, 0, 0, 0 },
{"partial-dir", 0, POPT_ARG_STRING, &partial_dir, 0, 0, 0 },
{"delay-updates", 0, POPT_ARG_VAL, &delay_updates, 1, 0, 0 },
{"no-delay-updates", 0, POPT_ARG_VAL, &delay_updates, 0, 0, 0 },
@@
-34,7
+34,7
@@
diff --git a/options.c b/options.c
diff --git a/rsync.1.md b/rsync.1.md
--- a/rsync.1.md
+++ b/rsync.1.md
diff --git a/rsync.1.md b/rsync.1.md
--- a/rsync.1.md
+++ b/rsync.1.md
-@@ -41
4,6 +414,7 @@ has its own detailed description later in this man
page.
+@@ -41
5,6 +415,7 @@ has its own detailed description later in this man
page.
--partial keep partially transferred files
--partial-dir=DIR put a partially transferred file into DIR
--delay-updates put all updated files into place at end
--partial keep partially transferred files
--partial-dir=DIR put a partially transferred file into DIR
--delay-updates put all updated files into place at end
@@
-42,7
+42,7
@@
diff --git a/rsync.1.md b/rsync.1.md
--prune-empty-dirs, -m prune empty directory chains from file-list
--numeric-ids don't map uid/gid values by user/group name
--usermap=STRING custom username mapping
--prune-empty-dirs, -m prune empty directory chains from file-list
--numeric-ids don't map uid/gid values by user/group name
--usermap=STRING custom username mapping
-@@ -32
38,6 +3239
,17 @@ your home directory (remove the '=' for that).
+@@ -32
47,6 +3248
,17 @@ your home directory (remove the '=' for that).
update algorithm that is even more atomic (it uses [`--link-dest`](#opt)
and a parallel hierarchy of files).
update algorithm that is even more atomic (it uses [`--link-dest`](#opt)
and a parallel hierarchy of files).
diff --git
a/downdate.diff
b/downdate.diff
index c0a05f4c8d0ce131579cd2d8456aaaa112000733..1dfbe6fcbdb1c0d8bc0d139c7c08c1361c51cb1c 100644
(file)
--- a/
downdate.diff
+++ b/
downdate.diff
@@
-7,7
+7,7
@@
To use this patch, run these commands for a successful build:
./configure (optional if already run)
make
./configure (optional if already run)
make
-based-on:
55b2a06812e39f15f52e92b979600cb82be210cb
+based-on:
d821e4cbfbc66848cdf91a336af26fdb89dd9a8f
diff --git a/generator.c b/generator.c
--- a/generator.c
+++ b/generator.c
diff --git a/generator.c b/generator.c
--- a/generator.c
+++ b/generator.c
@@
-32,7
+32,7
@@
diff --git a/generator.c b/generator.c
fnamecmp_type = FNAMECMP_FNAME;
if (statret == 0 && !(stype == FT_REG || (write_devices && stype == FT_DEVICE))) {
fnamecmp_type = FNAMECMP_FNAME;
if (statret == 0 && !(stype == FT_REG || (write_devices && stype == FT_DEVICE))) {
-@@ -215
7,6 +2164
,7 @@ void check_for_finished_files(int itemizing, enum logcode code, int check_redo)
+@@ -215
9,6 +2166
,7 @@ void check_for_finished_files(int itemizing, enum logcode code, int check_redo)
ignore_existing = -ignore_existing;
ignore_non_existing = -ignore_non_existing;
update_only = -update_only;
ignore_existing = -ignore_existing;
ignore_non_existing = -ignore_non_existing;
update_only = -update_only;
@@
-40,7
+40,7
@@
diff --git a/generator.c b/generator.c
always_checksum = -always_checksum;
size_only = -size_only;
append_mode = -append_mode;
always_checksum = -always_checksum;
size_only = -size_only;
append_mode = -append_mode;
-@@ -218
2,6 +2190
,7 @@ void check_for_finished_files(int itemizing, enum logcode code, int check_redo)
+@@ -218
4,6 +2192
,7 @@ void check_for_finished_files(int itemizing, enum logcode code, int check_redo)
ignore_existing = -ignore_existing;
ignore_non_existing = -ignore_non_existing;
update_only = -update_only;
ignore_existing = -ignore_existing;
ignore_non_existing = -ignore_non_existing;
update_only = -update_only;
@@
-51,7
+51,7
@@
diff --git a/generator.c b/generator.c
diff --git a/options.c b/options.c
--- a/options.c
+++ b/options.c
diff --git a/options.c b/options.c
--- a/options.c
+++ b/options.c
-@@ -6
4,6 +64
,7 @@ int preserve_crtimes = 0;
+@@ -6
5,6 +65
,7 @@ int preserve_crtimes = 0;
int omit_dir_times = 0;
int omit_link_times = 0;
int update_only = 0;
int omit_dir_times = 0;
int omit_link_times = 0;
int update_only = 0;
@@
-59,7
+59,7
@@
diff --git a/options.c b/options.c
int open_noatime = 0;
int cvs_exclude = 0;
int dry_run = 0;
int open_noatime = 0;
int cvs_exclude = 0;
int dry_run = 0;
-@@ -68
7,6 +688
,7 @@ static struct poptOption long_options[] = {
+@@ -68
9,6 +690
,7 @@ static struct poptOption long_options[] = {
{"no-one-file-system",0, POPT_ARG_VAL, &one_file_system, 0, 0, 0 },
{"no-x", 0, POPT_ARG_VAL, &one_file_system, 0, 0, 0 },
{"update", 'u', POPT_ARG_NONE, &update_only, 0, 0, 0 },
{"no-one-file-system",0, POPT_ARG_VAL, &one_file_system, 0, 0, 0 },
{"no-x", 0, POPT_ARG_VAL, &one_file_system, 0, 0, 0 },
{"update", 'u', POPT_ARG_NONE, &update_only, 0, 0, 0 },
@@
-70,7
+70,7
@@
diff --git a/options.c b/options.c
diff --git a/rsync.1.md b/rsync.1.md
--- a/rsync.1.md
+++ b/rsync.1.md
diff --git a/rsync.1.md b/rsync.1.md
--- a/rsync.1.md
+++ b/rsync.1.md
-@@ -351,6 +351,7 @@ has its own detailed description later in this man
page.
+@@ -351,6 +351,7 @@ has its own detailed description later in this manpage.
--backup-dir=DIR make backups into hierarchy based in DIR
--suffix=SUFFIX backup suffix (default ~ w/o --backup-dir)
--update, -u skip files that are newer on the receiver
--backup-dir=DIR make backups into hierarchy based in DIR
--suffix=SUFFIX backup suffix (default ~ w/o --backup-dir)
--update, -u skip files that are newer on the receiver
diff --git
a/fileflags.diff
b/fileflags.diff
index f2ccc59342366aff4dce330b2c5f0b13fe34680e..311cefa7764c2f203fe957b5e61c11b3afcaecc5 100644
(file)
--- a/
fileflags.diff
+++ b/
fileflags.diff
@@
-7,7
+7,7
@@
To use this patch, run these commands for a successful build:
./configure (optional if already run)
make
./configure (optional if already run)
make
-based-on:
55b2a06812e39f15f52e92b979600cb82be210cb
+based-on:
d821e4cbfbc66848cdf91a336af26fdb89dd9a8f
diff --git a/compat.c b/compat.c
--- a/compat.c
+++ b/compat.c
diff --git a/compat.c b/compat.c
--- a/compat.c
+++ b/compat.c
@@
-104,7
+104,7
@@
diff --git a/delete.c b/delete.c
diff --git a/flist.c b/flist.c
--- a/flist.c
+++ b/flist.c
diff --git a/flist.c b/flist.c
--- a/flist.c
+++ b/flist.c
-@@ -5
2,6 +52
,7 @@ extern int preserve_links;
+@@ -5
3,6 +53
,7 @@ extern int preserve_links;
extern int preserve_hard_links;
extern int preserve_devices;
extern int preserve_specials;
extern int preserve_hard_links;
extern int preserve_devices;
extern int preserve_specials;
@@
-112,7
+112,7
@@
diff --git a/flist.c b/flist.c
extern int delete_during;
extern int missing_args;
extern int eol_nulls;
extern int delete_during;
extern int missing_args;
extern int eol_nulls;
-@@ -38
5,6 +386
,9 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
+@@ -38
6,6 +387
,9 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
static time_t crtime;
#endif
static mode_t mode;
static time_t crtime;
#endif
static mode_t mode;
@@
-122,7
+122,7
@@
diff --git a/flist.c b/flist.c
#ifdef SUPPORT_HARD_LINKS
static int64 dev;
#endif
#ifdef SUPPORT_HARD_LINKS
static int64 dev;
#endif
-@@ -42
8,6 +432
,14 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
+@@ -42
9,6 +433
,14 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
xflags |= XMIT_SAME_MODE;
else
mode = file->mode;
xflags |= XMIT_SAME_MODE;
else
mode = file->mode;
@@
-137,7
+137,7
@@
diff --git a/flist.c b/flist.c
if (preserve_devices && IS_DEVICE(mode)) {
if (protocol_version < 28) {
if (preserve_devices && IS_DEVICE(mode)) {
if (protocol_version < 28) {
-@@ -5
89,6 +601
,10 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
+@@ -5
90,6 +602
,10 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
#endif
if (!(xflags & XMIT_SAME_MODE))
write_int(f, to_wire_mode(mode));
#endif
if (!(xflags & XMIT_SAME_MODE))
write_int(f, to_wire_mode(mode));
@@
-148,7
+148,7
@@
diff --git a/flist.c b/flist.c
if (atimes_ndx && !S_ISDIR(mode) && !(xflags & XMIT_SAME_ATIME))
write_varlong(f, atime, 4);
if (preserve_uid && !(xflags & XMIT_SAME_UID)) {
if (atimes_ndx && !S_ISDIR(mode) && !(xflags & XMIT_SAME_ATIME))
write_varlong(f, atime, 4);
if (preserve_uid && !(xflags & XMIT_SAME_UID)) {
-@@ -68
3,6 +699
,9 @@ static struct file_struct *recv_file_entry(int f, struct file_list *flist, int x
+@@ -68
4,6 +700
,9 @@ static struct file_struct *recv_file_entry(int f, struct file_list *flist, int x
static time_t crtime;
#endif
static mode_t mode;
static time_t crtime;
#endif
static mode_t mode;
@@
-158,7
+158,7
@@
diff --git a/flist.c b/flist.c
#ifdef SUPPORT_HARD_LINKS
static int64 dev;
#endif
#ifdef SUPPORT_HARD_LINKS
static int64 dev;
#endif
-@@ -
799,6 +818
,10 @@ static struct file_struct *recv_file_entry(int f, struct file_list *flist, int x
+@@ -
801,6 +820
,10 @@ static struct file_struct *recv_file_entry(int f, struct file_list *flist, int x
#ifdef SUPPORT_CRTIMES
if (crtimes_ndx)
crtime = F_CRTIME(first);
#ifdef SUPPORT_CRTIMES
if (crtimes_ndx)
crtime = F_CRTIME(first);
@@
-169,7
+169,7
@@
diff --git a/flist.c b/flist.c
#endif
if (preserve_uid)
uid = F_OWNER(first);
#endif
if (preserve_uid)
uid = F_OWNER(first);
-@@ -87
1,6 +894
,10 @@ static struct file_struct *recv_file_entry(int f, struct file_list *flist, int x
+@@ -87
4,6 +897
,10 @@ static struct file_struct *recv_file_entry(int f, struct file_list *flist, int x
if (chmod_modes && !S_ISLNK(mode) && mode)
mode = tweak_mode(mode, chmod_modes);
if (chmod_modes && !S_ISLNK(mode) && mode)
mode = tweak_mode(mode, chmod_modes);
@@
-180,7
+180,7
@@
diff --git a/flist.c b/flist.c
if (preserve_uid && !(xflags & XMIT_SAME_UID)) {
if (protocol_version < 30)
if (preserve_uid && !(xflags & XMIT_SAME_UID)) {
if (protocol_version < 30)
-@@ -10
29,6 +1056
,10 @@ static struct file_struct *recv_file_entry(int f, struct file_list *flist, int x
+@@ -10
42,6 +1069
,10 @@ static struct file_struct *recv_file_entry(int f, struct file_list *flist, int x
}
#endif
file->mode = mode;
}
#endif
file->mode = mode;
@@
-191,7
+191,7
@@
diff --git a/flist.c b/flist.c
if (preserve_uid)
F_OWNER(file) = uid;
if (preserve_gid) {
if (preserve_uid)
F_OWNER(file) = uid;
if (preserve_gid) {
-@@ -14
30,6 +1461
,10 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
+@@ -14
55,6 +1486
,10 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
}
#endif
file->mode = st.st_mode;
}
#endif
file->mode = st.st_mode;
@@
-205,7
+205,7
@@
diff --git a/flist.c b/flist.c
diff --git a/generator.c b/generator.c
--- a/generator.c
+++ b/generator.c
diff --git a/generator.c b/generator.c
--- a/generator.c
+++ b/generator.c
-@@ -43,10 +43,12 @@ extern int
writ
e_devices;
+@@ -43,10 +43,12 @@ extern int
preserv
e_devices;
extern int preserve_specials;
extern int preserve_hard_links;
extern int preserve_executability;
extern int preserve_specials;
extern int preserve_hard_links;
extern int preserve_executability;
@@
-280,7
+280,7
@@
diff --git a/generator.c b/generator.c
#ifdef SUPPORT_HARD_LINKS
if (preserve_hard_links && F_HLINK_NOT_FIRST(file)
#ifdef SUPPORT_HARD_LINKS
if (preserve_hard_links && F_HLINK_NOT_FIRST(file)
-@@ -210
2,17 +2126
,25 @@ static void touch_up_dirs(struct file_list *flist, int ndx)
+@@ -210
4,17 +2128
,25 @@ static void touch_up_dirs(struct file_list *flist, int ndx)
continue;
fname = f_name(file, NULL);
if (fix_dir_perms)
continue;
fname = f_name(file, NULL);
if (fix_dir_perms)
@@
-367,7
+367,7
@@
diff --git a/main.c b/main.c
diff --git a/options.c b/options.c
--- a/options.c
+++ b/options.c
diff --git a/options.c b/options.c
--- a/options.c
+++ b/options.c
-@@ -5
3,6 +53
,7 @@ int preserve_hard_links = 0;
+@@ -5
4,6 +54
,7 @@ int preserve_hard_links = 0;
int preserve_acls = 0;
int preserve_xattrs = 0;
int preserve_perms = 0;
int preserve_acls = 0;
int preserve_xattrs = 0;
int preserve_perms = 0;
@@
-375,7
+375,7
@@
diff --git a/options.c b/options.c
int preserve_executability = 0;
int preserve_devices = 0;
int preserve_specials = 0;
int preserve_executability = 0;
int preserve_devices = 0;
int preserve_specials = 0;
-@@ -9
4,6 +95
,7 @@ int msgs2stderr = 2; /* Default: send errors to stderr for local & remote-shell
+@@ -9
5,6 +96
,7 @@ int msgs2stderr = 2; /* Default: send errors to stderr for local & remote-shell
int saw_stderr_opt = 0;
int allow_8bit_chars = 0;
int force_delete = 0;
int saw_stderr_opt = 0;
int allow_8bit_chars = 0;
int force_delete = 0;
@@
-383,7
+383,7
@@
diff --git a/options.c b/options.c
int io_timeout = 0;
int prune_empty_dirs = 0;
int use_qsort = 0;
int io_timeout = 0;
int prune_empty_dirs = 0;
int use_qsort = 0;
-@@ -61
8,6 +620
,8 @@ static struct poptOption long_options[] = {
+@@ -61
9,6 +621
,8 @@ static struct poptOption long_options[] = {
{"perms", 'p', POPT_ARG_VAL, &preserve_perms, 1, 0, 0 },
{"no-perms", 0, POPT_ARG_VAL, &preserve_perms, 0, 0, 0 },
{"no-p", 0, POPT_ARG_VAL, &preserve_perms, 0, 0, 0 },
{"perms", 'p', POPT_ARG_VAL, &preserve_perms, 1, 0, 0 },
{"no-perms", 0, POPT_ARG_VAL, &preserve_perms, 0, 0, 0 },
{"no-p", 0, POPT_ARG_VAL, &preserve_perms, 0, 0, 0 },
@@
-392,7
+392,7
@@
diff --git a/options.c b/options.c
{"executability", 'E', POPT_ARG_NONE, &preserve_executability, 0, 0, 0 },
{"acls", 'A', POPT_ARG_NONE, 0, 'A', 0, 0 },
{"no-acls", 0, POPT_ARG_VAL, &preserve_acls, 0, 0, 0 },
{"executability", 'E', POPT_ARG_NONE, &preserve_executability, 0, 0, 0 },
{"acls", 'A', POPT_ARG_NONE, 0, 'A', 0, 0 },
{"no-acls", 0, POPT_ARG_VAL, &preserve_acls, 0, 0, 0 },
-@@ -71
5,6 +719
,12 @@ static struct poptOption long_options[] = {
+@@ -71
7,6 +721
,12 @@ static struct poptOption long_options[] = {
{"remove-source-files",0,POPT_ARG_VAL, &remove_source_files, 1, 0, 0 },
{"force", 0, POPT_ARG_VAL, &force_delete, 1, 0, 0 },
{"no-force", 0, POPT_ARG_VAL, &force_delete, 0, 0, 0 },
{"remove-source-files",0,POPT_ARG_VAL, &remove_source_files, 1, 0, 0 },
{"force", 0, POPT_ARG_VAL, &force_delete, 1, 0, 0 },
{"no-force", 0, POPT_ARG_VAL, &force_delete, 0, 0, 0 },
@@
-405,7
+405,7
@@
diff --git a/options.c b/options.c
{"ignore-errors", 0, POPT_ARG_VAL, &ignore_errors, 1, 0, 0 },
{"no-ignore-errors", 0, POPT_ARG_VAL, &ignore_errors, 0, 0, 0 },
{"max-delete", 0, POPT_ARG_INT, &max_delete, 0, 0, 0 },
{"ignore-errors", 0, POPT_ARG_VAL, &ignore_errors, 1, 0, 0 },
{"no-ignore-errors", 0, POPT_ARG_VAL, &ignore_errors, 0, 0, 0 },
{"max-delete", 0, POPT_ARG_INT, &max_delete, 0, 0, 0 },
-@@ -100
5,6 +1015
,14 @@ static void set_refuse_options(void)
+@@ -100
9,6 +1019
,14 @@ static void set_refuse_options(void)
#ifndef SUPPORT_CRTIMES
parse_one_refuse_match(0, "crtimes", list_end);
#endif
#ifndef SUPPORT_CRTIMES
parse_one_refuse_match(0, "crtimes", list_end);
#endif
@@
-420,7
+420,7
@@
diff --git a/options.c b/options.c
/* Now we use the descrip values to actually mark the options for refusal. */
for (op = long_options; op != list_end; op++) {
/* Now we use the descrip values to actually mark the options for refusal. */
for (op = long_options; op != list_end; op++) {
-@@ -268
5,6 +2703
,9 @@ void server_options(char **args, int *argc_p)
+@@ -268
9,6 +2707
,9 @@ void server_options(char **args, int *argc_p)
if (xfer_dirs && !recurse && delete_mode && am_sender)
args[ac++] = "--no-r";
if (xfer_dirs && !recurse && delete_mode && am_sender)
args[ac++] = "--no-r";
@@
-430,7
+430,7
@@
diff --git a/options.c b/options.c
if (do_compression && do_compression_level != CLVL_NOT_SPECIFIED) {
if (asprintf(&arg, "--compress-level=%d", do_compression_level) < 0)
goto oom;
if (do_compression && do_compression_level != CLVL_NOT_SPECIFIED) {
if (asprintf(&arg, "--compress-level=%d", do_compression_level) < 0)
goto oom;
-@@ -278
0,6 +2801
,16 @@ void server_options(char **args, int *argc_p)
+@@ -278
4,6 +2805
,16 @@ void server_options(char **args, int *argc_p)
args[ac++] = "--delete-excluded";
if (force_delete)
args[ac++] = "--force";
args[ac++] = "--delete-excluded";
if (force_delete)
args[ac++] = "--force";
@@
-450,7
+450,7
@@
diff --git a/options.c b/options.c
diff --git a/rsync.1.md b/rsync.1.md
--- a/rsync.1.md
+++ b/rsync.1.md
diff --git a/rsync.1.md b/rsync.1.md
--- a/rsync.1.md
+++ b/rsync.1.md
-@@ -366,6 +366,7 @@ has its own detailed description later in this man
page.
+@@ -366,6 +366,7 @@ has its own detailed description later in this manpage.
--keep-dirlinks, -K treat symlinked dir on receiver as dir
--hard-links, -H preserve hard links
--perms, -p preserve permissions
--keep-dirlinks, -K treat symlinked dir on receiver as dir
--hard-links, -H preserve hard links
--perms, -p preserve permissions
@@
-458,7
+458,7
@@
diff --git a/rsync.1.md b/rsync.1.md
--executability, -E preserve executability
--chmod=CHMOD affect file and/or directory permissions
--acls, -A preserve ACLs (implies --perms)
--executability, -E preserve executability
--chmod=CHMOD affect file and/or directory permissions
--acls, -A preserve ACLs (implies --perms)
-@@ -40
6,7 +407,10 @@ has its own detailed description later in this man
page.
+@@ -40
7,7 +408,10 @@ has its own detailed description later in this man
page.
--ignore-missing-args ignore missing source args without error
--delete-missing-args delete missing source args from destination
--ignore-errors delete even if there are I/O errors
--ignore-missing-args ignore missing source args without error
--delete-missing-args delete missing source args from destination
--ignore-errors delete even if there are I/O errors
@@
-470,7
+470,7
@@
diff --git a/rsync.1.md b/rsync.1.md
--max-delete=NUM don't delete more than NUM files
--max-size=SIZE don't transfer any file larger than SIZE
--min-size=SIZE don't transfer any file smaller than SIZE
--max-delete=NUM don't delete more than NUM files
--max-size=SIZE don't transfer any file larger than SIZE
--min-size=SIZE don't transfer any file smaller than SIZE
-@@ -73
8,6 +742
,7 @@ your home directory (remove the '=' for that).
+@@ -73
9,6 +743
,7 @@ your home directory (remove the '=' for that).
recursion and want to preserve almost everything. Be aware that it does
**not** include preserving ACLs (`-A`), xattrs (`-X`), atimes (`-U`),
crtimes (`-N`), nor the finding and preserving of hardlinks (`-H`).
recursion and want to preserve almost everything. Be aware that it does
**not** include preserving ACLs (`-A`), xattrs (`-X`), atimes (`-U`),
crtimes (`-N`), nor the finding and preserving of hardlinks (`-H`).
@@
-478,7
+478,7
@@
diff --git a/rsync.1.md b/rsync.1.md
The only exception to the above equivalence is when [`--files-from`](#opt)
is specified, in which case [`-r`](#opt) is not implied.
The only exception to the above equivalence is when [`--files-from`](#opt)
is specified, in which case [`-r`](#opt) is not implied.
-@@ -119
8,7 +1203
,7 @@ your home directory (remove the '=' for that).
+@@ -119
9,7 +1204
,7 @@ your home directory (remove the '=' for that).
Without this option, if the sending side has replaced a directory with a
symlink to a directory, the receiving side will delete anything that is in
the way of the new symlink, including a directory hierarchy (as long as
Without this option, if the sending side has replaced a directory with a
symlink to a directory, the receiving side will delete anything that is in
the way of the new symlink, including a directory hierarchy (as long as
@@
-487,7
+487,7
@@
diff --git a/rsync.1.md b/rsync.1.md
See also [`--keep-dirlinks`](#opt) for an analogous option for the
receiving side.
See also [`--keep-dirlinks`](#opt) for an analogous option for the
receiving side.
-@@ -139
3,6 +1398
,37 @@ your home directory (remove the '=' for that).
+@@ -139
4,6 +1399
,37 @@ your home directory (remove the '=' for that).
those used by [`--fake-super`](#opt)) unless you repeat the option (e.g. `-XX`).
This "copy all xattrs" mode cannot be used with [`--fake-super`](#opt).
those used by [`--fake-super`](#opt)) unless you repeat the option (e.g. `-XX`).
This "copy all xattrs" mode cannot be used with [`--fake-super`](#opt).
@@
-525,7
+525,7
@@
diff --git a/rsync.1.md b/rsync.1.md
0. `--chmod=CHMOD`
This option tells rsync to apply one or more comma-separated "chmod" modes
0. `--chmod=CHMOD`
This option tells rsync to apply one or more comma-separated "chmod" modes
-@@ -18
88,8 +1924
,8 @@ your home directory (remove the '=' for that).
+@@ -18
97,8 +1933
,8 @@ your home directory (remove the '=' for that).
[`--ignore-missing-args`](#opt) option a step farther: each missing arg
will become a deletion request of the corresponding destination file on the
receiving side (should it exist). If the destination file is a non-empty
[`--ignore-missing-args`](#opt) option a step farther: each missing arg
will become a deletion request of the corresponding destination file on the
receiving side (should it exist). If the destination file is a non-empty
@@
-536,7
+536,7
@@
diff --git a/rsync.1.md b/rsync.1.md
independent of any other type of delete processing.
The missing source files are represented by special file-list entries which
independent of any other type of delete processing.
The missing source files are represented by special file-list entries which
-@@ -190
0,14 +1936
,14 @@ your home directory (remove the '=' for that).
+@@ -190
9,14 +1945
,14 @@ your home directory (remove the '=' for that).
Tells [`--delete`](#opt) to go ahead and delete files even when there are
I/O errors.
Tells [`--delete`](#opt) to go ahead and delete files even when there are
I/O errors.
@@
-554,7
+554,7
@@
diff --git a/rsync.1.md b/rsync.1.md
[`--recursive`](#opt) option was also enabled.
0. `--max-delete=NUM`
[`--recursive`](#opt) option was also enabled.
0. `--max-delete=NUM`
-@@ -29
04,7 +2940
,7 @@ your home directory (remove the '=' for that).
+@@ -29
13,7 +2949
,7 @@ your home directory (remove the '=' for that).
also turns on the output of other verbose messages).
The "%i" escape has a cryptic output that is 11 letters long. The general
also turns on the output of other verbose messages).
The "%i" escape has a cryptic output that is 11 letters long. The general
diff --git
a/filter-attribute-mods.diff
b/filter-attribute-mods.diff
index 3a9c361c6efcad9fefc25cc19577f67a5b5fd9bc..c323b4993554380835d81a74787c0f9e501254a6 100644
(file)
--- a/
filter-attribute-mods.diff
+++ b/
filter-attribute-mods.diff
@@
-9,7
+9,7
@@
To use this patch, run these commands for a successful build:
./configure (optional if already run)
make
./configure (optional if already run)
make
-based-on:
55b2a06812e39f15f52e92b979600cb82be210cb
+based-on:
d821e4cbfbc66848cdf91a336af26fdb89dd9a8f
diff --git a/exclude.c b/exclude.c
--- a/exclude.c
+++ b/exclude.c
diff --git a/exclude.c b/exclude.c
--- a/exclude.c
+++ b/exclude.c
@@
-260,7
+260,7
@@
diff --git a/exclude.c b/exclude.c
diff --git a/flist.c b/flist.c
--- a/flist.c
+++ b/flist.c
diff --git a/flist.c b/flist.c
--- a/flist.c
+++ b/flist.c
-@@ -8
4,6 +84
,7 @@ extern struct chmod_mode_struct *chmod_modes;
+@@ -8
5,6 +85
,7 @@ extern struct chmod_mode_struct *chmod_modes;
extern filter_rule_list filter_list;
extern filter_rule_list daemon_filter_list;
extern filter_rule_list filter_list;
extern filter_rule_list daemon_filter_list;
@@
-268,7
+268,7
@@
diff --git a/flist.c b/flist.c
#ifdef ICONV_OPTION
extern int filesfrom_convert;
#ifdef ICONV_OPTION
extern int filesfrom_convert;
-@@ -12
31,7 +1232
,7 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
+@@ -12
44,7 +1245
,7 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
} else if (readlink_stat(thisname, &st, linkname) != 0) {
int save_errno = errno;
/* See if file is excluded before reporting an error. */
} else if (readlink_stat(thisname, &st, linkname) != 0) {
int save_errno = errno;
/* See if file is excluded before reporting an error. */
@@
-277,7
+277,7
@@
diff --git a/flist.c b/flist.c
&& (is_excluded(thisname, 0, filter_level)
|| is_excluded(thisname, 1, filter_level))) {
if (ignore_perishable && save_errno != ENOENT)
&& (is_excluded(thisname, 0, filter_level)
|| is_excluded(thisname, 1, filter_level))) {
if (ignore_perishable && save_errno != ENOENT)
-@@ -12
76,6 +1277
,12 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
+@@ -12
89,6 +1290
,12 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
if (filter_level == NO_FILTERS)
goto skip_filters;
if (filter_level == NO_FILTERS)
goto skip_filters;
@@
-290,7
+290,7
@@
diff --git a/flist.c b/flist.c
if (S_ISDIR(st.st_mode)) {
if (!xfer_dirs) {
if (S_ISDIR(st.st_mode)) {
if (!xfer_dirs) {
-@@ -1
496,12 +1503
,23 @@ static struct file_struct *send_file_name(int f, struct file_list *flist,
+@@ -1
521,12 +1528
,23 @@ static struct file_struct *send_file_name(int f, struct file_list *flist,
int flags, int filter_level)
{
struct file_struct *file;
int flags, int filter_level)
{
struct file_struct *file;
@@
-315,7
+315,7
@@
diff --git a/flist.c b/flist.c
file->mode = tweak_mode(file->mode, chmod_modes);
if (f >= 0) {
file->mode = tweak_mode(file->mode, chmod_modes);
if (f >= 0) {
-@@ -24
03,7 +2421
,7 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
+@@ -24
28,7 +2446
,7 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
struct file_struct *file;
file = send_file_name(f, flist, fbuf, &st,
FLAG_TOP_DIR | FLAG_CONTENT_DIR | flags,
struct file_struct *file;
file = send_file_name(f, flist, fbuf, &st,
FLAG_TOP_DIR | FLAG_CONTENT_DIR | flags,
@@
-324,7
+324,7
@@
diff --git a/flist.c b/flist.c
if (!file)
continue;
if (inc_recurse) {
if (!file)
continue;
if (inc_recurse) {
-@@ -24
17,7 +2435
,7 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
+@@ -24
42,7 +2460
,7 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
} else
send_if_directory(f, flist, file, fbuf, len, flags);
} else
} else
send_if_directory(f, flist, file, fbuf, len, flags);
} else
@@
-336,7
+336,7
@@
diff --git a/flist.c b/flist.c
diff --git a/rsync.1.md b/rsync.1.md
--- a/rsync.1.md
+++ b/rsync.1.md
diff --git a/rsync.1.md b/rsync.1.md
--- a/rsync.1.md
+++ b/rsync.1.md
-@@ -141
6,7 +1416
,9 @@ your home directory (remove the '=' for that).
+@@ -141
7,7 +1417
,9 @@ your home directory (remove the '=' for that).
> --chmod=D2775,F664
It is also legal to specify multiple `--chmod` options, as each additional
> --chmod=D2775,F664
It is also legal to specify multiple `--chmod` options, as each additional
@@
-347,7
+347,7
@@
diff --git a/rsync.1.md b/rsync.1.md
See the [`--perms`](#opt) and [`--executability`](#opt) options for how the
resulting permission value can be applied to the files in the transfer.
See the [`--perms`](#opt) and [`--executability`](#opt) options for how the
resulting permission value can be applied to the files in the transfer.
-@@ -28
38,6 +2840
,10 @@ your home directory (remove the '=' for that).
+@@ -28
47,6 +2849
,10 @@ your home directory (remove the '=' for that).
avoid a complaint about wildcard characters, but a modern rsync handles
this automatically.
avoid a complaint about wildcard characters, but a modern rsync handles
this automatically.
@@
-358,7
+358,7
@@
diff --git a/rsync.1.md b/rsync.1.md
0. `--timeout=SECONDS`
This option allows you to set a maximum I/O timeout in seconds. If no data
0. `--timeout=SECONDS`
This option allows you to set a maximum I/O timeout in seconds. If no data
-@@ -39
01,6 +3907
,15 @@ The following modifiers are accepted after a "`+`" or "`-`":
+@@ -39
10,6 +3916
,15 @@ The following modifiers are accepted after a "`+`" or "`-`":
like "CVS" and "`*.o`" are marked as perishable, and will not prevent a
directory that was removed on the source from being deleted on the
destination.
like "CVS" and "`*.o`" are marked as perishable, and will not prevent a
directory that was removed on the source from being deleted on the
destination.
@@
-374,7
+374,7
@@
diff --git a/rsync.1.md b/rsync.1.md
- An `x` indicates that a rule affects xattr names in xattr copy/delete
operations (and is thus ignored when matching file/dir names). If no
xattr-matching rules are specified, a default xattr filtering rule is used
- An `x` indicates that a rule affects xattr names in xattr copy/delete
operations (and is thus ignored when matching file/dir names). If no
xattr-matching rules are specified, a default xattr filtering rule is used
-@@ -39
58,6 +3973
,12 @@ The following modifiers are accepted after a merge or dir-merge rule:
+@@ -39
67,6 +3982
,12 @@ The following modifiers are accepted after a merge or dir-merge rule:
rules in the file must not specify sides (via a modifier or a rule prefix
such as `hide`).
rules in the file must not specify sides (via a modifier or a rule prefix
such as `hide`).
@@
-443,7
+443,7
@@
diff --git a/rsync.h b/rsync.h
diff --git a/util1.c b/util1.c
--- a/util1.c
+++ b/util1.c
diff --git a/util1.c b/util1.c
--- a/util1.c
+++ b/util1.c
-@@ -
898,6 +898
,25 @@ size_t stringjoin(char *dest, size_t destsize, ...)
+@@ -
919,6 +919
,25 @@ size_t stringjoin(char *dest, size_t destsize, ...)
return ret;
}
return ret;
}
diff --git
a/ignore-case.diff
b/ignore-case.diff
index 40b41a7fc3d8888ffa50790ae359340d64fd58b5..bcf067d147a11eea086ad8ddf25072105eea56d7 100644
(file)
--- a/
ignore-case.diff
+++ b/
ignore-case.diff
@@
-12,7
+12,7
@@
TODO:
- Make this code handle multibyte character encodings, and honor the
--iconv setting when converting case.
- Make this code handle multibyte character encodings, and honor the
--iconv setting when converting case.
-based-on:
55b2a06812e39f15f52e92b979600cb82be210cb
+based-on:
d821e4cbfbc66848cdf91a336af26fdb89dd9a8f
diff --git a/exclude.c b/exclude.c
--- a/exclude.c
+++ b/exclude.c
diff --git a/exclude.c b/exclude.c
--- a/exclude.c
+++ b/exclude.c
@@
-48,7
+48,7
@@
diff --git a/flist.c b/flist.c
extern int ignore_errors;
extern int numeric_ids;
extern int quiet;
extern int ignore_errors;
extern int numeric_ids;
extern int quiet;
-@@ -2
598,7 +2599
,8 @@ struct file_list *recv_file_list(int f, int dir_ndx)
+@@ -2
623,7 +2624
,8 @@ struct file_list *recv_file_list(int f, int dir_ndx)
cur_dir++;
if (cur_dir != good_dirname) {
const char *d = dir_ndx >= 0 ? f_name(dir_flist->files[dir_ndx], NULL) : empty_dir;
cur_dir++;
if (cur_dir != good_dirname) {
const char *d = dir_ndx >= 0 ? f_name(dir_flist->files[dir_ndx], NULL) : empty_dir;
@@
-58,7
+58,7
@@
diff --git a/flist.c b/flist.c
rprintf(FERROR,
"ABORTING due to invalid path from sender: %s/%s\n",
cur_dir, file->basename);
rprintf(FERROR,
"ABORTING due to invalid path from sender: %s/%s\n",
cur_dir, file->basename);
-@@ -31
65,6 +3167
,7 @@ int f_name_cmp(const struct file_struct *f1, const struct file_struct *f2)
+@@ -31
90,6 +3192
,7 @@ int f_name_cmp(const struct file_struct *f1, const struct file_struct *f2)
{
int dif;
const uchar *c1, *c2;
{
int dif;
const uchar *c1, *c2;
@@
-66,7
+66,7
@@
diff --git a/flist.c b/flist.c
enum fnc_state state1, state2;
enum fnc_type type1, type2;
enum fnc_type t_path = protocol_version >= 29 ? t_PATH : t_ITEM;
enum fnc_state state1, state2;
enum fnc_type type1, type2;
enum fnc_type t_path = protocol_version >= 29 ? t_PATH : t_ITEM;
-@@ -3
275,7 +3278
,15 @@ int f_name_cmp(const struct file_struct *f1, const struct file_struct *f2)
+@@ -3
300,7 +3303
,15 @@ int f_name_cmp(const struct file_struct *f1, const struct file_struct *f2)
if (type1 != type2)
return type1 == t_PATH ? 1 : -1;
}
if (type1 != type2)
return type1 == t_PATH ? 1 : -1;
}
@@
-214,7
+214,7
@@
diff --git a/lib/wildmatch.c b/lib/wildmatch.c
diff --git a/options.c b/options.c
--- a/options.c
+++ b/options.c
diff --git a/options.c b/options.c
--- a/options.c
+++ b/options.c
-@@ -12
7,6 +127
,7 @@ OFF_T max_size = -1;
+@@ -12
8,6 +128
,7 @@ OFF_T max_size = -1;
OFF_T min_size = -1;
int ignore_errors = 0;
int modify_window = 0;
OFF_T min_size = -1;
int ignore_errors = 0;
int modify_window = 0;
@@
-222,7
+222,7
@@
diff --git a/options.c b/options.c
int blocking_io = -1;
int checksum_seed = 0;
int inplace = 0;
int blocking_io = -1;
int checksum_seed = 0;
int inplace = 0;
-@@ -7
78,6 +779
,8 @@ static struct poptOption long_options[] = {
+@@ -7
80,6 +781
,8 @@ static struct poptOption long_options[] = {
{"read-batch", 0, POPT_ARG_STRING, &batch_name, OPT_READ_BATCH, 0, 0 },
{"write-batch", 0, POPT_ARG_STRING, &batch_name, OPT_WRITE_BATCH, 0, 0 },
{"only-write-batch", 0, POPT_ARG_STRING, &batch_name, OPT_ONLY_WRITE_BATCH, 0, 0 },
{"read-batch", 0, POPT_ARG_STRING, &batch_name, OPT_READ_BATCH, 0, 0 },
{"write-batch", 0, POPT_ARG_STRING, &batch_name, OPT_WRITE_BATCH, 0, 0 },
{"only-write-batch", 0, POPT_ARG_STRING, &batch_name, OPT_ONLY_WRITE_BATCH, 0, 0 },
@@
-231,7
+231,7
@@
diff --git a/options.c b/options.c
{"files-from", 0, POPT_ARG_STRING, &files_from, 0, 0, 0 },
{"from0", '0', POPT_ARG_VAL, &eol_nulls, 1, 0, 0},
{"no-from0", 0, POPT_ARG_VAL, &eol_nulls, 0, 0, 0},
{"files-from", 0, POPT_ARG_STRING, &files_from, 0, 0, 0 },
{"from0", '0', POPT_ARG_VAL, &eol_nulls, 1, 0, 0},
{"no-from0", 0, POPT_ARG_VAL, &eol_nulls, 0, 0, 0},
-@@ -28
16,6 +2819
,9 @@ void server_options(char **args, int *argc_p)
+@@ -28
20,6 +2823
,9 @@ void server_options(char **args, int *argc_p)
args[ac++] = arg;
}
args[ac++] = arg;
}
@@
-244,7
+244,7
@@
diff --git a/options.c b/options.c
diff --git a/rsync.1.md b/rsync.1.md
--- a/rsync.1.md
+++ b/rsync.1.md
diff --git a/rsync.1.md b/rsync.1.md
--- a/rsync.1.md
+++ b/rsync.1.md
-@@ -44
6,6 +446,7 @@ has its own detailed description later in this man
page.
+@@ -44
7,6 +447,7 @@ has its own detailed description later in this man
page.
--old-args disable the modern arg-protection idiom
--protect-args, -s no space-splitting; wildcard chars only
--copy-as=USER[:GROUP] specify user & optional group for the copy
--old-args disable the modern arg-protection idiom
--protect-args, -s no space-splitting; wildcard chars only
--copy-as=USER[:GROUP] specify user & optional group for the copy
@@
-252,7
+252,7
@@
diff --git a/rsync.1.md b/rsync.1.md
--address=ADDRESS bind address for outgoing socket to daemon
--port=PORT specify double-colon alternate port number
--sockopts=OPTIONS specify custom TCP options
--address=ADDRESS bind address for outgoing socket to daemon
--port=PORT specify double-colon alternate port number
--sockopts=OPTIONS specify custom TCP options
-@@ -23
86,6 +2387
,12 @@ your home directory (remove the '=' for that).
+@@ -23
95,6 +2396
,12 @@ your home directory (remove the '=' for that).
> sudo rsync -aive lsh -M--copy-as=joe src/ lh:dest/
> sudo rsync -aive lsh -M--copy-as=joe src/ lh:dest/
diff --git
a/kerberos.diff
b/kerberos.diff
index 170a2995c15b19b2d62eea316ab78922898bbbe9..07172e7618a88a9f9701ed70f59661e5646cb4ee 100644
(file)
--- a/
kerberos.diff
+++ b/
kerberos.diff
@@
-9,7
+9,7
@@
To use this patch, run these commands for a successful build:
./configure
make
./configure
make
-based-on:
55b2a06812e39f15f52e92b979600cb82be210cb
+based-on:
d821e4cbfbc66848cdf91a336af26fdb89dd9a8f
diff --git a/Makefile.in b/Makefile.in
--- a/Makefile.in
+++ b/Makefile.in
diff --git a/Makefile.in b/Makefile.in
--- a/Makefile.in
+++ b/Makefile.in
diff --git
a/link-by-hash.diff
b/link-by-hash.diff
index da5286d7edb29cec1b5bf3c24390a59637caac17..47e4be9ef52b66905bf7eeb5dedf79d2157f3d39 100644
(file)
--- a/
link-by-hash.diff
+++ b/
link-by-hash.diff
@@
-12,7
+12,7
@@
To use this patch, run these commands for a successful build:
./configure
make
./configure
make
-based-on:
55b2a06812e39f15f52e92b979600cb82be210cb
+based-on:
d821e4cbfbc66848cdf91a336af26fdb89dd9a8f
diff --git a/Makefile.in b/Makefile.in
--- a/Makefile.in
+++ b/Makefile.in
diff --git a/Makefile.in b/Makefile.in
--- a/Makefile.in
+++ b/Makefile.in
@@
-205,7
+205,7
@@
new file mode 100644
diff --git a/options.c b/options.c
--- a/options.c
+++ b/options.c
diff --git a/options.c b/options.c
--- a/options.c
+++ b/options.c
-@@ -1
69,6 +169
,7 @@ char *backup_suffix = NULL;
+@@ -1
70,6 +170
,7 @@ char *backup_suffix = NULL;
char *tmpdir = NULL;
char *partial_dir = NULL;
char *basis_dir[MAX_BASIS_DIRS+1];
char *tmpdir = NULL;
char *partial_dir = NULL;
char *basis_dir[MAX_BASIS_DIRS+1];
@@
-213,7
+213,7
@@
diff --git a/options.c b/options.c
char *config_file = NULL;
char *shell_cmd = NULL;
char *logfile_name = NULL;
char *config_file = NULL;
char *shell_cmd = NULL;
char *logfile_name = NULL;
-@@ -22
6,7 +227
,7 @@ static const char *debug_verbosity[] = {
+@@ -22
7,7 +228
,7 @@ static const char *debug_verbosity[] = {
/*2*/ "BIND,CMD,CONNECT,DEL,DELTASUM,DUP,FILTER,FLIST,ICONV",
/*3*/ "ACL,BACKUP,CONNECT2,DELTASUM2,DEL2,EXIT,FILTER2,FLIST2,FUZZY,GENR,OWN,RECV,SEND,TIME",
/*4*/ "CMD2,DELTASUM3,DEL3,EXIT2,FLIST3,ICONV2,OWN2,PROTO,TIME2",
/*2*/ "BIND,CMD,CONNECT,DEL,DELTASUM,DUP,FILTER,FLIST,ICONV",
/*3*/ "ACL,BACKUP,CONNECT2,DELTASUM2,DEL2,EXIT,FILTER2,FLIST2,FUZZY,GENR,OWN,RECV,SEND,TIME",
/*4*/ "CMD2,DELTASUM3,DEL3,EXIT2,FLIST3,ICONV2,OWN2,PROTO,TIME2",
@@
-222,7
+222,7
@@
diff --git a/options.c b/options.c
};
#define MAX_VERBOSITY ((int)(sizeof debug_verbosity / sizeof debug_verbosity[0]) - 1)
};
#define MAX_VERBOSITY ((int)(sizeof debug_verbosity / sizeof debug_verbosity[0]) - 1)
-@@ -29
7,6 +298
,7 @@ static struct output_struct debug_words[COUNT_DEBUG+1] = {
+@@ -29
8,6 +299
,7 @@ static struct output_struct debug_words[COUNT_DEBUG+1] = {
DEBUG_WORD(FUZZY, W_REC, "Debug fuzzy scoring (levels 1-2)"),
DEBUG_WORD(GENR, W_REC, "Debug generator functions"),
DEBUG_WORD(HASH, W_SND|W_REC, "Debug hashtable code"),
DEBUG_WORD(FUZZY, W_REC, "Debug fuzzy scoring (levels 1-2)"),
DEBUG_WORD(GENR, W_REC, "Debug generator functions"),
DEBUG_WORD(HASH, W_SND|W_REC, "Debug hashtable code"),
@@
-230,7
+230,7
@@
diff --git a/options.c b/options.c
DEBUG_WORD(HLINK, W_SND|W_REC, "Debug hard-link actions (levels 1-3)"),
DEBUG_WORD(ICONV, W_CLI|W_SRV, "Debug iconv character conversions (levels 1-2)"),
DEBUG_WORD(IO, W_CLI|W_SRV, "Debug I/O routines (levels 1-4)"),
DEBUG_WORD(HLINK, W_SND|W_REC, "Debug hard-link actions (levels 1-3)"),
DEBUG_WORD(ICONV, W_CLI|W_SRV, "Debug iconv character conversions (levels 1-2)"),
DEBUG_WORD(IO, W_CLI|W_SRV, "Debug I/O routines (levels 1-4)"),
-@@ -57
7,7 +579
,7 @@ enum {OPT_SERVER = 1000, OPT_DAEMON, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM,
+@@ -57
8,7 +580
,7 @@ enum {OPT_SERVER = 1000, OPT_DAEMON, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM,
OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW, OPT_MIN_SIZE, OPT_CHMOD,
OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_ONLY_WRITE_BATCH, OPT_MAX_SIZE,
OPT_NO_D, OPT_APPEND, OPT_NO_ICONV, OPT_INFO, OPT_DEBUG, OPT_BLOCK_SIZE,
OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW, OPT_MIN_SIZE, OPT_CHMOD,
OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_ONLY_WRITE_BATCH, OPT_MAX_SIZE,
OPT_NO_D, OPT_APPEND, OPT_NO_ICONV, OPT_INFO, OPT_DEBUG, OPT_BLOCK_SIZE,
@@
-239,7
+239,7
@@
diff --git a/options.c b/options.c
OPT_OLD_COMPRESS, OPT_NEW_COMPRESS, OPT_NO_COMPRESS, OPT_OLD_ARGS,
OPT_STOP_AFTER, OPT_STOP_AT,
OPT_REFUSED_BASE = 9000};
OPT_OLD_COMPRESS, OPT_NEW_COMPRESS, OPT_NO_COMPRESS, OPT_OLD_ARGS,
OPT_STOP_AFTER, OPT_STOP_AT,
OPT_REFUSED_BASE = 9000};
-@@ -73
7,6 +739
,7 @@ static struct poptOption long_options[] = {
+@@ -73
9,6 +741
,7 @@ static struct poptOption long_options[] = {
{"compare-dest", 0, POPT_ARG_STRING, 0, OPT_COMPARE_DEST, 0, 0 },
{"copy-dest", 0, POPT_ARG_STRING, 0, OPT_COPY_DEST, 0, 0 },
{"link-dest", 0, POPT_ARG_STRING, 0, OPT_LINK_DEST, 0, 0 },
{"compare-dest", 0, POPT_ARG_STRING, 0, OPT_COMPARE_DEST, 0, 0 },
{"copy-dest", 0, POPT_ARG_STRING, 0, OPT_COPY_DEST, 0, 0 },
{"link-dest", 0, POPT_ARG_STRING, 0, OPT_LINK_DEST, 0, 0 },
@@
-247,7
+247,7
@@
diff --git a/options.c b/options.c
{"fuzzy", 'y', POPT_ARG_NONE, 0, 'y', 0, 0 },
{"no-fuzzy", 0, POPT_ARG_VAL, &fuzzy_basis, 0, 0, 0 },
{"no-y", 0, POPT_ARG_VAL, &fuzzy_basis, 0, 0, 0 },
{"fuzzy", 'y', POPT_ARG_NONE, 0, 'y', 0, 0 },
{"no-fuzzy", 0, POPT_ARG_VAL, &fuzzy_basis, 0, 0, 0 },
{"no-y", 0, POPT_ARG_VAL, &fuzzy_basis, 0, 0, 0 },
-@@ -9
79,6 +982
,9 @@ static void set_refuse_options(void)
+@@ -9
83,6 +986
,9 @@ static void set_refuse_options(void)
ref = cp + 1;
}
ref = cp + 1;
}
@@
-257,7
+257,7
@@
diff --git a/options.c b/options.c
if (am_daemon) {
#ifdef ICONV_OPTION
if (!*lp_charset(module_id))
if (am_daemon) {
#ifdef ICONV_OPTION
if (!*lp_charset(module_id))
-@@ -185
2,6 +1858
,20 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+@@ -185
6,6 +1862
,20 @@ int parse_arguments(int *argc_p, const char ***argv_p)
return 0;
#endif
return 0;
#endif
@@
-278,7
+278,7
@@
diff --git a/options.c b/options.c
case OPT_STOP_AFTER: {
long val;
arg = poptGetOptArg(pc);
case OPT_STOP_AFTER: {
long val;
arg = poptGetOptArg(pc);
-@@ -222
3,6 +2243
,8 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+@@ -222
7,6 +2247
,8 @@ int parse_arguments(int *argc_p, const char ***argv_p)
tmpdir = sanitize_path(NULL, tmpdir, NULL, 0, SP_DEFAULT);
if (backup_dir)
backup_dir = sanitize_path(NULL, backup_dir, NULL, 0, SP_DEFAULT);
tmpdir = sanitize_path(NULL, tmpdir, NULL, 0, SP_DEFAULT);
if (backup_dir)
backup_dir = sanitize_path(NULL, backup_dir, NULL, 0, SP_DEFAULT);
@@
-287,7
+287,7
@@
diff --git a/options.c b/options.c
}
if (daemon_filter_list.head && !am_sender) {
filter_rule_list *elp = &daemon_filter_list;
}
if (daemon_filter_list.head && !am_sender) {
filter_rule_list *elp = &daemon_filter_list;
-@@ -289
2,6 +2914
,12 @@ void server_options(char **args, int *argc_p)
+@@ -289
6,6 +2918
,12 @@ void server_options(char **args, int *argc_p)
args[ac++] = "--no-W";
}
args[ac++] = "--no-W";
}
@@
-303,7
+303,7
@@
diff --git a/options.c b/options.c
diff --git a/rsync.1.md b/rsync.1.md
--- a/rsync.1.md
+++ b/rsync.1.md
diff --git a/rsync.1.md b/rsync.1.md
--- a/rsync.1.md
+++ b/rsync.1.md
-@@ -4
29,6 +429,7 @@ has its own detailed description later in this man
page.
+@@ -4
30,6 +430,7 @@ has its own detailed description later in this man
page.
--compare-dest=DIR also compare destination files relative to DIR
--copy-dest=DIR ... and include copies of unchanged files
--link-dest=DIR hardlink to files in DIR when unchanged
--compare-dest=DIR also compare destination files relative to DIR
--copy-dest=DIR ... and include copies of unchanged files
--link-dest=DIR hardlink to files in DIR when unchanged
@@
-311,7
+311,7
@@
diff --git a/rsync.1.md b/rsync.1.md
--compress, -z compress file data during the transfer
--compress-choice=STR choose the compression algorithm (aka --zc)
--compress-level=NUM explicitly set compression level (aka --zl)
--compress, -z compress file data during the transfer
--compress-choice=STR choose the compression algorithm (aka --zc)
--compress-level=NUM explicitly set compression level (aka --zl)
-@@ -25
23,6 +2524
,50 @@ your home directory (remove the '=' for that).
+@@ -25
32,6 +2533
,50 @@ your home directory (remove the '=' for that).
this bug by avoiding the `-o` option (or using `--no-o`) when sending to an
old rsync.
this bug by avoiding the `-o` option (or using `--no-o`) when sending to an
old rsync.
diff --git
a/omit-dir-changes.diff
b/omit-dir-changes.diff
index 40f65d3f780ae34514856756d41d23a2c44eb238..696057f009402d9041a168a57ce5db645ecad88e 100644
(file)
--- a/
omit-dir-changes.diff
+++ b/
omit-dir-changes.diff
@@
-7,7
+7,7
@@
To use this patch, run these commands for a successful build:
./configure (optional if already run)
make
./configure (optional if already run)
make
-based-on:
55b2a06812e39f15f52e92b979600cb82be210cb
+based-on:
d821e4cbfbc66848cdf91a336af26fdb89dd9a8f
diff --git a/generator.c b/generator.c
--- a/generator.c
+++ b/generator.c
diff --git a/generator.c b/generator.c
--- a/generator.c
+++ b/generator.c
@@
-51,7
+51,7
@@
diff --git a/generator.c b/generator.c
diff --git a/options.c b/options.c
--- a/options.c
+++ b/options.c
diff --git a/options.c b/options.c
--- a/options.c
+++ b/options.c
-@@ -7
6,6 +76
,7 @@ int delete_before = 0;
+@@ -7
7,6 +77
,7 @@ int delete_before = 0;
int delete_after = 0;
int delete_excluded = 0;
int remove_source_files = 0;
int delete_after = 0;
int delete_excluded = 0;
int remove_source_files = 0;
@@
-59,7
+59,7
@@
diff --git a/options.c b/options.c
int one_file_system = 0;
int protocol_version = PROTOCOL_VERSION;
int sparse_files = 0;
int one_file_system = 0;
int protocol_version = PROTOCOL_VERSION;
int sparse_files = 0;
-@@ -64
2,6 +643
,7 @@ static struct poptOption long_options[] = {
+@@ -64
3,6 +644
,7 @@ static struct poptOption long_options[] = {
{"omit-link-times", 'J', POPT_ARG_VAL, &omit_link_times, 1, 0, 0 },
{"no-omit-link-times",0, POPT_ARG_VAL, &omit_link_times, 0, 0, 0 },
{"no-J", 0, POPT_ARG_VAL, &omit_link_times, 0, 0, 0 },
{"omit-link-times", 'J', POPT_ARG_VAL, &omit_link_times, 1, 0, 0 },
{"no-omit-link-times",0, POPT_ARG_VAL, &omit_link_times, 0, 0, 0 },
{"no-J", 0, POPT_ARG_VAL, &omit_link_times, 0, 0, 0 },
@@
-67,7
+67,7
@@
diff --git a/options.c b/options.c
{"modify-window", '@', POPT_ARG_INT, &modify_window, OPT_MODIFY_WINDOW, 0, 0 },
{"super", 0, POPT_ARG_VAL, &am_root, 2, 0, 0 },
{"no-super", 0, POPT_ARG_VAL, &am_root, 0, 0, 0 },
{"modify-window", '@', POPT_ARG_INT, &modify_window, OPT_MODIFY_WINDOW, 0, 0 },
{"super", 0, POPT_ARG_VAL, &am_root, 2, 0, 0 },
{"no-super", 0, POPT_ARG_VAL, &am_root, 0, 0, 0 },
-@@ -229
2,6 +2294
,9 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+@@ -229
6,6 +2298
,9 @@ int parse_arguments(int *argc_p, const char ***argv_p)
parse_filter_str(&filter_list, backup_dir_buf, rule_template(0), 0);
}
parse_filter_str(&filter_list, backup_dir_buf, rule_template(0), 0);
}
@@
-77,7
+77,7
@@
diff --git a/options.c b/options.c
if (make_backups && !backup_dir)
omit_dir_times = -1; /* Implied, so avoid -O to sender. */
if (make_backups && !backup_dir)
omit_dir_times = -1; /* Implied, so avoid -O to sender. */
-@@ -27
88,6 +2793
,8 @@ void server_options(char **args, int *argc_p)
+@@ -27
92,6 +2797
,8 @@ void server_options(char **args, int *argc_p)
args[ac++] = "--size-only";
if (do_stats)
args[ac++] = "--stats";
args[ac++] = "--size-only";
if (do_stats)
args[ac++] = "--stats";
@@
-89,7
+89,7
@@
diff --git a/options.c b/options.c
diff --git a/rsync.1.md b/rsync.1.md
--- a/rsync.1.md
+++ b/rsync.1.md
diff --git a/rsync.1.md b/rsync.1.md
--- a/rsync.1.md
+++ b/rsync.1.md
-@@ -38
1,6 +381,7 @@ has its own detailed description later in this man
page.
+@@ -38
3,6 +383,7 @@ has its own detailed description later in this man
page.
--crtimes, -N preserve create times (newness)
--omit-dir-times, -O omit directories from --times
--omit-link-times, -J omit symlinks from --times
--crtimes, -N preserve create times (newness)
--omit-dir-times, -O omit directories from --times
--omit-link-times, -J omit symlinks from --times
@@
-97,7
+97,7
@@
diff --git a/rsync.1.md b/rsync.1.md
--super receiver attempts super-user activities
--fake-super store/recover privileged attrs using xattrs
--sparse, -S turn sequences of nulls into sparse blocks
--super receiver attempts super-user activities
--fake-super store/recover privileged attrs using xattrs
--sparse, -S turn sequences of nulls into sparse blocks
-@@ -154
0,6 +1541
,11 @@ your home directory (remove the '=' for that).
+@@ -154
9,6 +1550
,11 @@ your home directory (remove the '=' for that).
This tells rsync to omit symlinks when it is preserving modification,
access, and create times.
This tells rsync to omit symlinks when it is preserving modification,
access, and create times.
diff --git
a/slow-down.diff
b/slow-down.diff
index 80344d970ca8cb15ceb3bfa9bfca789793e85ba1..c7b613c825d8a018b4d5fa60808e8499012f4972 100644
(file)
--- a/
slow-down.diff
+++ b/
slow-down.diff
@@
-14,11
+14,11
@@
To use this patch, run these commands for a successful build:
./configure (optional if already run)
make
./configure (optional if already run)
make
-based-on:
55b2a06812e39f15f52e92b979600cb82be210cb
+based-on:
d821e4cbfbc66848cdf91a336af26fdb89dd9a8f
diff --git a/flist.c b/flist.c
--- a/flist.c
+++ b/flist.c
diff --git a/flist.c b/flist.c
--- a/flist.c
+++ b/flist.c
-@@ -7
3,6 +73
,7 @@ extern int sender_symlink_iconv;
+@@ -7
4,6 +74
,7 @@ extern int sender_symlink_iconv;
extern int output_needs_newline;
extern int sender_keeps_checksum;
extern int unsort_ndx;
extern int output_needs_newline;
extern int sender_keeps_checksum;
extern int unsort_ndx;
@@
-26,7
+26,7
@@
diff --git a/flist.c b/flist.c
extern uid_t our_uid;
extern struct stats stats;
extern char *filesfrom_host;
extern uid_t our_uid;
extern struct stats stats;
extern char *filesfrom_host;
-@@ -18
39,6 +1840
,9 @@ static void send_directory(int f, struct file_list *flist, char *fbuf, int len,
+@@ -18
64,6 +1865
,9 @@ static void send_directory(int f, struct file_list *flist, char *fbuf, int len,
}
send_file_name(f, flist, fbuf, NULL, flags, filter_level);
}
send_file_name(f, flist, fbuf, NULL, flags, filter_level);
@@
-39,7
+39,7
@@
diff --git a/flist.c b/flist.c
diff --git a/options.c b/options.c
--- a/options.c
+++ b/options.c
diff --git a/options.c b/options.c
--- a/options.c
+++ b/options.c
-@@ -11
8,6 +118
,7 @@ int size_only = 0;
+@@ -11
9,6 +119
,7 @@ int size_only = 0;
int daemon_bwlimit = 0;
int bwlimit = 0;
int fuzzy_basis = 0;
int daemon_bwlimit = 0;
int bwlimit = 0;
int fuzzy_basis = 0;
@@
-47,7
+47,7
@@
diff --git a/options.c b/options.c
size_t bwlimit_writemax = 0;
int ignore_existing = 0;
int ignore_non_existing = 0;
size_t bwlimit_writemax = 0;
int ignore_existing = 0;
int ignore_non_existing = 0;
-@@ -7
68,6 +769
,7 @@ static struct poptOption long_options[] = {
+@@ -7
70,6 +771
,7 @@ static struct poptOption long_options[] = {
{"itemize-changes", 'i', POPT_ARG_NONE, 0, 'i', 0, 0 },
{"no-itemize-changes",0, POPT_ARG_VAL, &itemize_changes, 0, 0, 0 },
{"no-i", 0, POPT_ARG_VAL, &itemize_changes, 0, 0, 0 },
{"itemize-changes", 'i', POPT_ARG_NONE, 0, 'i', 0, 0 },
{"no-itemize-changes",0, POPT_ARG_VAL, &itemize_changes, 0, 0, 0 },
{"no-i", 0, POPT_ARG_VAL, &itemize_changes, 0, 0, 0 },
@@
-58,7
+58,7
@@
diff --git a/options.c b/options.c
diff --git a/rsync.1.md b/rsync.1.md
--- a/rsync.1.md
+++ b/rsync.1.md
diff --git a/rsync.1.md b/rsync.1.md
--- a/rsync.1.md
+++ b/rsync.1.md
-@@ -46
5,6 +465,7 @@ has its own detailed description later in this man
page.
+@@ -46
6,6 +466,7 @@ has its own detailed description later in this man
page.
--early-input=FILE use FILE for daemon's early exec input
--list-only list the files instead of copying them
--bwlimit=RATE limit socket I/O bandwidth
--early-input=FILE use FILE for daemon's early exec input
--list-only list the files instead of copying them
--bwlimit=RATE limit socket I/O bandwidth
diff --git
a/slp.diff
b/slp.diff
index a6882610df3f1c78a732e66a470c53665c03d300..4032e50054af8b6054b1344f6455357d49526215 100644
(file)
--- a/
slp.diff
+++ b/
slp.diff
@@
-10,7
+10,7
@@
To use this patch, run these commands for a successful build:
TODO: the configure changes should abort if the user requests --enable-slp
and we can't honor that request.
TODO: the configure changes should abort if the user requests --enable-slp
and we can't honor that request.
-based-on:
55b2a06812e39f15f52e92b979600cb82be210cb
+based-on:
d821e4cbfbc66848cdf91a336af26fdb89dd9a8f
diff --git a/Makefile.in b/Makefile.in
--- a/Makefile.in
+++ b/Makefile.in
diff --git a/Makefile.in b/Makefile.in
--- a/Makefile.in
+++ b/Makefile.in
@@
-200,7
+200,7
@@
diff --git a/rsyncd.conf.5.md b/rsyncd.conf.5.md
## MODULE PARAMETERS
After the global parameters you should define a number of modules, each module
## MODULE PARAMETERS
After the global parameters you should define a number of modules, each module
-@@ -117
5,6 +1190
,7 @@ A more sophisticated example would be:
+@@ -117
6,6 +1191
,7 @@ A more sophisticated example would be:
> max connections = 4
> syslog facility = local5
> pid file = /var/run/rsyncd.pid
> max connections = 4
> syslog facility = local5
> pid file = /var/run/rsyncd.pid
diff --git
a/soften-links.diff
b/soften-links.diff
index 182baf4b68b62e0d03f7c56c0b23595a8a3f9860..d25bb1f2230f96c0c5e3be8564ac0f7de6e027b1 100644
(file)
--- a/
soften-links.diff
+++ b/
soften-links.diff
@@
-10,7
+10,7
@@
To use this patch, run these commands for a successful build:
./configure (optional if already run)
make
./configure (optional if already run)
make
-based-on:
55b2a06812e39f15f52e92b979600cb82be210cb
+based-on:
d821e4cbfbc66848cdf91a336af26fdb89dd9a8f
diff --git a/syscall.c b/syscall.c
--- a/syscall.c
+++ b/syscall.c
diff --git a/syscall.c b/syscall.c
--- a/syscall.c
+++ b/syscall.c
diff --git
a/source-backup.diff
b/source-backup.diff
index e915deeb142f65a23af90821908551ef860027e4..0dd83c86f48d5342d668ba7ad34e071f999bc766 100644
(file)
--- a/
source-backup.diff
+++ b/
source-backup.diff
@@
-9,7
+9,7
@@
To use this patch, run these commands for a successful build:
-- Matt McCutchen <hashproduct@gmail.com>
-- Matt McCutchen <hashproduct@gmail.com>
-based-on:
55b2a06812e39f15f52e92b979600cb82be210cb
+based-on:
d821e4cbfbc66848cdf91a336af26fdb89dd9a8f
diff --git a/options.c b/options.c
--- a/options.c
+++ b/options.c
diff --git a/options.c b/options.c
--- a/options.c
+++ b/options.c
@@
-21,7
+21,7
@@
diff --git a/options.c b/options.c
/**
* If 1, send the whole file as literal data rather than trying to
/**
* If 1, send the whole file as literal data rather than trying to
-@@ -77
1,6 +772
,7 @@ static struct poptOption long_options[] = {
+@@ -77
3,6 +774
,7 @@ static struct poptOption long_options[] = {
{"bwlimit", 0, POPT_ARG_STRING, &bwlimit_arg, OPT_BWLIMIT, 0, 0 },
{"no-bwlimit", 0, POPT_ARG_VAL, &bwlimit, 0, 0, 0 },
{"backup", 'b', POPT_ARG_VAL, &make_backups, 1, 0, 0 },
{"bwlimit", 0, POPT_ARG_STRING, &bwlimit_arg, OPT_BWLIMIT, 0, 0 },
{"no-bwlimit", 0, POPT_ARG_VAL, &bwlimit, 0, 0, 0 },
{"backup", 'b', POPT_ARG_VAL, &make_backups, 1, 0, 0 },
@@
-29,7
+29,7
@@
diff --git a/options.c b/options.c
{"no-backup", 0, POPT_ARG_VAL, &make_backups, 0, 0, 0 },
{"backup-dir", 0, POPT_ARG_STRING, &backup_dir, 0, 0, 0 },
{"suffix", 0, POPT_ARG_STRING, &backup_suffix, 0, 0, 0 },
{"no-backup", 0, POPT_ARG_VAL, &make_backups, 0, 0, 0 },
{"backup-dir", 0, POPT_ARG_STRING, &backup_dir, 0, 0, 0 },
{"suffix", 0, POPT_ARG_STRING, &backup_suffix, 0, 0, 0 },
-@@ -279
1,6 +2793
,8 @@ void server_options(char **args, int *argc_p)
+@@ -279
5,6 +2797
,8 @@ void server_options(char **args, int *argc_p)
} else {
if (skip_compress)
args[ac++] = safe_arg("--skip-compress", skip_compress);
} else {
if (skip_compress)
args[ac++] = safe_arg("--skip-compress", skip_compress);
@@
-41,7
+41,7
@@
diff --git a/options.c b/options.c
diff --git a/rsync.1.md b/rsync.1.md
--- a/rsync.1.md
+++ b/rsync.1.md
diff --git a/rsync.1.md b/rsync.1.md
--- a/rsync.1.md
+++ b/rsync.1.md
-@@ -39
6,6 +396,7 @@ has its own detailed description later in this man
page.
+@@ -39
7,6 +397,7 @@ has its own detailed description later in this man
page.
--existing skip creating new files on receiver
--ignore-existing skip updating files that exist on receiver
--remove-source-files sender removes synchronized files (non-dir)
--existing skip creating new files on receiver
--ignore-existing skip updating files that exist on receiver
--remove-source-files sender removes synchronized files (non-dir)
@@
-49,7
+49,7
@@
diff --git a/rsync.1.md b/rsync.1.md
--del an alias for --delete-during
--delete delete extraneous files from dest dirs
--delete-before receiver deletes before xfer, not during
--del an alias for --delete-during
--delete delete extraneous files from dest dirs
--delete-before receiver deletes before xfer, not during
-@@ -17
74,6 +1775
,17 @@ your home directory (remove the '=' for that).
+@@ -17
83,6 +1784
,17 @@ your home directory (remove the '=' for that).
Starting with 3.1.0, rsync will skip the sender-side removal (and output an
error) if the file's size or modify time has not stayed unchanged.
Starting with 3.1.0, rsync will skip the sender-side removal (and output an
error) if the file's size or modify time has not stayed unchanged.
@@
-70,7
+70,7
@@
diff --git a/rsync.1.md b/rsync.1.md
diff --git a/sender.c b/sender.c
--- a/sender.c
+++ b/sender.c
diff --git a/sender.c b/sender.c
--- a/sender.c
+++ b/sender.c
-@@ -4
2,6 +42
,7 @@ extern int protocol_version;
+@@ -4
3,6 +43
,7 @@ extern int protocol_version;
extern int remove_source_files;
extern int updating_basis_file;
extern int make_backups;
extern int remove_source_files;
extern int updating_basis_file;
extern int make_backups;
@@
-78,7
+78,7
@@
diff --git a/sender.c b/sender.c
extern int inplace;
extern int inplace_partial;
extern int batch_fd;
extern int inplace;
extern int inplace_partial;
extern int batch_fd;
-@@ -12
8,6 +129
,7 @@ void successful_send(int ndx)
+@@ -12
9,6 +130
,7 @@ void successful_send(int ndx)
struct file_struct *file;
struct file_list *flist;
STRUCT_STAT st;
struct file_struct *file;
struct file_list *flist;
STRUCT_STAT st;
@@
-86,7
+86,7
@@
diff --git a/sender.c b/sender.c
if (!remove_source_files)
return;
if (!remove_source_files)
return;
-@@ -15
2,7 +154
,11 @@ void successful_send(int ndx)
+@@ -15
3,7 +155
,11 @@ void successful_send(int ndx)
return;
}
return;
}
diff --git
a/source-filter_dest-filter.diff
b/source-filter_dest-filter.diff
index bfa7cf8a3540ad2a80fc71d2de2d57b64250b527..f7092db97a63cadc2924b046685510b35c947d22 100644
(file)
--- a/
source-filter_dest-filter.diff
+++ b/
source-filter_dest-filter.diff
@@
-30,7
+30,7
@@
To use this patch, run these commands for a successful build:
./configure (optional if already run)
make
./configure (optional if already run)
make
-based-on:
55b2a06812e39f15f52e92b979600cb82be210cb
+based-on:
d821e4cbfbc66848cdf91a336af26fdb89dd9a8f
diff --git a/generator.c b/generator.c
--- a/generator.c
+++ b/generator.c
diff --git a/generator.c b/generator.c
--- a/generator.c
+++ b/generator.c
@@
-66,7
+66,7
@@
diff --git a/main.c b/main.c
diff --git a/options.c b/options.c
--- a/options.c
+++ b/options.c
diff --git a/options.c b/options.c
--- a/options.c
+++ b/options.c
-@@ -11
5,6 +115
,7 @@ int safe_symlinks = 0;
+@@ -11
6,6 +116
,7 @@ int safe_symlinks = 0;
int copy_unsafe_links = 0;
int munge_symlinks = 0;
int size_only = 0;
int copy_unsafe_links = 0;
int munge_symlinks = 0;
int size_only = 0;
@@
-74,7
+74,7
@@
diff --git a/options.c b/options.c
int daemon_bwlimit = 0;
int bwlimit = 0;
int fuzzy_basis = 0;
int daemon_bwlimit = 0;
int bwlimit = 0;
int fuzzy_basis = 0;
-@@ -17
5,6 +176
,8 @@ char *logfile_name = NULL;
+@@ -17
6,6 +177
,8 @@ char *logfile_name = NULL;
char *logfile_format = NULL;
char *stdout_format = NULL;
char *password_file = NULL;
char *logfile_format = NULL;
char *stdout_format = NULL;
char *password_file = NULL;
@@
-83,7
+83,7
@@
diff --git a/options.c b/options.c
char *early_input_file = NULL;
char *rsync_path = RSYNC_PATH;
char *backup_dir = NULL;
char *early_input_file = NULL;
char *rsync_path = RSYNC_PATH;
char *backup_dir = NULL;
-@@ -68
3,6 +686
,7 @@ static struct poptOption long_options[] = {
+@@ -68
5,6 +688
,7 @@ static struct poptOption long_options[] = {
{"chmod", 0, POPT_ARG_STRING, 0, OPT_CHMOD, 0, 0 },
{"ignore-times", 'I', POPT_ARG_NONE, &ignore_times, 0, 0, 0 },
{"size-only", 0, POPT_ARG_NONE, &size_only, 0, 0, 0 },
{"chmod", 0, POPT_ARG_STRING, 0, OPT_CHMOD, 0, 0 },
{"ignore-times", 'I', POPT_ARG_NONE, &ignore_times, 0, 0, 0 },
{"size-only", 0, POPT_ARG_NONE, &size_only, 0, 0, 0 },
@@
-91,7
+91,7
@@
diff --git a/options.c b/options.c
{"one-file-system", 'x', POPT_ARG_NONE, 0, 'x', 0, 0 },
{"no-one-file-system",0, POPT_ARG_VAL, &one_file_system, 0, 0, 0 },
{"no-x", 0, POPT_ARG_VAL, &one_file_system, 0, 0, 0 },
{"one-file-system", 'x', POPT_ARG_NONE, 0, 'x', 0, 0 },
{"no-one-file-system",0, POPT_ARG_VAL, &one_file_system, 0, 0, 0 },
{"no-x", 0, POPT_ARG_VAL, &one_file_system, 0, 0, 0 },
-@@ -82
0,6 +824
,8 @@ static struct poptOption long_options[] = {
+@@ -82
2,6 +826
,8 @@ static struct poptOption long_options[] = {
{"early-input", 0, POPT_ARG_STRING, &early_input_file, 0, 0, 0 },
{"blocking-io", 0, POPT_ARG_VAL, &blocking_io, 1, 0, 0 },
{"no-blocking-io", 0, POPT_ARG_VAL, &blocking_io, 0, 0, 0 },
{"early-input", 0, POPT_ARG_STRING, &early_input_file, 0, 0, 0 },
{"blocking-io", 0, POPT_ARG_VAL, &blocking_io, 1, 0, 0 },
{"no-blocking-io", 0, POPT_ARG_VAL, &blocking_io, 0, 0, 0 },
@@
-100,7
+100,7
@@
diff --git a/options.c b/options.c
{"outbuf", 0, POPT_ARG_STRING, &outbuf_mode, 0, 0, 0 },
{"remote-option", 'M', POPT_ARG_STRING, 0, 'M', 0, 0 },
{"protocol", 0, POPT_ARG_INT, &protocol_version, 0, 0, 0 },
{"outbuf", 0, POPT_ARG_STRING, &outbuf_mode, 0, 0, 0 },
{"remote-option", 'M', POPT_ARG_STRING, 0, 'M', 0, 0 },
{"protocol", 0, POPT_ARG_INT, &protocol_version, 0, 0, 0 },
-@@ -241
5,6 +2421
,16 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+@@ -241
9,6 +2425
,16 @@ int parse_arguments(int *argc_p, const char ***argv_p)
}
}
}
}
@@
-117,7
+117,7
@@
diff --git a/options.c b/options.c
if (files_from) {
char *h, *p;
int q;
if (files_from) {
char *h, *p;
int q;
-@@ -280
3,6 +2819
,25 @@ void server_options(char **args, int *argc_p)
+@@ -280
7,6 +2823
,25 @@ void server_options(char **args, int *argc_p)
else if (missing_args == 1 && !am_sender)
args[ac++] = "--ignore-missing-args";
else if (missing_args == 1 && !am_sender)
args[ac++] = "--ignore-missing-args";
@@
-283,7
+283,7
@@
diff --git a/receiver.c b/receiver.c
progress_init();
while (1) {
progress_init();
while (1) {
-@@ -8
68,6 +888
,9 @@ int recv_files(int f_in, int f_out, char *local_name)
+@@ -8
70,6 +890
,9 @@ int recv_files(int f_in, int f_out, char *local_name)
else if (!am_server && INFO_GTE(NAME, 1) && INFO_EQ(PROGRESS, 1))
rprintf(FINFO, "%s\n", fname);
else if (!am_server && INFO_GTE(NAME, 1) && INFO_EQ(PROGRESS, 1))
rprintf(FINFO, "%s\n", fname);
@@
-293,7
+293,7
@@
diff --git a/receiver.c b/receiver.c
/* recv file data */
recv_ok = receive_data(f_in, fnamecmp, fd1, st.st_size, fname, fd2, file, inplace || one_inplace);
/* recv file data */
recv_ok = receive_data(f_in, fnamecmp, fd1, st.st_size, fname, fd2, file, inplace || one_inplace);
-@@ -88
3,6 +906
,16 @@ int recv_files(int f_in, int f_out, char *local_name)
+@@ -88
5,6 +908
,16 @@ int recv_files(int f_in, int f_out, char *local_name)
exit_cleanup(RERR_FILEIO);
}
exit_cleanup(RERR_FILEIO);
}
@@
-313,7
+313,7
@@
diff --git a/receiver.c b/receiver.c
diff --git a/rsync.1.md b/rsync.1.md
--- a/rsync.1.md
+++ b/rsync.1.md
diff --git a/rsync.1.md b/rsync.1.md
--- a/rsync.1.md
+++ b/rsync.1.md
-@@ -42
3,6 +423,7 @@ has its own detailed description later in this man
page.
+@@ -42
4,6 +424,7 @@ has its own detailed description later in this man
page.
--contimeout=SECONDS set daemon connection timeout in seconds
--ignore-times, -I don't skip files that match size and time
--size-only skip files that match in size
--contimeout=SECONDS set daemon connection timeout in seconds
--ignore-times, -I don't skip files that match size and time
--size-only skip files that match in size
@@
-321,7
+321,7
@@
diff --git a/rsync.1.md b/rsync.1.md
--modify-window=NUM, -@ set the accuracy for mod-time comparisons
--temp-dir=DIR, -T create temporary files in directory DIR
--fuzzy, -y find similar file for basis if no dest file
--modify-window=NUM, -@ set the accuracy for mod-time comparisons
--temp-dir=DIR, -T create temporary files in directory DIR
--fuzzy, -y find similar file for basis if no dest file
-@@ -47
1,6 +472,8 @@ has its own detailed description later in this man
page.
+@@ -47
2,6 +473,8 @@ has its own detailed description later in this man
page.
--write-batch=FILE write a batched update to FILE
--only-write-batch=FILE like --write-batch but w/o updating dest
--read-batch=FILE read a batched update from FILE
--write-batch=FILE write a batched update to FILE
--only-write-batch=FILE like --write-batch but w/o updating dest
--read-batch=FILE read a batched update from FILE
@@
-330,7
+330,7
@@
diff --git a/rsync.1.md b/rsync.1.md
--protocol=NUM force an older protocol version to be used
--iconv=CONVERT_SPEC request charset conversion of filenames
--checksum-seed=NUM set block/file checksum seed (advanced)
--protocol=NUM force an older protocol version to be used
--iconv=CONVERT_SPEC request charset conversion of filenames
--checksum-seed=NUM set block/file checksum seed (advanced)
-@@ -35
16,6 +3519
,36 @@ your home directory (remove the '=' for that).
+@@ -35
25,6 +3528
,36 @@ your home directory (remove the '=' for that).
[`--write-batch`](#opt). If _FILE_ is `-`, the batch data will be read
from standard input. See the "BATCH MODE" section for details.
[`--write-batch`](#opt). If _FILE_ is `-`, the batch data will be read
from standard input. See the "BATCH MODE" section for details.
@@
-389,7
+389,7
@@
diff --git a/sender.c b/sender.c
extern int do_xfers;
extern int am_server;
extern int do_xfers;
extern int am_server;
-@@ -4
8,6 +49
,7 @@ extern int batch_fd;
+@@ -4
9,6 +50
,7 @@ extern int batch_fd;
extern int write_batch;
extern int file_old_total;
extern BOOL want_progress_now;
extern int write_batch;
extern int file_old_total;
extern BOOL want_progress_now;
@@
-397,7
+397,7
@@
diff --git a/sender.c b/sender.c
extern struct stats stats;
extern struct file_list *cur_flist, *first_flist, *dir_flist;
extern struct stats stats;
extern struct file_list *cur_flist, *first_flist, *dir_flist;
-@@ -20
1,6 +203
,26 @@ void send_files(int f_in, int f_out)
+@@ -20
2,6 +204
,26 @@ void send_files(int f_in, int f_out)
int f_xfer = write_batch < 0 ? batch_fd : f_out;
int save_io_error = io_error;
int ndx, j;
int f_xfer = write_batch < 0 ? batch_fd : f_out;
int save_io_error = io_error;
int ndx, j;
@@
-424,7
+424,7
@@
diff --git a/sender.c b/sender.c
if (DEBUG_GTE(SEND, 1))
rprintf(FINFO, "send_files starting\n");
if (DEBUG_GTE(SEND, 1))
rprintf(FINFO, "send_files starting\n");
-@@ -33
8,6 +360
,7 @@ void send_files(int f_in, int f_out)
+@@ -33
9,6 +361
,7 @@ void send_files(int f_in, int f_out)
exit_cleanup(RERR_PROTOCOL);
}
exit_cleanup(RERR_PROTOCOL);
}
@@
-432,7
+432,7
@@
diff --git a/sender.c b/sender.c
fd = do_open(fname, O_RDONLY, 0);
if (fd == -1) {
if (errno == ENOENT) {
fd = do_open(fname, O_RDONLY, 0);
if (fd == -1) {
if (errno == ENOENT) {
-@@ -35
7,6 +380
,33 @@ void send_files(int f_in, int f_out)
+@@ -35
8,6 +381
,33 @@ void send_files(int f_in, int f_out)
continue;
}
continue;
}
@@
-466,7
+466,7
@@
diff --git a/sender.c b/sender.c
/* map the local file */
if (do_fstat(fd, &st) != 0) {
io_error |= IOERR_GENERAL;
/* map the local file */
if (do_fstat(fd, &st) != 0) {
io_error |= IOERR_GENERAL;
-@@ -4
18,6 +46
8,8 @@ void send_files(int f_in, int f_out)
+@@ -4
28,6 +47
8,8 @@ void send_files(int f_in, int f_out)
}
}
close(fd);
}
}
close(fd);
diff --git
a/sparse-block.diff
b/sparse-block.diff
index 1431226aa6c209387537c60f7ee33ee03b005770..6a151947431ecf5bbe0b75c95a95f29e8ddc54a1 100644
(file)
--- a/
sparse-block.diff
+++ b/
sparse-block.diff
@@
-18,7
+18,7
@@
To use this patch, run these commands for a successful build:
./configure (optional if already run)
make
./configure (optional if already run)
make
-based-on:
55b2a06812e39f15f52e92b979600cb82be210cb
+based-on:
d821e4cbfbc66848cdf91a336af26fdb89dd9a8f
diff --git a/fileio.c b/fileio.c
--- a/fileio.c
+++ b/fileio.c
diff --git a/fileio.c b/fileio.c
--- a/fileio.c
+++ b/fileio.c
@@
-42,7
+42,7
@@
diff --git a/fileio.c b/fileio.c
diff --git a/options.c b/options.c
--- a/options.c
+++ b/options.c
diff --git a/options.c b/options.c
--- a/options.c
+++ b/options.c
-@@ -
79,6 +79
,7 @@ int remove_source_files = 0;
+@@ -
80,6 +80
,7 @@ int remove_source_files = 0;
int one_file_system = 0;
int protocol_version = PROTOCOL_VERSION;
int sparse_files = 0;
int one_file_system = 0;
int protocol_version = PROTOCOL_VERSION;
int sparse_files = 0;
@@
-50,7
+50,7
@@
diff --git a/options.c b/options.c
int preallocate_files = 0;
int do_compression = 0;
int do_compression_level = CLVL_NOT_SPECIFIED;
int preallocate_files = 0;
int do_compression = 0;
int do_compression_level = CLVL_NOT_SPECIFIED;
-@@ -69
6,6 +697
,7 @@ static struct poptOption long_options[] = {
+@@ -69
8,6 +699
,7 @@ static struct poptOption long_options[] = {
{"sparse", 'S', POPT_ARG_VAL, &sparse_files, 1, 0, 0 },
{"no-sparse", 0, POPT_ARG_VAL, &sparse_files, 0, 0, 0 },
{"no-S", 0, POPT_ARG_VAL, &sparse_files, 0, 0, 0 },
{"sparse", 'S', POPT_ARG_VAL, &sparse_files, 1, 0, 0 },
{"no-sparse", 0, POPT_ARG_VAL, &sparse_files, 0, 0, 0 },
{"no-S", 0, POPT_ARG_VAL, &sparse_files, 0, 0, 0 },
@@
-58,7
+58,7
@@
diff --git a/options.c b/options.c
{"preallocate", 0, POPT_ARG_NONE, &preallocate_files, 0, 0, 0},
{"inplace", 0, POPT_ARG_VAL, &inplace, 1, 0, 0 },
{"no-inplace", 0, POPT_ARG_VAL, &inplace, 0, 0, 0 },
{"preallocate", 0, POPT_ARG_NONE, &preallocate_files, 0, 0, 0},
{"inplace", 0, POPT_ARG_VAL, &inplace, 1, 0, 0 },
{"no-inplace", 0, POPT_ARG_VAL, &inplace, 0, 0, 0 },
-@@ -272
3,6 +2725
,12 @@ void server_options(char **args, int *argc_p)
+@@ -272
7,6 +2729
,12 @@ void server_options(char **args, int *argc_p)
args[ac++] = arg;
}
args[ac++] = arg;
}
@@
-74,15
+74,15
@@
diff --git a/options.c b/options.c
diff --git a/rsync.1.md b/rsync.1.md
--- a/rsync.1.md
+++ b/rsync.1.md
diff --git a/rsync.1.md b/rsync.1.md
--- a/rsync.1.md
+++ b/rsync.1.md
-@@ -38
4,6 +384,7 @@ has its own detailed description later in this man
page.
+@@ -38
6,6 +386,7 @@ has its own detailed description later in this man
page.
--super receiver attempts super-user activities
--fake-super store/recover privileged attrs using xattrs
--sparse, -S turn sequences of nulls into sparse blocks
+--sparse-block=SIZE set block size used to handle sparse files
--preallocate allocate dest files before writing them
--super receiver attempts super-user activities
--fake-super store/recover privileged attrs using xattrs
--sparse, -S turn sequences of nulls into sparse blocks
+--sparse-block=SIZE set block size used to handle sparse files
--preallocate allocate dest files before writing them
- --write-devices write to devices as files (implies --inplace)
--dry-run, -n perform a trial run with no changes made
--dry-run, -n perform a trial run with no changes made
-@@ -1614,6 +1615,18 @@ your home directory (remove the '=' for that).
+ --whole-file, -W copy files whole (w/o delta-xfer algorithm)
+@@ -1623,6 +1624,18 @@ your home directory (remove the '=' for that).
(as opposed to allocated sequences of null bytes) if the kernel version and
filesystem type support creating holes in the allocated data.
(as opposed to allocated sequences of null bytes) if the kernel version and
filesystem type support creating holes in the allocated data.
diff --git
a/transliterate.diff
b/transliterate.diff
index 97613487d7e43a831d4c95ed4c1e1741fe832e8e..e78a07ef05fcebad3e59f7aab87013931facee96 100644
(file)
--- a/
transliterate.diff
+++ b/
transliterate.diff
@@
-10,11
+10,11
@@
To use this patch, run these commands for a successful build:
./configure (optional if already run)
make
./configure (optional if already run)
make
-based-on:
55b2a06812e39f15f52e92b979600cb82be210cb
+based-on:
d821e4cbfbc66848cdf91a336af26fdb89dd9a8f
diff --git a/flist.c b/flist.c
--- a/flist.c
+++ b/flist.c
diff --git a/flist.c b/flist.c
--- a/flist.c
+++ b/flist.c
-@@ -7
7,6 +77
,7 @@ extern uid_t our_uid;
+@@ -7
8,6 +78
,7 @@ extern uid_t our_uid;
extern struct stats stats;
extern char *filesfrom_host;
extern char *usermap, *groupmap;
extern struct stats stats;
extern char *filesfrom_host;
extern char *usermap, *groupmap;
@@
-22,7
+22,7
@@
diff --git a/flist.c b/flist.c
extern char curr_dir[MAXPATHLEN];
extern char curr_dir[MAXPATHLEN];
-@@ -10
4,6 +105
,8 @@ int file_old_total = 0; /* total of active items that will soon be gone */
+@@ -10
5,6 +106
,8 @@ int file_old_total = 0; /* total of active items that will soon be gone */
int flist_eof = 0; /* all the file-lists are now known */
int xfer_flags_as_varint = 0;
int flist_eof = 0; /* all the file-lists are now known */
int xfer_flags_as_varint = 0;
@@
-31,7
+31,7
@@
diff --git a/flist.c b/flist.c
#define NORMAL_NAME 0
#define SLASH_ENDING_NAME 1
#define DOTDIR_NAME 2
#define NORMAL_NAME 0
#define SLASH_ENDING_NAME 1
#define DOTDIR_NAME 2
-@@ -67
6,6 +679
,23 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
+@@ -67
7,6 +680
,23 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
stats.total_size += F_LENGTH(file);
}
stats.total_size += F_LENGTH(file);
}
@@
-55,7
+55,7
@@
diff --git a/flist.c b/flist.c
static struct file_struct *recv_file_entry(int f, struct file_list *flist, int xflags)
{
static int64 modtime, atime;
static struct file_struct *recv_file_entry(int f, struct file_list *flist, int xflags)
{
static int64 modtime, atime;
-@@ -74
6,9 +766
,13 @@ static struct file_struct *recv_file_entry(int f, struct file_list *flist, int x
+@@ -74
8,9 +768
,13 @@ static struct file_struct *recv_file_entry(int f, struct file_list *flist, int x
outbuf.len = 0;
}
thisname[outbuf.len] = '\0';
outbuf.len = 0;
}
thisname[outbuf.len] = '\0';
@@
-69,7
+69,7
@@
diff --git a/flist.c b/flist.c
if (*thisname
&& (clean_fname(thisname, CFN_REFUSE_DOT_DOT_DIRS) < 0 || (!relative_paths && *thisname == '/'))) {
rprintf(FERROR, "ABORTING due to unsafe pathname from sender: %s\n", thisname);
if (*thisname
&& (clean_fname(thisname, CFN_REFUSE_DOT_DOT_DIRS) < 0 || (!relative_paths && *thisname == '/'))) {
rprintf(FERROR, "ABORTING due to unsafe pathname from sender: %s\n", thisname);
-@@ -25
35,6 +2559
,15 @@ struct file_list *recv_file_list(int f, int dir_ndx)
+@@ -25
60,6 +2584
,15 @@ struct file_list *recv_file_list(int f, int dir_ndx)
parse_name_map(usermap, True);
if (groupmap)
parse_name_map(groupmap, False);
parse_name_map(usermap, True);
if (groupmap)
parse_name_map(groupmap, False);
@@
-88,7
+88,7
@@
diff --git a/flist.c b/flist.c
diff --git a/options.c b/options.c
--- a/options.c
+++ b/options.c
diff --git a/options.c b/options.c
--- a/options.c
+++ b/options.c
-@@ -20
6,6 +206
,7 @@ int logfile_format_has_i = 0;
+@@ -20
7,6 +207
,7 @@ int logfile_format_has_i = 0;
int logfile_format_has_o_or_i = 0;
int always_checksum = 0;
int list_only = 0;
int logfile_format_has_o_or_i = 0;
int always_checksum = 0;
int list_only = 0;
@@
-96,7
+96,7
@@
diff --git a/options.c b/options.c
#define MAX_BATCH_NAME_LEN 256 /* Must be less than MAXPATHLEN-13 */
char *batch_name = NULL;
#define MAX_BATCH_NAME_LEN 256 /* Must be less than MAXPATHLEN-13 */
char *batch_name = NULL;
-@@ -80
4,6 +805
,7 @@ static struct poptOption long_options[] = {
+@@ -80
6,6 +807
,7 @@ static struct poptOption long_options[] = {
{"temp-dir", 'T', POPT_ARG_STRING, &tmpdir, 0, 0, 0 },
{"iconv", 0, POPT_ARG_STRING, &iconv_opt, 0, 0, 0 },
{"no-iconv", 0, POPT_ARG_NONE, 0, OPT_NO_ICONV, 0, 0 },
{"temp-dir", 'T', POPT_ARG_STRING, &tmpdir, 0, 0, 0 },
{"iconv", 0, POPT_ARG_STRING, &iconv_opt, 0, 0, 0 },
{"no-iconv", 0, POPT_ARG_NONE, 0, OPT_NO_ICONV, 0, 0 },
@@
-104,7
+104,7
@@
diff --git a/options.c b/options.c
{"ipv4", '4', POPT_ARG_VAL, &default_af_hint, AF_INET, 0, 0 },
{"ipv6", '6', POPT_ARG_VAL, &default_af_hint, AF_INET6, 0, 0 },
{"8-bit-output", '8', POPT_ARG_VAL, &allow_8bit_chars, 1, 0, 0 },
{"ipv4", '4', POPT_ARG_VAL, &default_af_hint, AF_INET, 0, 0 },
{"ipv6", '6', POPT_ARG_VAL, &default_af_hint, AF_INET6, 0, 0 },
{"8-bit-output", '8', POPT_ARG_VAL, &allow_8bit_chars, 1, 0, 0 },
-@@ -246
1,6 +2463
,24 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+@@ -246
5,6 +2467
,24 @@ int parse_arguments(int *argc_p, const char ***argv_p)
}
}
}
}
@@
-129,7
+129,7
@@
diff --git a/options.c b/options.c
am_starting_up = 0;
return 1;
am_starting_up = 0;
return 1;
-@@ -29
09,6 +2929
,12 @@ void server_options(char **args, int *argc_p)
+@@ -29
13,6 +2933
,12 @@ void server_options(char **args, int *argc_p)
if (relative_paths && !implied_dirs && (!am_sender || protocol_version >= 30))
args[ac++] = "--no-implied-dirs";
if (relative_paths && !implied_dirs && (!am_sender || protocol_version >= 30))
args[ac++] = "--no-implied-dirs";
@@
-145,7
+145,7
@@
diff --git a/options.c b/options.c
diff --git a/rsync.1.md b/rsync.1.md
--- a/rsync.1.md
+++ b/rsync.1.md
diff --git a/rsync.1.md b/rsync.1.md
--- a/rsync.1.md
+++ b/rsync.1.md
-@@ -47
3,6 +473,7 @@ has its own detailed description later in this man
page.
+@@ -47
4,6 +474,7 @@ has its own detailed description later in this man
page.
--read-batch=FILE read a batched update from FILE
--protocol=NUM force an older protocol version to be used
--iconv=CONVERT_SPEC request charset conversion of filenames
--read-batch=FILE read a batched update from FILE
--protocol=NUM force an older protocol version to be used
--iconv=CONVERT_SPEC request charset conversion of filenames
@@
-153,7
+153,7
@@
diff --git a/rsync.1.md b/rsync.1.md
--checksum-seed=NUM set block/file checksum seed (advanced)
--ipv4, -4 prefer IPv4
--ipv6, -6 prefer IPv6
--checksum-seed=NUM set block/file checksum seed (advanced)
--ipv4, -4 prefer IPv4
--ipv6, -6 prefer IPv6
-@@ -35
58,6 +3559
,25 @@ your home directory (remove the '=' for that).
+@@ -35
67,6 +3568
,25 @@ your home directory (remove the '=' for that).
free to specify just the local charset for a daemon transfer (e.g.
`--iconv=utf8`).
free to specify just the local charset for a daemon transfer (e.g.
`--iconv=utf8`).
diff --git
a/xxh3-safety-check.diff
b/xxh3-safety-check.diff
index d999bd342a9ec4f5a0029d497466c87ea5089495..cb3e337d01a6dae8522823c1dd00308a6ff795c9 100644
(file)
--- a/
xxh3-safety-check.diff
+++ b/
xxh3-safety-check.diff
@@
-6,7
+6,7
@@
To use this patch, run these commands for a successful build:
patch -p1 <patches/xxh3-safety-check.diff
make
patch -p1 <patches/xxh3-safety-check.diff
make
-based-on:
55b2a06812e39f15f52e92b979600cb82be210cb
+based-on:
d821e4cbfbc66848cdf91a336af26fdb89dd9a8f
diff --git a/checksum.c b/checksum.c
--- a/checksum.c
+++ b/checksum.c
diff --git a/checksum.c b/checksum.c
--- a/checksum.c
+++ b/checksum.c
git.samba.org / rsync-patches.git / commitdiff