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.3pre2.
[rsync/rsync-patches.git]
/
checksum-updating.diff
diff --git
a/checksum-updating.diff
b/checksum-updating.diff
index
20e9bcd
..
dabcccd
100644
(file)
--- a/
checksum-updating.diff
+++ b/
checksum-updating.diff
@@
-389,7
+389,7
@@
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
-@@ -136
0,6 +1571
,8 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
+@@ -136
4,6 +1575
,8 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
if (excl_ret) {
if (ignore_perishable)
non_perishable_cnt++;
if (excl_ret) {
if (ignore_perishable)
non_perishable_cnt++;
@@
-398,7
+398,7
@@
diff --git a/flist.c b/flist.c
return NULL;
}
return NULL;
}
-@@ -14
06,13 +1619
,13 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
+@@ -14
10,13 +1623
,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' */
-@@ -149
4,7 +1707
,7 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
+@@ -149
8,7 +1711
,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);
}
-@@ -182
0,6 +2033
,9 @@ static void send_directory(int f, struct file_list *flist, char *fbuf, int len,
+@@ -182
4,6 +2037
,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". */
-@@ -241
3,6 +2629
,9 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
+@@ -241
7,6 +2633
,9 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
}
} else
flist_eof = 1;
}
} else
flist_eof = 1;
@@
-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
17,6 +2222
,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];
-@@ -22
84,6 +2290
,9 @@ void generate_files(int f_out, const char *local_name)
+@@ -22
97,6 +2303
,9 @@ void generate_files(int f_out, const char *local_name)
wait_for_receiver();
}
wait_for_receiver();
}
@@
-628,7
+628,7
@@
diff --git a/rsyncd.conf.yo b/rsyncd.conf.yo
--- a/rsyncd.conf.yo
+++ b/rsyncd.conf.yo
@@ -284,13 +284,15 @@ The default is tt(/var/run/rsyncd.lock).
--- a/rsyncd.conf.yo
+++ b/rsyncd.conf.yo
@@ -284,13 +284,15 @@ The default is tt(/var/run/rsyncd.lock).
- dit(bf(checksum files)) This
option
tells rsync to make use of any cached
+ dit(bf(checksum files)) This
parameter
tells rsync to make use of any cached
checksum information it finds in per-directory .rsyncsums files when the
current transfer is using the bf(--checksum) option. The value can be set
-to either "lax", "strict", or "none" -- see the client's bf(--sumfiles)
checksum information it finds in per-directory .rsyncsums files when the
current transfer is using the bf(--checksum) option. The value can be set
-to either "lax", "strict", or "none" -- see the client's bf(--sumfiles)
@@
-645,5
+645,5
@@
diff --git a/rsyncd.conf.yo b/rsyncd.conf.yo
+the bf(exclude) directive for a way to hide the .rsyncsums files from the
+user.
+the bf(exclude) directive for a way to hide the .rsyncsums files from the
+user.
- dit(bf(read only)) Th
e "read only" option
determines whether clients
+ dit(bf(read only)) Th
is parameter
determines whether clients
will be able to upload files or not. If "read only" is true then any
will be able to upload files or not. If "read only" is true then any