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
Adding --chown=USER:GROUP alias for simple usecases of the
[rsync/rsync-patches.git]
/
source-filter_dest-filter.diff
diff --git
a/source-filter_dest-filter.diff
b/source-filter_dest-filter.diff
index
45c51f1
..
f8fcff2
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;
-@@ -7
08,7 +709
,7 @@ void itemize(const char *fnamecmp, struct file_struct *file, int ndx, int statre
+@@ -7
14,7 +715
,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)
{
@@
-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
53,6 +1972
,25 @@ void server_options(char **args, int *argc_p)
+@@ -19
67,6 +1986
,25 @@ void server_options(char **args, int *argc_p)
}
}
}
}
@@
-171,7
+171,7
@@
diff --git a/pipe.c b/pipe.c
+{
+ pid_t pid;
+ int pipefds[2];
+{
+ pid_t pid;
+ int pipefds[2];
-+
++
+ if (verbose >= 2)
+ print_child_argv("opening connection using:", command);
+
+ if (verbose >= 2)
+ print_child_argv("opening connection using:", command);
+
@@
-215,7
+215,7
@@
diff --git a/pipe.c b/pipe.c
+pid_t run_filter_on_file(char *command[], int out, int in)
+{
+ pid_t pid;
+pid_t run_filter_on_file(char *command[], int out, int in)
+{
+ pid_t pid;
-+
++
+ if (verbose >= 2)
+ print_child_argv("opening connection using:", command);
+
+ if (verbose >= 2)
+ print_child_argv("opening connection using:", command);
+
@@
-314,7
+314,7
@@
diff --git a/receiver.c b/receiver.c
diff --git a/rsync.h b/rsync.h
--- a/rsync.h
+++ b/rsync.h
diff --git a/rsync.h b/rsync.h
--- a/rsync.h
+++ b/rsync.h
-@@ -13
4,6 +134
,7 @@
+@@ -13
7,6 +137
,7 @@
#define IOERR_DEL_LIMIT (1<<2)
#define MAX_ARGS 1000
#define IOERR_DEL_LIMIT (1<<2)
#define MAX_ARGS 1000
@@
-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
33,6 +2036
,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.
@@
-387,7
+387,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;
-@@ -1
81,6 +182
,26 @@ void send_files(int f_in, int f_out)
+@@ -1
75,6 +176
,26 @@ void send_files(int f_in, int f_out)
enum logcode log_code = log_before_transfer ? FLOG : FINFO;
int f_xfer = write_batch < 0 ? batch_fd : f_out;
int ndx, j;
enum logcode log_code = log_before_transfer ? FLOG : FINFO;
int f_xfer = write_batch < 0 ? batch_fd : f_out;
int ndx, j;
@@
-414,7
+414,7
@@
diff --git a/sender.c b/sender.c
if (verbose > 2)
rprintf(FINFO, "send_files starting\n");
if (verbose > 2)
rprintf(FINFO, "send_files starting\n");
-@@ -2
85,6 +306
,7 @@ void send_files(int f_in, int f_out)
+@@ -2
79,6 +300
,7 @@ void send_files(int f_in, int f_out)
exit_cleanup(RERR_PROTOCOL);
}
exit_cleanup(RERR_PROTOCOL);
}
@@
-422,7
+422,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) {
-@@ -30
6,6 +328
,33 @@ void send_files(int f_in, int f_out)
+@@ -30
0,6 +322
,33 @@ void send_files(int f_in, int f_out)
continue;
}
continue;
}
@@
-456,7
+456,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;
-@@ -35
6,6 +405
,8 @@ void send_files(int f_in, int f_out)
+@@ -35
0,6 +399
,8 @@ void send_files(int f_in, int f_out)
}
}
close(fd);
}
}
close(fd);