extern int am_server;
extern int am_daemon;
extern int do_progress;
-extern int recurse;
extern int relative_paths;
extern int implied_dirs;
extern int keep_dirlinks;
extern int delete_after;
extern int module_id;
extern int ignore_errors;
-extern int remove_sent_files;
+extern int remove_source_files;
extern int delay_updates;
extern int update_only;
extern int ignore_existing;
extern int link_dest;
extern int whole_file;
extern int list_only;
+extern int new_root_dir;
extern int read_batch;
extern int safe_symlinks;
extern long block_size; /* "long" because popt can't set an int32. */
STRUCT_STAT st;
int j;
- if (dry_run > 1 /* destination doesn't exist yet */
- || list_only)
+ /* dry_run is incremented when the destination doesn't exist yet. */
+ if (dry_run > 1 || list_only)
return;
for (j = 0; j < flist->count; j++) {
write_byte(sock_f_out, fnamecmp_type);
if (iflags & ITEM_XNAME_FOLLOWS)
write_vstring(sock_f_out, xname, strlen(xname));
- } else if (ndx >= 0)
- log_item(FINFO, file, &stats, iflags, xname);
+ } else if (ndx >= 0) {
+ enum logcode code = logfile_format_has_i ? FINFO : FCLIENT;
+ log_item(code, file, &stats, iflags, xname);
+ }
}
}
char *cmpbuf, STRUCT_STAT *stp, int itemizing,
int maybe_ATTRS_REPORT, enum logcode code)
{
- int save_ignore_times = ignore_times;
int best_match = -1;
int match_level = 0;
int j = 0;
- /* We can't let ignore_times affect the unchanged_file() test in
- * an alternate-dest dir or we will never find any matches. */
- ignore_times = 0;
-
do {
pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname);
if (link_stat(cmpbuf, stp, 0) < 0 || !S_ISREG(stp->st_mode))
break;
} while (basis_dir[++j] != NULL);
- ignore_times = save_ignore_times;
-
if (!match_level)
return -1;
itemizing && verbose > 1,
code) < 0)
goto try_a_copy;
- if (preserve_hard_links && file->link_u.links)
+ if (preserve_hard_links && file->link_u.links) {
+ if (dry_run)
+ file->link_u.links->link_dest_used = j + 1;
hard_link_cluster(file, ndx, itemizing, code);
+ }
} else
#endif
if (itemizing)
itemize(file, ndx, 0, stp, 0, 0, NULL);
if (verbose > 1 && maybe_ATTRS_REPORT) {
- code = logfile_format_has_i || dry_run ? FNAME : FINFO;
- rprintf(code, "%s is uptodate\n", fname);
+ rprintf(FCLIENT, "%s is uptodate\n", fname);
}
return -2;
}
if (maybe_ATTRS_REPORT
&& ((!itemizing && verbose && match_level == 2)
|| (verbose > 1 && match_level == 3))) {
- code = logfile_format_has_i || dry_run ? FNAME : FINFO;
+ code = match_level == 3 ? FCLIENT : FINFO;
rprintf(code, "%s%s\n", fname,
match_level == 3 ? " is uptodate" : "");
}
itemize(file, ndx, 0, &st, changes, 0, lp);
}
if (verbose > 1 && maybe_ATTRS_REPORT) {
- code = logfile_format_has_i || dry_run ? FNAME : FINFO;
- rprintf(code, "%s is uptodate\n", fname);
+ rprintf(FCLIENT, "%s is uptodate\n", fname);
}
return -2;
} while (basis_dir[++i] != NULL);
fuzzy_dirlist = NULL;
}
if (missing_below >= 0) {
- dry_run--;
+ if (dry_run)
+ dry_run--;
missing_below = -1;
}
parent_dirname = "";
}
}
- if (missing_below >= 0 && file->dir.depth <= missing_below) {
- dry_run--;
- missing_below = -1;
+ if (missing_below >= 0) {
+ if (file->dir.depth <= missing_below) {
+ if (dry_run)
+ dry_run--;
+ missing_below = -1;
+ } else if (!dry_run)
+ return;
}
if (dry_run > 1) {
statret = -1;
char *dn = file->dirname ? file->dirname : ".";
if (parent_dirname != dn && strcmp(parent_dirname, dn) != 0) {
if (relative_paths && !implied_dirs
- && safe_stat(dn, &st) < 0
+ && do_stat(dn, &st) < 0
&& create_directory_path(fname) < 0) {
rsyserr(FERROR, errno,
"recv_generator: mkdir %s failed",
dry_run++;
}
if (itemizing && f_out != -1) {
- itemize(file, ndx, statret, &st,
- statret ? ITEM_LOCAL_CHANGE : 0, 0, NULL);
+ int sr = statret;
+ if (new_root_dir) {
+ if (*fname == '.' && fname[1] == '\0')
+ sr = -1;
+ new_root_dir = 0;
+ }
+ itemize(file, ndx, sr, &st,
+ sr ? ITEM_LOCAL_CHANGE : 0, 0, NULL);
}
if (statret != 0 && do_mkdir(fname,file->mode) < 0 && errno != EEXIST) {
if (!relative_paths || errno != ENOENT
rsyserr(FERROR, errno,
"recv_generator: mkdir %s failed",
full_fname(fname));
+ file->flags |= FLAG_MISSING;
+ if (ndx+1 < the_file_list->count
+ && the_file_list->files[ndx+1]->dir.depth > file->dir.depth) {
+ rprintf(FERROR,
+ "*** Skipping everything below this failed directory ***\n");
+ missing_below = file->dir.depth;
+ }
+ return;
}
}
if (set_file_attrs(fname, file, statret ? NULL : &st, 0)
itemizing,
code);
}
+ if (remove_source_files == 1)
+ goto return_with_success;
return;
}
}
rprintf(code, "%s -> %s\n", fname,
file->u.link);
}
- if (remove_sent_files && !dry_run) {
- char 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);
+ if (remove_source_files)
+ goto return_with_success;
}
#endif
return;
hard_link_cluster(file, ndx,
itemizing, code);
}
+ if (remove_source_files == 1)
+ goto return_with_success;
}
} else {
if (itemizing)
set_file_attrs(fname, file, &st, maybe_ATTRS_REPORT);
if (preserve_hard_links && file->link_u.links)
hard_link_cluster(file, ndx, itemizing, code);
+ if (remove_source_files == 1)
+ goto return_with_success;
}
return;
}
if (statret != 0 && basis_dir[0] != NULL) {
int j = try_dests_reg(file, fname, ndx, fnamecmpbuf, &st,
itemizing, maybe_ATTRS_REPORT, code);
- if (j == -2)
+ if (j == -2) {
+ if (remove_source_files == 1)
+ goto return_with_success;
return;
- if (j != -1) {
+ }
+ if (j >= 0) {
fnamecmp = fnamecmpbuf;
fnamecmp_type = j;
statret = 0;
set_file_attrs(fname, file, &st, maybe_ATTRS_REPORT);
if (preserve_hard_links && file->link_u.links)
hard_link_cluster(file, ndx, itemizing, code);
+ if (remove_source_files != 1)
+ return;
+ return_with_success:
+ if (!dry_run) {
+ char numbuf[4];
+ SIVAL(numbuf, 0, ndx);
+ send_msg(MSG_SUCCESS, numbuf, 4);
+ }
return;
}
rprintf(FINFO, "generating and sending sums for %d\n", ndx);
notify_others:
- if (remove_sent_files && !delay_updates && !phase)
- increment_active_files(ndx, itemizing, code);
+ if (remove_source_files && !delay_updates && !phase)
+ increment_active_files(ndx, itemizing, code);
write_int(f_out, ndx);
if (itemizing) {
int iflags = ITEM_TRANSFER;
continue;
if (!need_retouch_dir_times && file->mode & S_IWUSR)
continue;
+ if (file->flags & FLAG_MISSING) {
+ int missing = file->dir.depth;
+ while (++i < flist->count) {
+ file = flist->files[i];
+ if (file->dir.depth <= missing)
+ break;
+ }
+ i--;
+ continue;
+ }
recv_generator(f_name(file, NULL), file, i, itemizing,
maybe_ATTRS_REPORT, code, -1);
if (allowed_lull && !(++j % lull_mod))
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff