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
- Added the ability to match a range of ID numbers.
[rsync/rsync-patches.git]
/
checksum-updating.diff
diff --git
a/checksum-updating.diff
b/checksum-updating.diff
index
afcf00a
..
e85c8a7
100644
(file)
--- a/
checksum-updating.diff
+++ b/
checksum-updating.diff
@@
-389,8
+389,8
@@
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
-@@ -13
64,6 +1575
,8 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
- if (
excl_ret
) {
+@@ -13
71,6 +1582
,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 (S_ISREG(st.st_mode))
if (ignore_perishable)
non_perishable_cnt++;
+ if (S_ISREG(st.st_mode))
@@
-398,7
+398,7
@@
diff --git a/flist.c b/flist.c
return NULL;
}
return NULL;
}
-@@ -141
0,13 +1623
,13 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
+@@ -141
7,13 +1630
,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)
@@
-414,7
+414,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' */
-@@ -1
498,7 +1711
,7 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
+@@ -1
509,7 +1722
,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)
@@
-423,7
+423,7
@@
diff --git a/flist.c b/flist.c
else
file_checksum(thisname, st.st_size, tmp_sum);
}
else
file_checksum(thisname, st.st_size, tmp_sum);
}
-@@ -18
24,6 +2037
,9 @@ static void send_directory(int f, struct file_list *flist, char *fbuf, int len,
+@@ -18
39,6 +2052
,9 @@ static void send_directory(int f, struct file_list *flist, char *fbuf, int len,
closedir(d);
closedir(d);
@@
-433,7
+433,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". */
-@@ -24
17,6 +2633
,9 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
+@@ -24
35,6 +2651
,9 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
}
} else
flist_eof = 1;
}
} else
flist_eof = 1;
@@
-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
0,7 +721
,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;
-@@ -13
53,7 +1354
,8 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
+@@ -13
66,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;
}
-@@ -1
498,6 +1500
,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
+@@ -1
516,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;
}
-@@ -1
790,6 +1793
,8 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
+@@ -1
808,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
04,6 +2209
,7 @@ void generate_files(int f_out, const char *local_name)
+@@ -22
47,6 +2252
,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];
-@@ -2
284,6 +2290
,9 @@ void generate_files(int f_out, const char *local_name)
+@@ -2
327,6 +2333
,9 @@ void generate_files(int f_out, const char *local_name)
wait_for_receiver();
}
wait_for_receiver();
}
@@
-595,7
+595,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
-@@ -87
0,6 +870
,8 @@ typedef struct {
+@@ -87
4,6 +874
,8 @@ typedef struct {
#define CSF_ENABLE (1<<1)
#define CSF_LAX (1<<2)
#define CSF_ENABLE (1<<1)
#define CSF_LAX (1<<2)