}
-static void send_directory(int f, struct file_list *flist, char *dir);
+static void send_directory(int f, struct file_list *flist,
+ char *fbuf, unsigned int offset);
static char *flist_dir;
static int flist_dir_len;
}
if (recursive && S_ISDIR(file->mode)
- && !(file->flags & FLAG_MOUNT_POINT)) {
- send_directory(f, flist, f_name_to(file, fbuf));
+ && !(file->flags & FLAG_MOUNT_POINT) && f_name_to(file, fbuf)) {
+ void *save_filters;
+ unsigned int len = strlen(fbuf);
+ if (len > 1 && fbuf[len-1] == '/')
+ fbuf[--len] = '\0';
+ if (len >= MAXPATHLEN - 1) {
+ io_error |= IOERR_GENERAL;
+ rprintf(FERROR, "skipping long-named directory: %s\n",
+ full_fname(fbuf));
+ return;
+ }
+ save_filters = push_local_filters(fbuf, len);
+ send_directory(f, flist, fbuf, len);
+ pop_local_filters(save_filters);
}
}
/* Note that the "recurse" value either contains -1, for infinite recursion,
* or a number >= 0 indicating how many levels of recursion we will allow. */
-static void send_directory(int f, struct file_list *flist, char *dir)
+static void send_directory(int f, struct file_list *flist,
+ char *fbuf, unsigned int len)
{
- DIR *d;
struct dirent *di;
- char fname[MAXPATHLEN];
- unsigned int offset;
- void *save_filters;
char *p;
+ DIR *d;
- d = opendir(dir);
- if (!d) {
+ if (!(d = opendir(fbuf))) {
io_error |= IOERR_GENERAL;
- rsyserr(FERROR, errno, "opendir %s failed", full_fname(dir));
+ rsyserr(FERROR, errno, "opendir %s failed", full_fname(fbuf));
return;
}
- offset = strlcpy(fname, dir, MAXPATHLEN);
- p = fname + offset;
- if (offset >= MAXPATHLEN || p[-1] != '/') {
- if (offset >= MAXPATHLEN - 1) {
- io_error |= IOERR_GENERAL;
- rprintf(FERROR, "skipping long-named directory: %s\n",
- full_fname(fname));
- closedir(d);
- return;
- }
+ p = fbuf + len;
+ if (len != 1 || *fbuf != '/')
*p++ = '/';
- offset++;
- }
-
- save_filters = push_local_filters(fname, offset);
+ *p = '\0';
for (errno = 0, di = readdir(d); di; errno = 0, di = readdir(d)) {
char *dname = d_name(di);
if (dname[0] == '.' && (dname[1] == '\0'
|| (dname[1] == '.' && dname[2] == '\0')))
continue;
- if (strlcpy(p, dname, MAXPATHLEN - offset) < MAXPATHLEN - offset) {
+ if (strlcpy(p, dname, MAXPATHLEN - len) < MAXPATHLEN - len) {
int do_subdirs = recurse >= 1 ? recurse-- : recurse;
- send_file_name(f, flist, fname, do_subdirs, 0);
+ send_file_name(f, flist, fbuf, do_subdirs, 0);
} else {
io_error |= IOERR_GENERAL;
rprintf(FINFO,
"cannot send long-named file %s\n",
- full_fname(fname));
+ full_fname(fbuf));
}
}
if (errno) {
io_error |= IOERR_GENERAL;
- rsyserr(FERROR, errno, "readdir(%s)", dir);
+ *p = '\0';
+ rsyserr(FERROR, errno, "readdir(%s)", fbuf);
}
- pop_local_filters(save_filters);
-
closedir(d);
}
/* This function is used to implement --delete-during. */
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;
STRUCT_STAT st;
- int save_recurse = recurse;
+ int dlen, j;
+
+ if (!flist) {
+ while (fa_lvl)
+ pop_local_filters(filt_array[--fa_lvl]);
+ need_first_push = True;
+ *fbuf = '\0';
+ return;
+ }
if (max_delete && deletion_count >= max_delete)
return;
if (io_error && !(lp_ignore_errors(module_id) || ignore_errors)) {
- rprintf(FINFO, "IO error encountered - skipping file deletion\n");
+ rprintf(FINFO,
+ "IO error encountered - skipping file deletion\n");
max_delete = -1; /* avoid duplicating the above warning */
return;
}
+ for (j = 0; fbuf[j]; j++) {
+ if (fbuf[j] != fname[j]) {
+ while (fa_lvl) {
+ if (fbuf[j] == '/')
+ pop_local_filters(filt_array[--fa_lvl]);
+ if (!fbuf[++j])
+ break;
+ }
+ break;
+ }
+ }
+
+ 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;
filesystem_dev = st.st_dev;
dir_list = flist_new(WITHOUT_HLINK, "delete_in_dir");
- recurse = 1; /* allow only one level */
- send_file_name(-1, dir_list, fname, 1, XMIT_DEL_START);
- recurse = save_recurse;
+
+ recurse = 0;
+ filt_array[fa_lvl++] = push_local_filters(fbuf, dlen);
+ send_directory(-1, dir_list, fbuf, dlen);
+ recurse = -1;
+
+ if (dlen == 1 && *fbuf == '.')
+ *fbuf = '\0';
+
clean_flist(dir_list, 0, 0);
if (verbose > 3)
if (verbose > 1)
rprintf(FINFO, "deleting in %s\n", safe_fname(dirname));
- for (i = dir_list->count-1; i >= 0; i--) {
+ for (i = dir_list->count; i--; ) {
if (!dir_list->files[i]->basename)
continue;
mode = dir_list->files[i]->mode;
rprintf(FINFO, "deleting %s\n",
safe_fname(f));
}
+ } else if (S_ISDIR(mode)) {
+ int dflag = delete_during ? DEL_FORCE_RECURSE
+ : DEL_NO_RECURSE;
+ delete_file(f, DEL_DIR | dflag);
} else {
- int dflags = delete_during
- ? DEL_DIR | DEL_FORCE_RECURSE
- : DEL_DIR | DEL_NO_RECURSE;
- delete_file(f, S_ISDIR(mode) ? dflags : 0);
+ delete_file(f, 0);
}
deletion_count++;
if (max_delete && deletion_count >= max_delete)
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff