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]
/
checksum-updating.diff
diff --git
a/checksum-updating.diff
b/checksum-updating.diff
index
3ae0047
..
567cac3
100644
(file)
--- a/
checksum-updating.diff
+++ b/
checksum-updating.diff
@@
-446,7
+446,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
-@@ -11
5,6 +115
,7 @@ static int dir_tweaking;
+@@ -11
4,6 +114
,7 @@ static int dir_tweaking;
static int symlink_timeset_failed_flags;
static int need_retouch_dir_times;
static int need_retouch_dir_perms;
static int symlink_timeset_failed_flags;
static int need_retouch_dir_times;
static int need_retouch_dir_perms;
@@
-454,7
+454,7
@@
diff --git a/generator.c b/generator.c
static const char *solo_file = NULL;
/* For calling delete_item() and delete_dir_contents(). */
static const char *solo_file = NULL;
/* For calling delete_item() and delete_dir_contents(). */
-@@ -72
4,7 +725
,7 @@ int unchanged_file(char *fn, struct file_struct *file, STRUCT_STAT *st, int slot
+@@ -72
3,7 +724
,7 @@ int unchanged_file(char *fn, struct file_struct *file, STRUCT_STAT *st, int slot
if (always_checksum > 0 && S_ISREG(st->st_mode)) {
char sum[MAX_DIGEST_LEN];
if (checksum_files && slot >= 0)
if (always_checksum > 0 && S_ISREG(st->st_mode)) {
char sum[MAX_DIGEST_LEN];
if (checksum_files && slot >= 0)
@@
-463,7
+463,7
@@
diff --git a/generator.c b/generator.c
else
file_checksum(fn, st->st_size, sum);
return memcmp(sum, F_SUM(file), checksum_len) == 0;
else
file_checksum(fn, st->st_size, sum);
return memcmp(sum, F_SUM(file), checksum_len) == 0;
-@@ -136
7,7 +1368
,8 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
+@@ -136
6,7 +1367
,8 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
fuzzy_dirlist = get_dirlist(fnamecmpbuf, -1, 1);
}
if (checksum_files) {
fuzzy_dirlist = get_dirlist(fnamecmpbuf, -1, 1);
}
if (checksum_files) {
@@
-473,7
+473,7
@@
diff --git a/generator.c b/generator.c
}
need_new_dirscan = 0;
}
}
need_new_dirscan = 0;
}
-@@ -151
7,6 +1519
,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
+@@ -151
6,6 +1518
,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
else
change_local_filter_dir(fname, strlen(fname), F_DEPTH(file));
}
else
change_local_filter_dir(fname, strlen(fname), F_DEPTH(file));
}
@@
-481,7
+481,7
@@
diff --git a/generator.c b/generator.c
goto cleanup;
}
goto cleanup;
}
-@@ -180
9,6 +1812
,8 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
+@@ -180
8,6 +1811
,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);
handle_partial_dir(partialptr, PDIR_DELETE);
}
set_file_attrs(fname, file, &sx, NULL, maybe_ATTRS_REPORT);
@@
-490,7
+490,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
-@@ -22
55,6 +2260
,7 @@ void generate_files(int f_out, const char *local_name)
+@@ -22
49,6 +2254
,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));
}
@@
-498,7
+498,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];
-@@ -233
8,6 +2344
,9 @@ void generate_files(int f_out, const char *local_name)
+@@ -233
2,6 +2338
,9 @@ void generate_files(int f_out, const char *local_name)
wait_for_receiver();
}
wait_for_receiver();
}
@@
-519,7
+519,7
@@
diff --git a/io.c b/io.c
extern int protocol_version;
extern int remove_source_files;
extern int preserve_hard_links;
extern int protocol_version;
extern int remove_source_files;
extern int preserve_hard_links;
-@@ -20
6,6 +207
,9 @@ static void got_flist_entry_status(enum festatus status, const char *buf)
+@@ -20
3,6 +204
,9 @@ static void got_flist_entry_status(enum festatus status, const char *buf)
flist_ndx_push(&hlink_list, ndx);
flist->in_progress++;
}
flist_ndx_push(&hlink_list, ndx);
flist->in_progress++;
}