if (allowed_lull)
maybe_send_keepalive();
- if (file->dir.depth >= MAXPATHLEN/2+1)
+ if (F_DEPTH(file) >= MAXPATHLEN/2+1)
return; /* Impossible... */
if (io_error && !(lp_ignore_errors(module_id) || ignore_errors)) {
return;
}
- while (cur_depth >= file->dir.depth && cur_depth >= min_depth)
+ while (cur_depth >= F_DEPTH(file) && cur_depth >= min_depth)
pop_local_filters(filt_array[cur_depth--]);
- cur_depth = file->dir.depth;
+ cur_depth = F_DEPTH(file);
if (min_depth > cur_depth)
min_depth = cur_depth;
dlen = strlen(fbuf);
if (server_filter_list.head) {
if (excluded_below >= 0) {
- if (file->dir.depth > excluded_below)
+ if (F_DEPTH(file) > excluded_below)
goto skipping;
excluded_below = -1;
}
if (check_filter(&server_filter_list, fname,
S_ISDIR(file->mode)) < 0) {
if (S_ISDIR(file->mode))
- excluded_below = file->dir.depth;
+ excluded_below = F_DEPTH(file);
skipping:
if (verbose) {
rprintf(FINFO,
}
if (missing_below >= 0) {
- if (file->dir.depth <= missing_below) {
+ if (F_DEPTH(file) <= missing_below) {
if (dry_run)
dry_run--;
missing_below = -1;
statret = -1;
}
if (dry_run && statret != 0 && missing_below < 0) {
- missing_below = file->dir.depth;
+ missing_below = F_DEPTH(file);
dry_run++;
}
real_ret = statret;
full_fname(fname));
file->flags |= FLAG_MISSING_DIR;
if (ndx+1 < the_file_list->count
- && the_file_list->files[ndx+1]->dir.depth > file->dir.depth) {
+ && F_DEPTH(the_file_list->files[ndx+1]) > F_DEPTH(file)) {
rprintf(FERROR,
"*** Skipping everything below this failed directory ***\n");
- missing_below = file->dir.depth;
+ missing_below = F_DEPTH(file);
}
return;
}
if (!need_retouch_dir_times && file->mode & S_IWUSR)
continue;
if (file->flags & FLAG_MISSING_DIR) {
- int missing = file->dir.depth;
+ int missing = F_DEPTH(file);
while (++i < flist->count) {
file = flist->files[i];
- if (file->dir.depth <= missing)
+ if (F_DEPTH(file) <= missing)
break;
}
i--;