dlen = strlen(fbuf);
filt_array[cur_depth] = push_local_filters(fbuf, dlen);
- if (link_stat(fbuf, &st, keep_dirlinks) < 0)
+ if (link_stat(fbuf, &st, keep_dirlinks) < 0 || !S_ISDIR(st.st_mode))
return;
if (one_file_system) {
continue;
if (flist_find(flist, fp) < 0) {
int mode = fp->mode;
- f_name_to(fp, delbuf);
+ f_name(fp, delbuf);
delete_item(delbuf, mode, DEL_FORCE_RECURSE);
}
}
if (!(file->flags & FLAG_DEL_HERE))
continue;
- f_name_to(file, fbuf);
+ f_name(file, fbuf);
if (verbose > 1 && file->flags & FLAG_TOP_DIR)
rprintf(FINFO, "deleting in %s\n", fbuf);
iflags &= 0xffff;
if ((iflags & SIGNIFICANT_ITEM_FLAGS || verbose > 1
- || (xname && *xname)) && !read_batch) {
+ || log_format_has_i > 1 || (xname && *xname)) && !read_batch) {
if (protocol_version >= 29) {
if (ndx >= 0)
write_int(sock_f_out, ndx);
if (safe_symlinks && unsafe_symlink(file->u.link, fname)) {
if (verbose) {
if (the_file_list->count == 1)
- fname = f_name(file);
+ fname = f_name(file, NULL);
rprintf(FINFO,
"ignoring unsafe symlink %s -> \"%s\"\n",
full_fname(fname), file->u.link);
if (!S_ISREG(file->mode)) {
if (the_file_list->count == 1)
- fname = f_name(file);
+ fname = f_name(file, NULL);
rprintf(FINFO, "skipping non-regular file \"%s\"\n", fname);
return;
}
if (max_size && file->length > max_size) {
if (verbose > 1) {
if (the_file_list->count == 1)
- fname = f_name(file);
+ fname = f_name(file, NULL);
rprintf(FINFO, "%s is over max-size\n", fname);
}
return;
if (min_size && file->length < min_size) {
if (verbose > 1) {
if (the_file_list->count == 1)
- fname = f_name(file);
+ fname = f_name(file, NULL);
rprintf(FINFO, "%s is under min-size\n", fname);
}
return;
int j = find_fuzzy(file, fuzzy_dirlist);
if (j >= 0) {
fuzzy_file = fuzzy_dirlist->files[j];
- f_name_to(fuzzy_file, fnamecmpbuf);
+ f_name(fuzzy_file, fnamecmpbuf);
if (verbose > 2) {
rprintf(FINFO, "fuzzy basis selected for %s: %s\n",
fname, fnamecmpbuf);
close(fd);
return;
}
- if (!(back_file = make_file(fname, NULL, NO_FILTERS))) {
+ if (!(back_file = make_file(fname, NULL, NULL, 0, NO_FILTERS))) {
close(fd);
goto pretend_missing;
}
close(fd);
}
-
void generate_files(int f_out, struct file_list *flist, char *local_name)
{
int i;
if (local_name)
strlcpy(fbuf, local_name, sizeof fbuf);
else
- f_name_to(file, fbuf);
+ f_name(file, fbuf);
recv_generator(fbuf, file, i, itemizing, maybe_PERMS_REPORT,
code, f_out);
if (local_name)
strlcpy(fbuf, local_name, sizeof fbuf);
else
- f_name_to(file, fbuf);
+ f_name(file, fbuf);
recv_generator(fbuf, file, i, itemizing, maybe_PERMS_REPORT,
code, f_out);
}
* modified-time values. */
for (i = 0; i < flist->count; i++) {
struct file_struct *file = flist->files[i];
+
if (!file->basename || !S_ISDIR(file->mode))
continue;
if (!need_retouch_dir_times && file->mode & S_IWUSR)
continue;
- recv_generator(f_name(file), file, i, itemizing,
+ recv_generator(f_name(file, NULL), file, i, itemizing,
maybe_PERMS_REPORT, code, -1);
if (allowed_lull && !(++j % lull_mod))
maybe_send_keepalive();