Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed a typo pointed out by Peter Strazovec.
[rsync/rsync.git]
/
generator.c
diff --git
a/generator.c
b/generator.c
index
d50c090
..
0f53891
100644
(file)
--- a/
generator.c
+++ b/
generator.c
@@
-61,6
+61,7
@@
extern int csum_length;
extern int ignore_times;
extern int size_only;
extern OFF_T max_size;
extern int ignore_times;
extern int size_only;
extern OFF_T max_size;
+extern OFF_T min_size;
extern int io_error;
extern int allowed_lull;
extern int sock_f_out;
extern int io_error;
extern int allowed_lull;
extern int sock_f_out;
@@
-814,7
+815,8
@@
static void recv_generator(char *fname, struct file_struct *file, int ndx,
if (statret != 0
|| (st.st_mode & ~CHMOD_BITS) != (file->mode & ~CHMOD_BITS)
|| st.st_rdev != file->u.rdev) {
if (statret != 0
|| (st.st_mode & ~CHMOD_BITS) != (file->mode & ~CHMOD_BITS)
|| st.st_rdev != file->u.rdev) {
- if (delete_item(fname, st.st_mode, DEL_TERSE) < 0)
+ if (statret == 0
+ && delete_item(fname, st.st_mode, DEL_TERSE) < 0)
return;
if (preserve_hard_links && file->link_u.links
&& hard_link_check(file, ndx, fname, -1, &st,
return;
if (preserve_hard_links && file->link_u.links
&& hard_link_check(file, ndx, fname, -1, &st,
@@
-872,6
+874,15
@@
static void recv_generator(char *fname, struct file_struct *file, int ndx,
}
return;
}
}
return;
}
+ if (min_size && file->length < min_size) {
+ if (verbose > 1) {
+ if (the_file_list->count == 1)
+ fname = f_name(file);
+ rprintf(FINFO, "%s is under min-size\n",
+ safe_fname(fname));
+ }
+ return;
+ }
if (ignore_existing && statret == 0) {
if (verbose > 1)
if (ignore_existing && statret == 0) {
if (verbose > 1)
@@
-1265,7
+1276,7
@@
void generate_files(int f_out, struct file_list *flist, char *local_name)
phase++;
csum_length = SUM_LENGTH;
phase++;
csum_length = SUM_LENGTH;
- max_size = ignore_existing = ignore_non_existing = 0;
+ max_size =
min_size =
ignore_existing = ignore_non_existing = 0;
update_only = always_checksum = size_only = 0;
ignore_times = 1;
if (append_mode) /* resend w/o append mode */
update_only = always_checksum = size_only = 0;
ignore_times = 1;
if (append_mode) /* resend w/o append mode */