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
Mention the latest changes.
[rsync/rsync.git]
/
generator.c
diff --git
a/generator.c
b/generator.c
index
5606555
..
08ea1db
100644
(file)
--- a/
generator.c
+++ b/
generator.c
@@
-54,6
+54,7
@@
extern int delay_updates;
extern int update_only;
extern int opt_ignore_existing;
extern int inplace;
extern int update_only;
extern int opt_ignore_existing;
extern int inplace;
+extern int append_mode;
extern int make_backups;
extern int csum_length;
extern int ignore_times;
extern int make_backups;
extern int csum_length;
extern int ignore_times;
@@
-470,35
+471,42
@@
static void generate_and_send_sums(int fd, OFF_T len, int f_out, int f_copy)
OFF_T offset = 0;
sum_sizes_sqroot(&sum, len);
OFF_T offset = 0;
sum_sizes_sqroot(&sum, len);
+ write_sum_head(f_out, &sum);
+
+ if (append_mode > 0 && f_copy < 0)
+ return;
if (len > 0)
mapbuf = map_file(fd, len, MAX_MAP_SIZE, sum.blength);
else
mapbuf = NULL;
if (len > 0)
mapbuf = map_file(fd, len, MAX_MAP_SIZE, sum.blength);
else
mapbuf = NULL;
- write_sum_head(f_out, &sum);
-
for (i = 0; i < sum.count; i++) {
int32 n1 = (int32)MIN(len, (OFF_T)sum.blength);
char *map = map_ptr(mapbuf, offset, n1);
for (i = 0; i < sum.count; i++) {
int32 n1 = (int32)MIN(len, (OFF_T)sum.blength);
char *map = map_ptr(mapbuf, offset, n1);
- uint32 sum1 = get_checksum1(map, n1);
char sum2[SUM_LENGTH];
char sum2[SUM_LENGTH];
+ uint32 sum1;
- if (f_copy >= 0)
+ len -= n1;
+ offset += n1;
+
+ if (f_copy >= 0) {
full_write(f_copy, map, n1);
full_write(f_copy, map, n1);
+ if (append_mode > 0)
+ continue;
+ }
+ sum1 = get_checksum1(map, n1);
get_checksum2(map, n1, sum2);
if (verbose > 3) {
rprintf(FINFO,
"chunk[%.0f] offset=%.0f len=%ld sum1=%08lx\n",
get_checksum2(map, n1, sum2);
if (verbose > 3) {
rprintf(FINFO,
"chunk[%.0f] offset=%.0f len=%ld sum1=%08lx\n",
- (double)i, (double)offset, (long)n1,
+ (double)i, (double)offset
- n1
, (long)n1,
(unsigned long)sum1);
}
write_int(f_out, sum1);
write_buf(f_out, sum2, sum.s2length);
(unsigned long)sum1);
}
write_int(f_out, sum1);
write_buf(f_out, sum2, sum.s2length);
- len -= n1;
- offset += n1;
}
if (mapbuf)
}
if (mapbuf)
@@
-723,6
+731,11
@@
static void recv_generator(char *fname, struct file_struct *file, int ndx,
return;
}
return;
}
+ if (preserve_hard_links && file->link_u.links
+ && hard_link_check(file, ndx, fname, statret, &st,
+ itemizing, code, HL_CHECK_MASTER))
+ return;
+
if (preserve_links && S_ISLNK(file->mode)) {
#ifdef SUPPORT_LINKS
if (safe_symlinks && unsafe_symlink(file->u.link, fname)) {
if (preserve_links && S_ISLNK(file->mode)) {
#ifdef SUPPORT_LINKS
if (safe_symlinks && unsafe_symlink(file->u.link, fname)) {
@@
-753,6
+766,12
@@
static void recv_generator(char *fname, struct file_struct *file, int ndx,
}
set_perms(fname, file, &st,
maybe_PERMS_REPORT);
}
set_perms(fname, file, &st,
maybe_PERMS_REPORT);
+ if (preserve_hard_links
+ && file->link_u.links) {
+ hard_link_cluster(file, ndx,
+ itemizing,
+ code);
+ }
return;
}
}
return;
}
}
@@
-763,6
+782,10
@@
static void recv_generator(char *fname, struct file_struct *file, int ndx,
if (!S_ISLNK(st.st_mode))
statret = -1;
}
if (!S_ISLNK(st.st_mode))
statret = -1;
}
+ if (preserve_hard_links && file->link_u.links
+ && hard_link_check(file, ndx, fname, -1, &st,
+ itemizing, code, HL_SKIP))
+ return;
if (do_symlink(file->u.link,fname) != 0) {
rsyserr(FERROR, errno, "symlink %s -> \"%s\" failed",
full_fname(fname), safe_fname(file->u.link));
if (do_symlink(file->u.link,fname) != 0) {
rsyserr(FERROR, errno, "symlink %s -> \"%s\" failed",
full_fname(fname), safe_fname(file->u.link));
@@
-781,17
+804,23
@@
static void recv_generator(char *fname, struct file_struct *file, int ndx,
SIVAL(numbuf, 0, ndx);
send_msg(MSG_SUCCESS, numbuf, 4);
}
SIVAL(numbuf, 0, ndx);
send_msg(MSG_SUCCESS, numbuf, 4);
}
+ if (preserve_hard_links && file->link_u.links)
+ hard_link_cluster(file, ndx, itemizing, code);
}
#endif
return;
}
if (am_root && preserve_devices && IS_DEVICE(file->mode)) {
}
#endif
return;
}
if (am_root && preserve_devices && IS_DEVICE(file->mode)) {
- if (statret != 0
||
- st.st_mode != file->mode ||
-
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)
return;
if (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,
+ itemizing, code, HL_SKIP))
+ return;
if (!IS_DEVICE(st.st_mode))
statret = -1;
if (verbose > 2) {
if (!IS_DEVICE(st.st_mode))
statret = -1;
if (verbose > 2) {
@@
-812,20
+841,21
@@
static void recv_generator(char *fname, struct file_struct *file, int ndx,
rprintf(code, "%s\n",
safe_fname(fname));
}
rprintf(code, "%s\n",
safe_fname(fname));
}
+ if (preserve_hard_links && file->link_u.links) {
+ hard_link_cluster(file, ndx,
+ itemizing, code);
+ }
}
} else {
if (itemizing)
itemize(file, ndx, statret, &st, 0, 0, NULL);
set_perms(fname, file, &st, maybe_PERMS_REPORT);
}
} else {
if (itemizing)
itemize(file, ndx, statret, &st, 0, 0, NULL);
set_perms(fname, file, &st, maybe_PERMS_REPORT);
+ if (preserve_hard_links && file->link_u.links)
+ hard_link_cluster(file, ndx, itemizing, code);
}
return;
}
}
return;
}
- if (preserve_hard_links
- && hard_link_check(file, ndx, fname, statret, &st,
- itemizing, code, HL_CHECK_MASTER))
- return;
-
if (!S_ISREG(file->mode)) {
if (the_file_list->count == 1)
fname = f_name(file);
if (!S_ISREG(file->mode)) {
if (the_file_list->count == 1)
fname = f_name(file);
@@
-993,7
+1023,7
@@
static void recv_generator(char *fname, struct file_struct *file, int ndx,
}
if (statret != 0) {
}
if (statret != 0) {
- if (preserve_hard_links
+ if (preserve_hard_links
&& file->link_u.links
&& hard_link_check(file, ndx, fname, statret, &st,
itemizing, code, HL_SKIP))
return;
&& hard_link_check(file, ndx, fname, statret, &st,
itemizing, code, HL_SKIP))
return;
@@
-1007,6
+1037,9
@@
static void recv_generator(char *fname, struct file_struct *file, int ndx,
return;
}
return;
}
+ if (append_mode && st.st_size > file->length)
+ return;
+
if (!compare_dest && fnamecmp_type <= FNAMECMP_BASIS_DIR_HIGH)
;
else if (fnamecmp_type == FNAMECMP_FUZZY)
if (!compare_dest && fnamecmp_type <= FNAMECMP_BASIS_DIR_HIGH)
;
else if (fnamecmp_type == FNAMECMP_FUZZY)
@@
-1053,7
+1086,7
@@
prepare_to_open:
full_fname(fnamecmp));
pretend_missing:
/* pretend the file didn't exist */
full_fname(fnamecmp));
pretend_missing:
/* pretend the file didn't exist */
- if (preserve_hard_links
+ if (preserve_hard_links
&& file->link_u.links
&& hard_link_check(file, ndx, fname, statret, &st,
itemizing, code, HL_SKIP))
return;
&& hard_link_check(file, ndx, fname, statret, &st,
itemizing, code, HL_SKIP))
return;
@@
-1180,7
+1213,7
@@
void generate_files(int f_out, struct file_list *flist, char *local_name)
do_delete_pass(flist);
do_progress = 0;
do_delete_pass(flist);
do_progress = 0;
- if (whole_file < 0)
+ if (
append_mode ||
whole_file < 0)
whole_file = 0;
if (verbose >= 2) {
rprintf(FINFO, "delta-transmission %s\n",
whole_file = 0;
if (verbose >= 2) {
rprintf(FINFO, "delta-transmission %s\n",
@@
-1239,6
+1272,8
@@
void generate_files(int f_out, struct file_list *flist, char *local_name)
only_existing = max_size = opt_ignore_existing = 0;
update_only = always_checksum = size_only = 0;
ignore_times = 1;
only_existing = max_size = opt_ignore_existing = 0;
update_only = always_checksum = size_only = 0;
ignore_times = 1;
+ if (append_mode) /* resend w/o append mode */
+ append_mode = -1; /* ... but only longer files */
make_backups = 0; /* avoid a duplicate backup for inplace processing */
if (verbose > 2)
make_backups = 0; /* avoid a duplicate backup for inplace processing */
if (verbose > 2)