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
Changes for new zlib.
[rsync/rsync.git]
/
generator.c
diff --git
a/generator.c
b/generator.c
index
b991500
..
7ae5ab7
100644
(file)
--- a/
generator.c
+++ b/
generator.c
@@
-25,6
+25,7
@@
extern int verbose;
extern int dry_run;
extern int verbose;
extern int dry_run;
+extern int do_xfers;
extern int log_format_has_i;
extern int log_format_has_o_or_i;
extern int daemon_log_format_has_i;
extern int log_format_has_i;
extern int log_format_has_o_or_i;
extern int daemon_log_format_has_i;
@@
-58,8
+59,8
@@
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 int io_timeout;
extern int io_error;
extern int io_error;
+extern int allowed_lull;
extern int sock_f_out;
extern int ignore_timeout;
extern int protocol_version;
extern int sock_f_out;
extern int ignore_timeout;
extern int protocol_version;
@@
-88,8
+89,6
@@
extern int backup_suffix_len;
extern struct file_list *the_file_list;
extern struct filter_list_struct server_filter_list;
extern struct file_list *the_file_list;
extern struct filter_list_struct server_filter_list;
-int allowed_lull = 0;
-
static int deletion_count = 0; /* used to implement --max-delete */
static int deletion_count = 0; /* used to implement --max-delete */
@@
-151,7
+150,7
@@
static int delete_item(char *fname, int mode, int flags)
deletion_count--;
return 0;
}
deletion_count--;
return 0;
}
- if (!zap_dir
|| (errno != ENOTEMPTY && errno != EEXIST)
) {
+ if (!zap_dir) {
rsyserr(FERROR, errno, "delete_file: rmdir %s failed",
full_fname(fname));
return -1;
rsyserr(FERROR, errno, "delete_file: rmdir %s failed",
full_fname(fname));
return -1;
@@
-170,10
+169,7
@@
static int delete_item(char *fname, int mode, int flags)
continue;
f_name_to(fp, buf);
continue;
f_name_to(fp, buf);
- if (delete_item(buf, fp->mode, flags & ~DEL_TERSE) != 0) {
- flist_free(dirlist);
- return -1;
- }
+ delete_item(buf, fp->mode, flags & ~DEL_TERSE);
}
flist_free(dirlist);
}
flist_free(dirlist);
@@
-185,7
+181,7
@@
static int delete_item(char *fname, int mode, int flags)
if (do_rmdir(fname) == 0) {
if (!(flags & DEL_TERSE))
log_delete(fname, mode);
if (do_rmdir(fname) == 0) {
if (!(flags & DEL_TERSE))
log_delete(fname, mode);
- } else if (errno != ENOTEMPTY && errno != ENOENT) {
+ } else if (errno != ENOTEMPTY && errno != E
EXIST && errno != E
NOENT) {
rsyserr(FERROR, errno, "delete_file: rmdir %s failed",
full_fname(fname));
return -1;
rsyserr(FERROR, errno, "delete_file: rmdir %s failed",
full_fname(fname));
return -1;
@@
-248,21
+244,25
@@
static void delete_in_dir(struct file_list *flist, char *fbuf,
if (link_stat(fbuf, &st, keep_dirlinks) < 0)
return;
if (link_stat(fbuf, &st, keep_dirlinks) < 0)
return;
- if (one_file_system && file->flags & FLAG_TOP_DIR)
- filesystem_dev = st.st_dev;
+ if (one_file_system) {
+ if (file->flags & FLAG_TOP_DIR)
+ filesystem_dev = st.st_dev;
+ else if (filesystem_dev != st.st_dev)
+ return;
+ }
dirlist = get_dirlist(fbuf, dlen, 0);
/* If an item in dirlist is not found in flist, delete it
* from the filesystem. */
for (i = dirlist->count; i--; ) {
dirlist = get_dirlist(fbuf, dlen, 0);
/* If an item in dirlist is not found in flist, delete it
* from the filesystem. */
for (i = dirlist->count; i--; ) {
- if (!dirlist->files[i]->basename)
+ struct file_struct *fp = dirlist->files[i];
+ if (!fp->basename || fp->flags & FLAG_MOUNT_POINT)
continue;
continue;
- if (flist_find(flist, dirlist->files[i]) < 0) {
- int mode = dirlist->files[i]->mode;
- f_name_to(dirlist->files[i], delbuf);
- if (delete_item(delbuf, mode, DEL_FORCE_RECURSE) < 0)
- break;
+ if (flist_find(flist, fp) < 0) {
+ int mode = fp->mode;
+ f_name_to(fp, delbuf);
+ delete_item(delbuf, mode, DEL_FORCE_RECURSE);
}
}
}
}
@@
-276,7
+276,8
@@
static void do_delete_pass(struct file_list *flist)
char fbuf[MAXPATHLEN];
int j;
char fbuf[MAXPATHLEN];
int j;
- if (dry_run > 1) /* destination doesn't exist yet */
+ if (dry_run > 1 /* destination doesn't exist yet */
+ || list_only)
return;
for (j = 0; j < flist->count; j++) {
return;
for (j = 0; j < flist->count; j++) {
@@
-322,8
+323,9
@@
void itemize(struct file_struct *file, int ndx, int statret, STRUCT_STAT *st,
: S_ISDIR(file->mode) ? !omit_dir_times
: !S_ISLNK(file->mode);
: S_ISDIR(file->mode) ? !omit_dir_times
: !S_ISLNK(file->mode);
- if ((iflags & (ITEM_TRANSFER|ITEM_LOCAL_CHANGE) && !keep_time)
- || (keep_time && file->modtime != st->st_mtime))
+ if ((iflags & (ITEM_TRANSFER|ITEM_LOCAL_CHANGE) && !keep_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)
iflags |= ITEM_REPORT_PERMS;
iflags |= ITEM_REPORT_TIME;
if (preserve_perms && file->mode != st->st_mode)
iflags |= ITEM_REPORT_PERMS;
@@
-527,7
+529,7
@@
static int find_fuzzy(struct file_struct *file, struct file_list *dirlist)
name = fp->basename;
if (fp->length == file->length
name = fp->basename;
if (fp->length == file->length
- &&
fp->modtime == file->modtime
) {
+ &&
cmp_modtime(fp->modtime, file->modtime) == 0
) {
if (verbose > 4) {
rprintf(FINFO,
"fuzzy size/modtime match for %s\n",
if (verbose > 4) {
rprintf(FINFO,
"fuzzy size/modtime match for %s\n",
@@
-667,7
+669,8
@@
static void recv_generator(char *fname, struct file_struct *file, int ndx,
if (only_existing && statret == -1 && stat_errno == ENOENT) {
/* we only want to update existing files */
if (verbose > 1) {
if (only_existing && statret == -1 && stat_errno == ENOENT) {
/* we only want to update existing files */
if (verbose > 1) {
- rprintf(FINFO, "not creating new file \"%s\"\n",
+ rprintf(FINFO, "not creating new %s \"%s\"\n",
+ S_ISDIR(file->mode) ? "directory" : "file",
safe_fname(fname));
}
return;
safe_fname(fname));
}
return;
@@
-704,7
+707,7
@@
static void recv_generator(char *fname, struct file_struct *file, int ndx,
if (statret != 0 && do_mkdir(fname,file->mode) != 0 && errno != EEXIST) {
if (!relative_paths || errno != ENOENT
|| create_directory_path(fname, orig_umask) < 0
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
) {
+ ||
(do_mkdir(fname, file->mode) < 0 && errno != EEXIST)
) {
rsyserr(FERROR, errno,
"recv_generator: mkdir %s failed",
full_fname(fname));
rsyserr(FERROR, errno,
"recv_generator: mkdir %s failed",
full_fname(fname));
@@
-719,18
+722,12
@@
static void recv_generator(char *fname, struct file_struct *file, int ndx,
return;
}
return;
}
- if (max_size && file->length > max_size) {
- if (verbose > 1) {
- rprintf(FINFO, "%s is over max-size\n",
- safe_fname(fname));
- }
- return;
- }
-
if (preserve_links && S_ISLNK(file->mode)) {
#ifdef SUPPORT_LINKS
if (safe_symlinks && unsafe_symlink(file->u.link, fname)) {
if (verbose) {
if (preserve_links && S_ISLNK(file->mode)) {
#ifdef SUPPORT_LINKS
if (safe_symlinks && unsafe_symlink(file->u.link, fname)) {
if (verbose) {
+ if (the_file_list->count == 1)
+ fname = f_name(file);
rprintf(FINFO,
"ignoring unsafe symlink %s -> \"%s\"\n",
full_fname(fname),
rprintf(FINFO,
"ignoring unsafe symlink %s -> \"%s\"\n",
full_fname(fname),
@@
-823,15
+820,29
@@
static void recv_generator(char *fname, struct file_struct *file, int ndx,
return;
}
return;
}
- if (preserve_hard_links && hard_link_check(file, ndx, HL_CHECK_MASTER))
+ if (preserve_hard_links
+ && hard_link_check(file, ndx, fname, statret, &st,
+ itemizing, code, HL_CHECK_MASTER))
return;
if (!S_ISREG(file->mode)) {
return;
if (!S_ISREG(file->mode)) {
+ if (the_file_list->count == 1)
+ fname = f_name(file);
rprintf(FINFO, "skipping non-regular file \"%s\"\n",
safe_fname(fname));
return;
}
rprintf(FINFO, "skipping non-regular file \"%s\"\n",
safe_fname(fname));
return;
}
+ if (max_size && file->length > max_size) {
+ if (verbose > 1) {
+ if (the_file_list->count == 1)
+ fname = f_name(file);
+ rprintf(FINFO, "%s is over max-size\n",
+ safe_fname(fname));
+ }
+ return;
+ }
+
if (opt_ignore_existing && statret == 0) {
if (verbose > 1)
rprintf(FINFO, "%s exists\n", safe_fname(fname));
if (opt_ignore_existing && statret == 0) {
if (verbose > 1)
rprintf(FINFO, "%s exists\n", safe_fname(fname));
@@
-904,12
+915,14
@@
static void recv_generator(char *fname, struct file_struct *file, int ndx,
if (hard_link_one(file, ndx, fname, -1, &st,
fnamecmpbuf, 1,
itemizing && verbose > 1,
if (hard_link_one(file, ndx, fname, -1, &st,
fnamecmpbuf, 1,
itemizing && verbose > 1,
- code) == 0)
+ code) == 0) {
+ if (preserve_hard_links
+ && file->link_u.links) {
+ hard_link_cluster(file, ndx,
+ itemizing,
+ code);
+ }
return;
return;
- if (verbose) {
- rsyserr(FINFO, errno, "link %s => %s",
- full_fname(fnamecmpbuf),
- safe_fname(fname));
}
match_level = 2;
}
}
match_level = 2;
}
@@
-979,7
+992,9
@@
static void recv_generator(char *fname, struct file_struct *file, int ndx,
}
if (statret != 0) {
}
if (statret != 0) {
- if (preserve_hard_links && hard_link_check(file, ndx, HL_SKIP))
+ if (preserve_hard_links
+ && hard_link_check(file, ndx, fname, statret, &st,
+ itemizing, code, HL_SKIP))
return;
if (stat_errno == ENOENT)
goto notify_others;
return;
if (stat_errno == ENOENT)
goto notify_others;
@@
-1020,7
+1035,7
@@
prepare_to_open:
statret = 0;
}
statret = 0;
}
- if (
dry_run
|| read_batch || whole_file)
+ if (
!do_xfers
|| read_batch || whole_file)
goto notify_others;
if (fuzzy_basis) {
goto notify_others;
if (fuzzy_basis) {
@@
-1037,7
+1052,9
@@
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 && hard_link_check(file, ndx, HL_SKIP))
+ if (preserve_hard_links
+ && hard_link_check(file, ndx, fname, statret, &st,
+ itemizing, code, HL_SKIP))
return;
statret = real_ret = -1;
goto notify_others;
return;
statret = real_ret = -1;
goto notify_others;
@@
-1092,7
+1109,7
@@
notify_others:
fuzzy_file ? fuzzy_file->basename : NULL);
}
fuzzy_file ? fuzzy_file->basename : NULL);
}
- if (
dry_run
) {
+ if (
!do_xfers
) {
if (preserve_hard_links && file->link_u.links)
hard_link_cluster(file, ndx, itemizing, code);
return;
if (preserve_hard_links && file->link_u.links)
hard_link_cluster(file, ndx, itemizing, code);
return;
@@
-1123,27
+1140,26
@@
notify_others:
void generate_files(int f_out, struct file_list *flist, char *local_name)
{
void generate_files(int f_out, struct file_list *flist, char *local_name)
{
- int i
, lull_mod
;
+ int i;
char fbuf[MAXPATHLEN];
int itemizing, maybe_PERMS_REPORT;
enum logcode code;
char fbuf[MAXPATHLEN];
int itemizing, maybe_PERMS_REPORT;
enum logcode code;
+ 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_do_progress = do_progress;
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_do_progress = do_progress;
-
- allowed_lull = read_batch ? 0 : (io_timeout + 1) / 2;
- lull_mod = allowed_lull * 5;
+ int save_make_backups = make_backups;
if (protocol_version >= 29) {
itemizing = 1;
maybe_PERMS_REPORT = log_format_has_i ? 0 : PERMS_REPORT;
code = daemon_log_format_has_i ? 0 : FLOG;
} else if (am_daemon) {
if (protocol_version >= 29) {
itemizing = 1;
maybe_PERMS_REPORT = log_format_has_i ? 0 : PERMS_REPORT;
code = daemon_log_format_has_i ? 0 : FLOG;
} else if (am_daemon) {
- itemizing = daemon_log_format_has_i &&
!dry_run
;
+ itemizing = daemon_log_format_has_i &&
do_xfers
;
maybe_PERMS_REPORT = PERMS_REPORT;
maybe_PERMS_REPORT = PERMS_REPORT;
- code = itemizing ||
dry_run
? FCLIENT : FINFO;
+ code = itemizing ||
!do_xfers
? FCLIENT : FINFO;
} else if (!am_server) {
itemizing = log_format_has_i;
maybe_PERMS_REPORT = log_format_has_i ? 0 : PERMS_REPORT;
} else if (!am_server) {
itemizing = log_format_has_i;
maybe_PERMS_REPORT = log_format_has_i ? 0 : PERMS_REPORT;
@@
-1172,8
+1188,11
@@
void generate_files(int f_out, struct file_list *flist, char *local_name)
: "enabled");
}
: "enabled");
}
- if (protocol_version < 29)
- ignore_timeout = 1;
+ /* Since we often fill up the outgoing socket and then just sit around
+ * waiting for the other 2 processes to do their thing, we don't want
+ * to exit on a timeout. If the data stops flowing, the receiver will
+ * notice that and let us know via the redo pipe (or its closing). */
+ ignore_timeout = 1;
for (i = 0; i < flist->count; i++) {
struct file_struct *file = flist->files[i];
for (i = 0; i < flist->count; i++) {
struct file_struct *file = flist->files[i];
@@
-1205,7
+1224,7
@@
void generate_files(int f_out, struct file_list *flist, char *local_name)
if (allowed_lull && !(i % lull_mod))
maybe_send_keepalive();
if (allowed_lull && !(i % lull_mod))
maybe_send_keepalive();
- else if (!(i %
5
0))
+ else if (!(i %
20
0))
maybe_flush_socket();
}
recv_generator(NULL, NULL, 0, 0, 0, code, -1);
maybe_flush_socket();
}
recv_generator(NULL, NULL, 0, 0, 0, code, -1);
@@
-1219,10
+1238,6
@@
void generate_files(int f_out, struct file_list *flist, char *local_name)
ignore_times = 1;
make_backups = 0; /* avoid a duplicate backup for inplace processing */
ignore_times = 1;
make_backups = 0; /* avoid a duplicate backup for inplace processing */
- /* We expect to just sit around now, so don't exit on a timeout.
- * If we really get a timeout then the other process should exit. */
- ignore_timeout = 1;
-
if (verbose > 2)
rprintf(FINFO,"generate_files phase=%d\n",phase);
if (verbose > 2)
rprintf(FINFO,"generate_files phase=%d\n",phase);
@@
-1240,6
+1255,7
@@
void generate_files(int f_out, struct file_list *flist, char *local_name)
phase++;
only_existing = save_only_existing;
opt_ignore_existing = save_opt_ignore_existing;
phase++;
only_existing = save_only_existing;
opt_ignore_existing = save_opt_ignore_existing;
+ make_backups = save_make_backups;
if (verbose > 2)
rprintf(FINFO,"generate_files phase=%d\n",phase);
if (verbose > 2)
rprintf(FINFO,"generate_files phase=%d\n",phase);
@@
-1282,7
+1298,7
@@
void generate_files(int f_out, struct file_list *flist, char *local_name)
maybe_PERMS_REPORT, code, -1);
if (allowed_lull && !(++j % lull_mod))
maybe_send_keepalive();
maybe_PERMS_REPORT, code, -1);
if (allowed_lull && !(++j % lull_mod))
maybe_send_keepalive();
- else if (!(j %
5
0))
+ else if (!(j %
20
0))
maybe_flush_socket();
}
}
maybe_flush_socket();
}
}