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:
5e5e5be
)
The patches for 3.3.0.
master
v3.3.0
author
Wayne Davison
<wayne@opencoder.net>
Sat, 6 Apr 2024 16:38:13 +0000
(09:38 -0700)
committer
Wayne Davison
<wayne@opencoder.net>
Sat, 6 Apr 2024 16:38:13 +0000
(09:38 -0700)
24 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
clone-dest.diff
patch
|
blob
|
history
congestion.diff
patch
|
blob
|
history
date-only.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
diff --git
a/backup-deleted.diff
b/backup-deleted.diff
index 6a08ebd4e69a1af6db8994565553ca48a5b8ab29..0cbf2bb0029984a0c6764aec488f915655c05be6 100644
(file)
--- a/
backup-deleted.diff
+++ b/
backup-deleted.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:
9a06b2edb0ea1a226bcc642682c07bacd2ea47d3
+based-on:
6c8ca91c731b7bf2b081694bda85b7dadc2b7aff
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/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 },
-@@ -280
3,6 +2804
,10 @@ void server_options(char **args, int *argc_p)
+@@ -280
5,6 +2806
,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) {
diff --git
a/backup-dir-dels.diff
b/backup-dir-dels.diff
index a6274a766ae17b1c0121eca2b0f12e88966f8e9a..50ac8762bc6520526e67a0ba55844aba70e4af2d 100644
(file)
--- a/
backup-dir-dels.diff
+++ b/
backup-dir-dels.diff
@@
-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 },
-@@ -225
1,6 +2259
,8 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+@@ -225
3,6 +2261
,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;
-@@ -227
2,6 +2282
,14 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+@@ -227
4,6 +2284
,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)
-@@ -228
3,6 +2301
,20 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+@@ -228
5,6 +2303
,20 @@ int parse_arguments(int *argc_p, const char ***argv_p)
backup_suffix);
goto cleanup;
}
backup_suffix);
goto cleanup;
}
@@
-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 */
-@@ -23
19,6 +2351
,34 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+@@ -23
21,6 +2353
,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. */
-@@ -27
88,11 +2848
,20 @@ void server_options(char **args, int *argc_p)
+@@ -27
90,11 +2850
,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);
}
diff --git
a/catch_crash_signals.diff
b/catch_crash_signals.diff
index 226d58c2863d511e60dc92c85dcbb0e71d4b39a4..e1aed5fa4f3e35feeafbe64976ba56d057c4c7e6 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:
9a06b2edb0ea1a226bcc642682c07bacd2ea47d3
+based-on:
6c8ca91c731b7bf2b081694bda85b7dadc2b7aff
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 c2479a61297a18883f6aec041e8a83f862044fc0..50ac08aca1f76f8f5a33d09d17894e569903c86e 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:
9a06b2edb0ea1a226bcc642682c07bacd2ea47d3
+based-on:
6c8ca91c731b7bf2b081694bda85b7dadc2b7aff
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
@@
-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);
-@@ -211
6,6 +2135
,9 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+@@ -211
8,6 +2137
,9 @@ int parse_arguments(int *argc_p, const char ***argv_p)
}
#endif
}
#endif
diff --git
a/clone-dest.diff
b/clone-dest.diff
index 1bca3d442fa719dc40de070f6666963bf5c03188..5ff5107df506084cc40346c97a6d061668352a89 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:
9a06b2edb0ea1a226bcc642682c07bacd2ea47d3
+based-on:
6c8ca91c731b7bf2b081694bda85b7dadc2b7aff
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
@@
-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)
-@@ -27
19,6 +2720
,18 @@ expand it.
+@@ -27
20,6 +2721
,18 @@ expand it.
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 095847defd42f29a839ce8bed8ead2452fe98151..3049959e30cdbc59481b51243afceecd0f4b575d 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:
9a06b2edb0ea1a226bcc642682c07bacd2ea47d3
+based-on:
6c8ca91c731b7bf2b081694bda85b7dadc2b7aff
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
diff --git
a/date-only.diff
b/date-only.diff
index 9a249d27300902a9c63aef0416018e5bc542d768..f787b1ffad16f6ec9b5655e2e7854aec03176f40 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:
9a06b2edb0ea1a226bcc642682c07bacd2ea47d3
+based-on:
6c8ca91c731b7bf2b081694bda85b7dadc2b7aff
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
@@
-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 },
-@@ -285
0,6 +2852
,9 @@ void server_options(char **args, int *argc_p)
+@@ -285
2,6 +2854
,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";
diff --git
a/detect-renamed-lax.diff
b/detect-renamed-lax.diff
index c02c2624270108ae9ef3ae36929313d0811fa47c..edb683ea90143ab6fc31c168ba519f3e79d33b53 100644
(file)
--- a/
detect-renamed-lax.diff
+++ b/
detect-renamed-lax.diff
@@
-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 },
-@@ -283
6,8 +2838
,14 @@ void server_options(char **args, int *argc_p)
+@@ -283
8,8 +2840
,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";
@@
-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
-@@ -265
1,6 +2653
,20 @@ expand it.
+@@ -265
2,6 +2654
,20 @@ expand it.
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 1329ab93ede74d1dfc027f96726bb8b966515c8f..af22b1d3d063963a921593f24965db7a2ebde9a1 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:
9a06b2edb0ea1a226bcc642682c07bacd2ea47d3
+based-on:
6c8ca91c731b7bf2b081694bda85b7dadc2b7aff
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
@@
-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 },
-@@ -2
398,7 +2400
,7 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+@@ -2
400,7 +2402
,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) {
-@@ -240
7,6 +2409
,7 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+@@ -240
9,6 +2411
,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");
goto cleanup;
}
delay_updates ? "delay-updates" : "partial-dir");
goto cleanup;
}
-@@ -283
3,6 +2836
,8 @@ void server_options(char **args, int *argc_p)
+@@ -283
5,6 +2838
,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";
@@
-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
-@@ -263
4,6 +2635
,22 @@ expand it.
+@@ -263
5,6 +2636
,22 @@ expand it.
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.
diff --git
a/direct-io.diff
b/direct-io.diff
index 9b1be3edc34d55eebc3a2cda47a6fda305428cdc..8aaabd7e055448385971792b25f2b46bfb6c269f 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:
9a06b2edb0ea1a226bcc642682c07bacd2ea47d3
+based-on:
6c8ca91c731b7bf2b081694bda85b7dadc2b7aff
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
@@
-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
-@@ -343
2,6 +3433
,17 @@ expand it.
+@@ -343
3,6 +3434
,17 @@ expand it.
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 1ee88a15f6968802469017e75e551a0a1ffaea89..7cdc377b580dffad65a7b6dae78867db83fc24d0 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:
9a06b2edb0ea1a226bcc642682c07bacd2ea47d3
+based-on:
6c8ca91c731b7bf2b081694bda85b7dadc2b7aff
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
diff --git
a/fileflags.diff
b/fileflags.diff
index bc7111f9a952f7db0865a4e6c9d0cf9d5cbe77c5..9f7f1ca4be587ba906433261170c77faf4e26ed6 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:
9a06b2edb0ea1a226bcc642682c07bacd2ea47d3
+based-on:
6c8ca91c731b7bf2b081694bda85b7dadc2b7aff
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
@@
-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++) {
-@@ -273
2,6 +2750
,9 @@ void server_options(char **args, int *argc_p)
+@@ -273
4,6 +2752
,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;
-@@ -282
7,6 +2848
,16 @@ void server_options(char **args, int *argc_p)
+@@ -282
9,6 +2850
,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";
@@
-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`
-@@ -309
8,7 +3134
,7 @@ expand it.
+@@ -309
9,7 +3135
,7 @@ expand it.
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 fce3fdadc4e82aa52abf5c6667e339074ad59751..44b7bc2e84ad9f83109f1a606545bfb42c0a0cde 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:
9a06b2edb0ea1a226bcc642682c07bacd2ea47d3
+based-on:
6c8ca91c731b7bf2b081694bda85b7dadc2b7aff
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
@@
-59,7
+59,7
@@
diff --git a/exclude.c b/exclude.c
if (ex->rflags & FILTRULE_PERDIR_MERGE)
teardown_mergelist(ex);
free(ex->pattern);
if (ex->rflags & FILTRULE_PERDIR_MERGE)
teardown_mergelist(ex);
free(ex->pattern);
-@@ -100
5,7 +1027
,9 @@ static void report_filter_result(enum logcode code, char const *name,
+@@ -100
6,7 +1028
,9 @@ static void report_filter_result(enum logcode code, char const *name,
/* This function is used to check if a file should be included/excluded
* from the list of files based on its name and type etc. The value of
/* This function is used to check if a file should be included/excluded
* from the list of files based on its name and type etc. The value of
@@
-70,7
+70,7
@@
diff --git a/exclude.c b/exclude.c
int name_is_excluded(const char *fname, int name_flags, int filter_level)
{
if (daemon_filter_list.head && check_filter(&daemon_filter_list, FLOG, fname, name_flags) < 0) {
int name_is_excluded(const char *fname, int name_flags, int filter_level)
{
if (daemon_filter_list.head && check_filter(&daemon_filter_list, FLOG, fname, name_flags) < 0) {
-@@ -101
4,6 +1038
,9 @@ int name_is_excluded(const char *fname, int name_flags, int filter_level)
+@@ -101
5,6 +1039
,9 @@ int name_is_excluded(const char *fname, int name_flags, int filter_level)
return 1;
}
return 1;
}
@@
-80,7
+80,7
@@
diff --git a/exclude.c b/exclude.c
if (filter_level != ALL_FILTERS)
return 0;
if (filter_level != ALL_FILTERS)
return 0;
-@@ -103
3,7 +1060
,8 @@ int check_server_filter(filter_rule_list *listp, enum logcode code, const char *
+@@ -103
4,7 +1061
,8 @@ int check_server_filter(filter_rule_list *listp, enum logcode code, const char *
}
/* Return -1 if file "name" is defined to be excluded by the specified
}
/* Return -1 if file "name" is defined to be excluded by the specified
@@
-90,7
+90,7
@@
diff --git a/exclude.c b/exclude.c
int check_filter(filter_rule_list *listp, enum logcode code,
const char *name, int name_flags)
{
int check_filter(filter_rule_list *listp, enum logcode code,
const char *name, int name_flags)
{
-@@ -105
6,10 +1084
,12 @@ int check_filter(filter_rule_list *listp, enum logcode code,
+@@ -105
7,10 +1085
,12 @@ int check_filter(filter_rule_list *listp, enum logcode code,
}
if (rule_matches(name, ent, name_flags)) {
report_filter_result(code, name, ent, name_flags, listp->debug_type);
}
if (rule_matches(name, ent, name_flags)) {
report_filter_result(code, name, ent, name_flags, listp->debug_type);
@@
-103,7
+103,7
@@
diff --git a/exclude.c b/exclude.c
return 0;
}
return 0;
}
-@@ -107
6,9 +1106
,45 @@ static const uchar *rule_strcmp(const uchar *str, const char *rule, int rule_len
+@@ -107
7,9 +1107
,45 @@ static const uchar *rule_strcmp(const uchar *str, const char *rule, int rule_len
return NULL;
}
return NULL;
}
@@
-150,7
+150,7
@@
diff --git a/exclude.c b/exclude.c
/* Gets the next include/exclude rule from *rulestr_ptr and advances
* *rulestr_ptr to point beyond it. Stores the pattern's start (within
/* Gets the next include/exclude rule from *rulestr_ptr and advances
* *rulestr_ptr to point beyond it. Stores the pattern's start (within
-@@ -109
3,6 +1159
,7 @@ static filter_rule *parse_rule_tok(const char **rulestr_ptr,
+@@ -109
4,6 +1160
,7 @@ static filter_rule *parse_rule_tok(const char **rulestr_ptr,
const char **pat_ptr, unsigned int *pat_len_ptr)
{
const uchar *s = (const uchar *)*rulestr_ptr;
const char **pat_ptr, unsigned int *pat_len_ptr)
{
const uchar *s = (const uchar *)*rulestr_ptr;
@@
-158,7
+158,7
@@
diff --git a/exclude.c b/exclude.c
filter_rule *rule;
unsigned int len;
filter_rule *rule;
unsigned int len;
-@@ -111
1,6 +1178
,12 @@ static filter_rule *parse_rule_tok(const char **rulestr_ptr,
+@@ -111
2,6 +1179
,12 @@ static filter_rule *parse_rule_tok(const char **rulestr_ptr,
/* Inherit from the template. Don't inherit FILTRULES_SIDES; we check
* that later. */
rule->rflags = template->rflags & FILTRULES_FROM_CONTAINER;
/* Inherit from the template. Don't inherit FILTRULES_SIDES; we check
* that later. */
rule->rflags = template->rflags & FILTRULES_FROM_CONTAINER;
@@
-171,7
+171,7
@@
diff --git a/exclude.c b/exclude.c
/* Figure out what kind of a filter rule "s" is pointing at. Note
* that if FILTRULE_NO_PREFIXES is set, the rule is either an include
/* Figure out what kind of a filter rule "s" is pointing at. Note
* that if FILTRULE_NO_PREFIXES is set, the rule is either an include
-@@ -125
7,11 +1330
,63 @@ static filter_rule *parse_rule_tok(const char **rulestr_ptr,
+@@ -125
8,11 +1331
,63 @@ static filter_rule *parse_rule_tok(const char **rulestr_ptr,
goto invalid;
rule->rflags |= FILTRULE_EXCLUDE_SELF;
break;
goto invalid;
rule->rflags |= FILTRULE_EXCLUDE_SELF;
break;
@@
-235,7
+235,7
@@
diff --git a/exclude.c b/exclude.c
case 'p':
rule->rflags |= FILTRULE_PERISHABLE;
break;
case 'p':
rule->rflags |= FILTRULE_PERISHABLE;
break;
-@@ -157
5,6 +1700
,23 @@ char *get_rule_prefix(filter_rule *rule, const char *pat, int for_xfer,
+@@ -157
6,6 +1701
,23 @@ char *get_rule_prefix(filter_rule *rule, const char *pat, int for_xfer,
else if (am_sender)
return NULL;
}
else if (am_sender)
return NULL;
}
@@
-349,7
+349,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.
-@@ -303
2,6 +3034
,10 @@ expand it.
+@@ -303
3,6 +3035
,10 @@ expand it.
An older rsync client may need to use [`-s`](#opt) to avoid a complaint
about wildcard characters, but a modern rsync handles this automatically.
An older rsync client may need to use [`-s`](#opt) to avoid a complaint
about wildcard characters, but a modern rsync handles this automatically.
@@
-360,7
+360,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
-@@ -418
6,6 +4192
,15 @@ The following modifiers are accepted after an include (+) or exclude (-) rule:
+@@ -418
7,6 +4193
,15 @@ The following modifiers are accepted after an include (+) or exclude (-) rule:
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.
@@
-376,7
+376,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
-@@ -424
3,6 +4258
,12 @@ The following modifiers are accepted after a merge or dir-merge rule:
+@@ -424
4,6 +4259
,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`).
diff --git
a/ignore-case.diff
b/ignore-case.diff
index 39dff430e1a8ea2046d891806e653fc5dda5f893..97b36b5b2162096c2aedefb6947db59343e8d407 100644
(file)
--- a/
ignore-case.diff
+++ b/
ignore-case.diff
@@
-12,11
+12,11
@@
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:
9a06b2edb0ea1a226bcc642682c07bacd2ea47d3
+based-on:
6c8ca91c731b7bf2b081694bda85b7dadc2b7aff
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
-@@ -96
5,16 +965
,15 @@ static int rule_matches(const char *fname, filter_rule *ex, int name_flags)
+@@ -96
6,16 +966
,15 @@ static int rule_matches(const char *fname, filter_rule *ex, int name_flags)
if (litmatch_array(pattern, strings, slash_handling))
return ret_match;
} else if (anchored_match) {
if (litmatch_array(pattern, strings, slash_handling))
return ret_match;
} else if (anchored_match) {
@@
-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},
-@@ -286
3,6 +2866
,9 @@ void server_options(char **args, int *argc_p)
+@@ -286
5,6 +2868
,9 @@ void server_options(char **args, int *argc_p)
args[ac++] = arg;
}
args[ac++] = arg;
}
@@
-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
-@@ -258
2,6 +2583
,12 @@ expand it.
+@@ -258
3,6 +2584
,12 @@ expand it.
> 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 83dac1092643142ea6102daf49aa28a9277fb844..39ec1ae9f23aa4e20a8b3f42eb08008e1f20594d 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:
9a06b2edb0ea1a226bcc642682c07bacd2ea47d3
+based-on:
6c8ca91c731b7bf2b081694bda85b7dadc2b7aff
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 f8134cf9445cbdbfdab48a78e267c65e76a54a5e..c3593a98aac18ea0b183627a376e05d137a59312 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:
9a06b2edb0ea1a226bcc642682c07bacd2ea47d3
+based-on:
6c8ca91c731b7bf2b081694bda85b7dadc2b7aff
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
@@
-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);
-@@ -225
0,6 +2270
,8 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+@@ -225
2,6 +2272
,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;
-@@ -29
39,6 +2961
,12 @@ void server_options(char **args, int *argc_p)
+@@ -29
41,6 +2963
,12 @@ void server_options(char **args, int *argc_p)
args[ac++] = "--no-W";
}
args[ac++] = "--no-W";
}
@@
-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)
-@@ -27
19,6 +2720
,50 @@ expand it.
+@@ -27
20,6 +2721
,50 @@ expand it.
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 8831f97afe1e917d22f2fcac71ef4e3631e377d9..5caceb71da20be5c06926a3b54e6302c03cf489a 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:
9a06b2edb0ea1a226bcc642682c07bacd2ea47d3
+based-on:
6c8ca91c731b7bf2b081694bda85b7dadc2b7aff
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
@@
-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 },
-@@ -23
19,7 +2321
,7 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+@@ -23
21,7 +2323
,7 @@ 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);
}
@@
-76,7
+76,7
@@
diff --git a/options.c b/options.c
omit_dir_times = -1; /* Implied, so avoid -O to sender. */
if (stdout_format) {
omit_dir_times = -1; /* Implied, so avoid -O to sender. */
if (stdout_format) {
-@@ -283
5,6 +2837
,8 @@ void server_options(char **args, int *argc_p)
+@@ -283
7,6 +2839
,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";
diff --git
a/slow-down.diff
b/slow-down.diff
index 43992c84d62162bfb48d817eed3745307101610b..f876251d3c6ac6e62e882d048e35ec0635285061 100644
(file)
--- a/
slow-down.diff
+++ b/
slow-down.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:
9a06b2edb0ea1a226bcc642682c07bacd2ea47d3
+based-on:
6c8ca91c731b7bf2b081694bda85b7dadc2b7aff
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
diff --git
a/slp.diff
b/slp.diff
index 53ffbdc7cf000c5ec491f97f1d6c465661618c40..d009ab775563baa85f8dfc4fd359d873582a9f53 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:
9a06b2edb0ea1a226bcc642682c07bacd2ea47d3
+based-on:
6c8ca91c731b7bf2b081694bda85b7dadc2b7aff
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/soften-links.diff
b/soften-links.diff
index c6934561fd1ac534ec711c6deadab905b2856f5a..f8d128229f443d1508fbea22d7e65cc4d5527136 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:
9a06b2edb0ea1a226bcc642682c07bacd2ea47d3
+based-on:
6c8ca91c731b7bf2b081694bda85b7dadc2b7aff
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 c557f954c54c72176d76c2a4566dcaa964a1c8de..999caaa6a29d4069cf53ba1f986efa2e08fdcbb7 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:
9a06b2edb0ea1a226bcc642682c07bacd2ea47d3
+based-on:
6c8ca91c731b7bf2b081694bda85b7dadc2b7aff
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
@@
-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 },
-@@ -28
38,6 +2840
,8 @@ void server_options(char **args, int *argc_p)
+@@ -28
40,6 +2842
,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);
diff --git
a/source-filter_dest-filter.diff
b/source-filter_dest-filter.diff
index f8998f19ae88831e9bfaeddbcc2db3d7ab8dd8a0..3f63d3080ac0fa189c7be215f26e223f6e63f7c3 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:
9a06b2edb0ea1a226bcc642682c07bacd2ea47d3
+based-on:
6c8ca91c731b7bf2b081694bda85b7dadc2b7aff
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
@@
-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 },
-@@ -244
2,6 +2448
,16 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+@@ -244
4,6 +2450
,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;
-@@ -285
0,6 +2866
,25 @@ void server_options(char **args, int *argc_p)
+@@ -285
2,6 +2868
,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";
@@
-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)
-@@ -371
2,6 +3715
,36 @@ expand it.
+@@ -371
3,6 +3716
,36 @@ expand it.
[`--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.
diff --git
a/sparse-block.diff
b/sparse-block.diff
index dbce782555192482d8d143b2f50c79db8cfbc27c..474747cace2086eae610cf11050563c5b04f5a8c 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:
9a06b2edb0ea1a226bcc642682c07bacd2ea47d3
+based-on:
6c8ca91c731b7bf2b081694bda85b7dadc2b7aff
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
@@
-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 },
-@@ -277
0,6 +2772
,12 @@ void server_options(char **args, int *argc_p)
+@@ -277
2,6 +2774
,12 @@ void server_options(char **args, int *argc_p)
args[ac++] = arg;
}
args[ac++] = arg;
}
diff --git
a/transliterate.diff
b/transliterate.diff
index 50ac6cf9c113c4839ce1fca54004034cc923e5fc..fc7d222b6d0824fc570bf060b2e69027da182168 100644
(file)
--- a/
transliterate.diff
+++ b/
transliterate.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:
9a06b2edb0ea1a226bcc642682c07bacd2ea47d3
+based-on:
6c8ca91c731b7bf2b081694bda85b7dadc2b7aff
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
@@
-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 },
-@@ -24
88,6 +2490
,24 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+@@ -24
90,6 +2492
,24 @@ int parse_arguments(int *argc_p, const char ***argv_p)
}
}
}
}
@@
-129,7
+129,7
@@
diff --git a/options.c b/options.c
if (trust_sender || am_server || read_batch)
trust_sender_args = trust_sender_filter = 1;
else if (old_style_args || filesfrom_host != NULL)
if (trust_sender || am_server || read_batch)
trust_sender_args = trust_sender_filter = 1;
else if (old_style_args || filesfrom_host != NULL)
-@@ -295
6,6 +2976
,12 @@ void server_options(char **args, int *argc_p)
+@@ -295
8,6 +2978
,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";
@@
-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
-@@ -375
4,6 +3755
,22 @@ expand it.
+@@ -375
5,6 +3756
,22 @@ expand it.
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`).