static gid_t gid;
static char lastname[MAXPATHLEN], *lastdir;
static int lastdir_depth, lastdir_len = -1;
- static unsigned int del_heir_name_len = 0;
+ static unsigned int del_hier_name_len = 0;
static int in_del_hier = 0;
char thisname[MAXPATHLEN];
unsigned int l1 = 0, l2 = 0;
if (S_ISDIR(mode)) {
if (flags & XMIT_DEL_START) {
in_del_hier = 1;
- del_heir_name_len = l1 + l2;
+ del_hier_name_len = l1 + l2;
file->flags |= FLAG_DEL_START;
} else if (delete_during && in_del_hier) {
- if (!relative_paths || (l1 >= del_heir_name_len
- && thisname[del_heir_name_len] == '/'))
+ if (!relative_paths || (l1 >= del_hier_name_len
+ && thisname[del_hier_name_len] == '/'))
file->flags |= FLAG_DEL_START;
else
in_del_hier = 0;
void delete_in_dir(struct file_list *flist, char *fname)
{
static void *filt_array[MAXPATHLEN/2];
+ static BOOL need_first_push = True;
static int fa_lvl = 0;
static char fbuf[MAXPATHLEN];
struct file_list *dir_list;
if (!flist) {
while (fa_lvl)
pop_local_filters(filt_array[--fa_lvl]);
+ need_first_push = True;
*fbuf = '\0';
return;
}
if (io_error && !(lp_ignore_errors(module_id) || ignore_errors)) {
rprintf(FINFO,
- "IO error encountered - skipping file deletion\n");
+ "IO error encountered -- skipping file deletion\n");
max_delete = -1; /* avoid duplicating the above warning */
return;
}
- if (link_stat(fname, &st, keep_dirlinks) < 0)
- return;
-
- if (one_file_system)
- filesystem_dev = st.st_dev;
-
for (j = 0; fbuf[j]; j++) {
if (fbuf[j] != fname[j]) {
while (fa_lvl) {
}
dlen = strlcpy(fbuf, fname, MAXPATHLEN);
+ if (need_first_push) {
+ if (dlen != 1 || fbuf[0] != '.') {
+ char *s = strrchr(fbuf, '/');
+ int first_dlen;
+ if (s)
+ first_dlen = s - fbuf;
+ else
+ first_dlen = 0;
+ if (!s || s[1] != '.' || s[2] != '\0') {
+ filt_array[fa_lvl++] = push_local_filters(fbuf,
+ first_dlen);
+ }
+ }
+ need_first_push = False;
+ }
+
if (dlen >= MAXPATHLEN - 1)
return;
if (fa_lvl >= MAXPATHLEN/2)
return; /* impossible... */
+ if (link_stat(fname, &st, keep_dirlinks) < 0)
+ return;
+
+ if (one_file_system)
+ filesystem_dev = st.st_dev;
+
dir_list = flist_new(WITHOUT_HLINK, "delete_in_dir");
recurse = 0;