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
Made parse_size_arg()'s parsing a little stricter.
[rsync/rsync.git]
/
generator.c
diff --git
a/generator.c
b/generator.c
index
7ae5ab7
..
22a4ce0
100644
(file)
--- a/
generator.c
+++ b/
generator.c
@@
-52,13
+52,16
@@
extern int ignore_errors;
extern int remove_sent_files;
extern int delay_updates;
extern int update_only;
extern int remove_sent_files;
extern int delay_updates;
extern int update_only;
-extern int opt_ignore_existing;
+extern int ignore_existing;
+extern int ignore_non_existing;
extern int inplace;
extern int inplace;
+extern int append_mode;
extern int make_backups;
extern int csum_length;
extern int ignore_times;
extern int size_only;
extern OFF_T max_size;
extern int make_backups;
extern int csum_length;
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;
@@
-74,7
+77,6
@@
extern int link_dest;
extern int whole_file;
extern int list_only;
extern int read_batch;
extern int whole_file;
extern int list_only;
extern int read_batch;
-extern int only_existing;
extern int orig_umask;
extern int safe_symlinks;
extern long block_size; /* "long" because popt can't set an int32. */
extern int orig_umask;
extern int safe_symlinks;
extern long block_size; /* "long" because popt can't set an int32. */
@@
-327,7
+329,8
@@
void itemize(struct file_struct *file, int ndx, int statret, STRUCT_STAT *st,
&& (!(iflags & ITEM_XNAME_FOLLOWS) || *xname))
|| (keep_time && cmp_modtime(file->modtime, st->st_mtime) != 0))
iflags |= ITEM_REPORT_TIME;
&& (!(iflags & ITEM_XNAME_FOLLOWS) || *xname))
|| (keep_time && cmp_modtime(file->modtime, st->st_mtime) != 0))
iflags |= ITEM_REPORT_TIME;
- if (preserve_perms && file->mode != st->st_mode)
+ if (preserve_perms
+ && (file->mode & CHMOD_BITS) != (st->st_mode & CHMOD_BITS))
iflags |= ITEM_REPORT_PERMS;
if (preserve_uid && am_root && file->uid != st->st_uid)
iflags |= ITEM_REPORT_OWNER;
iflags |= ITEM_REPORT_PERMS;
if (preserve_uid && am_root && file->uid != st->st_uid)
iflags |= ITEM_REPORT_OWNER;
@@
-444,8
+447,8
@@
static void sum_sizes_sqroot(struct sum_struct *sum, int64 len)
sum->flength = len;
sum->blength = blength;
sum->s2length = s2length;
sum->flength = len;
sum->blength = blength;
sum->s2length = s2length;
- sum->
count = (len + (blength - 1)) /
blength;
- sum->
remainder = (len % blength
);
+ sum->
remainder = len %
blength;
+ sum->
count = len / blength + (sum->remainder != 0
);
if (sum->count && verbose > 2) {
rprintf(FINFO,
if (sum->count && verbose > 2) {
rprintf(FINFO,
@@
-469,35
+472,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;
+
+ len -= n1;
+ offset += n1;
- if (f_copy >= 0)
+ 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)
@@
-666,8
+676,7
@@
static void recv_generator(char *fname, struct file_struct *file, int ndx,
stat_errno = errno;
}
stat_errno = errno;
}
- if (only_existing && statret == -1 && stat_errno == ENOENT) {
- /* we only want to update existing files */
+ if (ignore_non_existing && statret == -1 && stat_errno == ENOENT) {
if (verbose > 1) {
rprintf(FINFO, "not creating new %s \"%s\"\n",
S_ISDIR(file->mode) ? "directory" : "file",
if (verbose > 1) {
rprintf(FINFO, "not creating new %s \"%s\"\n",
S_ISDIR(file->mode) ? "directory" : "file",
@@
-704,7
+713,7
@@
static void recv_generator(char *fname, struct file_struct *file, int ndx,
itemize(file, ndx, statret, &st,
statret ? ITEM_LOCAL_CHANGE : 0, 0, NULL);
}
itemize(file, ndx, statret, &st,
statret ? ITEM_LOCAL_CHANGE : 0, 0, NULL);
}
- if (statret != 0 && do_mkdir(fname,file->mode)
!=
0 && errno != EEXIST) {
+ if (statret != 0 && do_mkdir(fname,file->mode)
<
0 && errno != EEXIST) {
if (!relative_paths || errno != ENOENT
|| create_directory_path(fname, orig_umask) < 0
|| (do_mkdir(fname, file->mode) < 0 && errno != EEXIST)) {
if (!relative_paths || errno != ENOENT
|| create_directory_path(fname, orig_umask) < 0
|| (do_mkdir(fname, file->mode) < 0 && errno != EEXIST)) {
@@
-722,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)) {
@@
-752,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;
}
}
@@
-762,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));
@@
-780,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) {
@@
-798,7
+828,7
@@
static void recv_generator(char *fname, struct file_struct *file, int ndx,
safe_fname(fname),
(int)file->mode, (int)file->u.rdev);
}
safe_fname(fname),
(int)file->mode, (int)file->u.rdev);
}
- if (do_mknod(fname,file->mode,file->u.rdev)
!=
0) {
+ if (do_mknod(fname,file->mode,file->u.rdev)
<
0) {
rsyserr(FERROR, errno, "mknod %s failed",
full_fname(fname));
} else {
rsyserr(FERROR, errno, "mknod %s failed",
full_fname(fname));
} else {
@@
-811,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);
@@
-842,8
+873,17
@@
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 (
opt_
ignore_existing && statret == 0) {
+ if (ignore_existing && statret == 0) {
if (verbose > 1)
rprintf(FINFO, "%s exists\n", safe_fname(fname));
return;
if (verbose > 1)
rprintf(FINFO, "%s exists\n", safe_fname(fname));
return;
@@
-992,20
+1032,20
@@
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;
if (stat_errno == ENOENT)
goto notify_others;
&& hard_link_check(file, ndx, fname, statret, &st,
itemizing, code, HL_SKIP))
return;
if (stat_errno == ENOENT)
goto notify_others;
- if (verbose > 1) {
- rsyserr(FERROR, stat_errno,
- "recv_generator: failed to stat %s",
- full_fname(fname));
- }
+ rsyserr(FERROR, stat_errno, "recv_generator: failed to stat %s",
+ full_fname(fname));
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)
@@
-1052,7
+1092,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;
@@
-1147,8
+1187,8
@@
void generate_files(int f_out, struct file_list *flist, char *local_name)
int lull_mod = allowed_lull * 5;
int need_retouch_dir_times = preserve_times && !omit_dir_times;
int need_retouch_dir_perms = 0;
int lull_mod = allowed_lull * 5;
int need_retouch_dir_times = preserve_times && !omit_dir_times;
int need_retouch_dir_perms = 0;
- int save_
only_existing = only
_existing;
- int save_
opt_ignore_existing = opt_ignore
_existing;
+ int save_
ignore_existing = ignore
_existing;
+ int save_
ignore_non_existing = ignore_non
_existing;
int save_do_progress = do_progress;
int save_make_backups = make_backups;
int save_do_progress = do_progress;
int save_make_backups = make_backups;
@@
-1179,7
+1219,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",
@@
-1207,17
+1247,19
@@
void generate_files(int f_out, struct file_list *flist, char *local_name)
/* We need to ensure that any dirs we create have writeable
* permissions during the time we are putting files within
* them. This is then fixed after the transfer is done. */
/* We need to ensure that any dirs we create have writeable
* permissions during the time we are putting files within
* them. This is then fixed after the transfer is done. */
+#ifdef HAVE_CHMOD
if (!am_root && S_ISDIR(file->mode) && !(file->mode & S_IWUSR)
&& !list_only) {
int mode = file->mode | S_IWUSR; /* user write */
char *fname = local_name ? local_name : fbuf;
if (!am_root && S_ISDIR(file->mode) && !(file->mode & S_IWUSR)
&& !list_only) {
int mode = file->mode | S_IWUSR; /* user write */
char *fname = local_name ? local_name : fbuf;
- if (do_chmod(fname, mode
& CHMOD_BITS
) < 0) {
+ if (do_chmod(fname, mode) < 0) {
rsyserr(FERROR, errno,
"failed to modify permissions on %s",
full_fname(fname));
}
need_retouch_dir_perms = 1;
}
rsyserr(FERROR, errno,
"failed to modify permissions on %s",
full_fname(fname));
}
need_retouch_dir_perms = 1;
}
+#endif
if (preserve_hard_links)
check_for_finished_hlinks(itemizing, code);
if (preserve_hard_links)
check_for_finished_hlinks(itemizing, code);
@@
-1233,9
+1275,11
@@
void generate_files(int f_out, struct file_list *flist, char *local_name)
phase++;
csum_length = SUM_LENGTH;
phase++;
csum_length = SUM_LENGTH;
-
only_existing = max_size = opt_ignore
_existing = 0;
+
max_size = min_size = ignore_existing = ignore_non
_existing = 0;
update_only = always_checksum = size_only = 0;
ignore_times = 1;
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)
@@
-1253,8
+1297,8
@@
void generate_files(int f_out, struct file_list *flist, char *local_name)
}
phase++;
}
phase++;
-
only_existing = save_only
_existing;
-
opt_ignore_existing = save_opt
_ignore_existing;
+
ignore_non_existing = save_ignore_non
_existing;
+
ignore_existing = save
_ignore_existing;
make_backups = save_make_backups;
if (verbose > 2)
make_backups = save_make_backups;
if (verbose > 2)