Matt McCutchen's Web Site
/
rsync
/
rsync-patches.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
The patches for 3.0.4pre2.
[rsync/rsync-patches.git]
/
source-filter_dest-filter.diff
diff --git
a/source-filter_dest-filter.diff
b/source-filter_dest-filter.diff
index
de0410b
..
384e5f3
100644
(file)
--- a/
source-filter_dest-filter.diff
+++ b/
source-filter_dest-filter.diff
@@
-41,7
+41,7
@@
diff --git a/generator.c b/generator.c
extern int size_only;
extern OFF_T max_size;
extern OFF_T min_size;
extern int size_only;
extern OFF_T max_size;
extern OFF_T min_size;
-@@ -71
4,7 +715
,7 @@ void itemize(const char *fnamecmp, struct file_struct *file, int ndx, int statre
+@@ -71
5,7 +716
,7 @@ void itemize(const char *fnamecmp, struct file_struct *file, int ndx, int statre
/* Perform our quick-check heuristic for determining if a file is unchanged. */
int unchanged_file(char *fn, struct file_struct *file, STRUCT_STAT *st)
{
/* Perform our quick-check heuristic for determining if a file is unchanged. */
int unchanged_file(char *fn, struct file_struct *file, STRUCT_STAT *st)
{
@@
-53,7
+53,7
@@
diff --git a/generator.c b/generator.c
diff --git a/main.c b/main.c
--- a/main.c
+++ b/main.c
diff --git a/main.c b/main.c
--- a/main.c
+++ b/main.c
-@@ -13
6,7 +136
,7 @@ pid_t wait_process(pid_t pid, int *status_ptr, int flags)
+@@ -13
9,7 +139
,7 @@ pid_t wait_process(pid_t pid, int *status_ptr, int flags)
}
/* Wait for a process to exit, calling io_flush while waiting. */
}
/* Wait for a process to exit, calling io_flush while waiting. */
@@
-133,7
+133,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;
-@@ -19
59,6 +1978
,25 @@ void server_options(char **args, int *argc_p)
+@@ -19
67,6 +1986
,25 @@ void server_options(char **args, int *argc_p)
}
}
}
}
@@
-342,7
+342,7
@@
diff --git a/rsync.yo b/rsync.yo
--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)
-@@ -20
39,6 +2042
,33 @@ file previously generated by bf(--write-batch).
+@@ -20
51,6 +2054
,33 @@ file previously generated by bf(--write-batch).
If em(FILE) is bf(-), the batch data will be read from standard input.
See the "BATCH MODE" section for details.
If em(FILE) is bf(-), the batch data will be read from standard input.
See the "BATCH MODE" section for details.