extern int copy_unsafe_links;
extern int protocol_version;
extern int sanitize_paths;
-extern int delete_excluded;
extern int max_delete;
extern int orig_umask;
extern int list_only;
struct file_struct *file;
char fbuf[MAXPATHLEN];
- /* f is set to -1 when calculating deletion file list */
- file = make_file(fname, flist,
- f == -1 && delete_excluded? SERVER_FILTERS : ALL_FILTERS);
-
- if (!file)
+ if (!(file = make_file(fname, flist, ALL_FILTERS)))
return;
maybe_emit_filelist_progress(flist);
/* Note that the "recurse" value either contains -1, for infinite recursion,
- * or a number >= 0 indicating how many levels of recursion we will allow. */
+ * or a number >= 0 indicating how many levels of recursion we will allow.
+ * This function is normally called by the sender, but the receiving side
+ * also calls it from delete_in_dir() with f set to -1 so that we just
+ * construct the file list in memory without sending it over the wire. */
static void send_directory(int f, struct file_list *flist,
char *fbuf, unsigned int len)
{
}
-/* This function is normally called by the sender, but the receiving side
- * also uses it to construct one or more file lists if one of the --delete
- * options have been specified. The delete_files() function sets f to -1
- * so that we just construct the file list in memory without sending it
- * over the wire. It also has the side-effect of ignoring user-excludes if
- * delete_excluded is set (so that the delete list includes user-excluded
- * files). */
struct file_list *send_file_list(int f, int argc, char *argv[])
{
int l;
int64 start_write;
int use_ff_fd = 0;
- if (show_filelist_p() && f != -1)
+ if (show_filelist_p())
start_filelist_progress("building file list");
start_write = stats.total_written;
gettimeofday(&start_tv, NULL);
- flist = flist_new(f == -1 ? WITHOUT_HLINK : WITH_HLINK,
- "send_file_list");
+ flist = flist_new(WITH_HLINK, "send_file_list");
- if (f != -1) {
- io_start_buffering_out();
- if (filesfrom_fd >= 0) {
- if (argv[0] && !push_dir(argv[0])) {
- rsyserr(FERROR, errno, "push_dir %s failed",
- full_fname(argv[0]));
- exit_cleanup(RERR_FILESELECT);
- }
- use_ff_fd = 1;
+ io_start_buffering_out();
+ if (filesfrom_fd >= 0) {
+ if (argv[0] && !push_dir(argv[0])) {
+ rsyserr(FERROR, errno, "push_dir %s failed",
+ full_fname(argv[0]));
+ exit_cleanup(RERR_FILESELECT);
}
+ use_ff_fd = 1;
}
while (1) {
recurse = 0;
if (link_stat(fname, &st, keep_dirlinks) != 0) {
- if (f != -1) {
- io_error |= IOERR_GENERAL;
- rsyserr(FERROR, errno, "link_stat %s failed",
- full_fname(fname));
- }
+ io_error |= IOERR_GENERAL;
+ rsyserr(FERROR, errno, "link_stat %s failed",
+ full_fname(fname));
continue;
}
dir = fname;
fname = p + 1;
}
- } else if (f != -1 && implied_dirs && (p=strrchr(fname,'/')) && p != fname) {
+ } else if (implied_dirs && (p=strrchr(fname,'/')) && p != fname) {
/* this ensures we send the intermediate directories,
thus getting their permissions right */
char *lp = lastpath, *fn = fname, *slash = fname;
}
}
- if (f != -1) {
- gettimeofday(&end_tv, NULL);
- stats.flist_buildtime =
- (int64)(end_tv.tv_sec - start_tv.tv_sec) * 1000
- + (end_tv.tv_usec - start_tv.tv_usec) / 1000;
- if (stats.flist_buildtime == 0)
- stats.flist_buildtime = 1;
- start_tv = end_tv;
-
- send_file_entry(NULL, f, 0);
-
- if (show_filelist_p())
- finish_filelist_progress(flist);
-
- gettimeofday(&end_tv, NULL);
- stats.flist_xfertime =
- (int64)(end_tv.tv_sec - start_tv.tv_sec) * 1000
- + (end_tv.tv_usec - start_tv.tv_usec) / 1000;
- }
+ gettimeofday(&end_tv, NULL);
+ stats.flist_buildtime = (int64)(end_tv.tv_sec - start_tv.tv_sec) * 1000
+ + (end_tv.tv_usec - start_tv.tv_usec) / 1000;
+ if (stats.flist_buildtime == 0)
+ stats.flist_buildtime = 1;
+ start_tv = end_tv;
+
+ send_file_entry(NULL, f, 0);
+
+ if (show_filelist_p())
+ finish_filelist_progress(flist);
+
+ gettimeofday(&end_tv, NULL);
+ stats.flist_xfertime = (int64)(end_tv.tv_sec - start_tv.tv_sec) * 1000
+ + (end_tv.tv_usec - start_tv.tv_usec) / 1000;
if (flist->hlink_pool) {
pool_destroy(flist->hlink_pool);
clean_flist(flist, 0, 0);
- if (f != -1) {
- /* Now send the uid/gid list. This was introduced in
- * protocol version 15 */
- send_uid_list(f);
+ /* Now send the uid/gid list. This was introduced in
+ * protocol version 15 */
+ send_uid_list(f);
- /* send the io_error flag */
- write_int(f, lp_ignore_errors(module_id) ? 0 : io_error);
+ /* send the io_error flag */
+ write_int(f, lp_ignore_errors(module_id) ? 0 : io_error);
- io_end_buffering();
- stats.flist_size = stats.total_written - start_write;
- stats.num_files = flist->count;
- }
+ io_end_buffering();
+ stats.flist_size = stats.total_written - start_write;
+ stats.num_files = flist->count;
if (verbose > 3)
- output_flist(flist, f < 0 ? "delete" : who_am_i());
+ output_flist(flist, who_am_i());
if (verbose > 2)
rprintf(FINFO, "send_file_list done\n");
}
-enum fnc_state { fnc_DIR, fnc_SLASH, fnc_BASE, fnc_TRAILING };
+enum fnc_state { s_DIR, s_SLASH, s_BASE, s_TRAILING };
/* Compare the names of two file_struct entities, similar to how strcmp()
* would do if it were operating on the joined strings. The only difference
if (c1 == c2)
c1 = c2 = NULL;
if (!c1) {
- state1 = fnc_BASE;
+ state1 = s_BASE;
c1 = (uchar*)f1->basename;
} else if (!*c1) {
- state1 = fnc_SLASH;
+ state1 = s_SLASH;
c1 = (uchar*)"/";
} else
- state1 = fnc_DIR;
+ state1 = s_DIR;
if (!c2) {
- state2 = fnc_BASE;
+ state2 = s_BASE;
c2 = (uchar*)f2->basename;
} else if (!*c2) {
- state2 = fnc_SLASH;
+ state2 = s_SLASH;
c2 = (uchar*)"/";
} else
- state2 = fnc_DIR;
+ state2 = s_DIR;
while (1) {
if ((dif = (int)*c1 - (int)*c2) != 0)
break;
if (!*++c1) {
switch (state1) {
- case fnc_DIR:
- state1 = fnc_SLASH;
+ case s_DIR:
+ state1 = s_SLASH;
c1 = (uchar*)"/";
break;
- case fnc_SLASH:
- state1 = fnc_BASE;
+ case s_SLASH:
+ state1 = s_BASE;
c1 = (uchar*)f1->basename;
break;
- case fnc_BASE:
- state1 = fnc_TRAILING;
+ case s_BASE:
+ state1 = s_TRAILING;
if (protocol_version >= 29 && S_ISDIR(f1->mode))
c1 = (uchar*)"/";
break;
- case fnc_TRAILING:
+ case s_TRAILING:
break;
}
}
if (!*++c2) {
switch (state2) {
- case fnc_DIR:
- state2 = fnc_SLASH;
+ case s_DIR:
+ state2 = s_SLASH;
c2 = (uchar*)"/";
break;
- case fnc_SLASH:
- state2 = fnc_BASE;
+ case s_SLASH:
+ state2 = s_BASE;
c2 = (uchar*)f2->basename;
break;
- case fnc_BASE:
- if (state1 == fnc_TRAILING)
+ case s_BASE:
+ if (state1 == s_TRAILING)
return 0;
- state2 = fnc_TRAILING;
+ state2 = s_TRAILING;
if (protocol_version >= 29 && S_ISDIR(f2->mode))
c2 = (uchar*)"/";
break;
- case fnc_TRAILING:
+ case s_TRAILING:
break;
}
}