static char empty_sum[MD4_SUM_LENGTH];
static unsigned int file_struct_len;
static struct file_list *received_flist;
+static dev_t filesystem_dev; /* used to implement -x */
+static int deletion_count = 0; /* used to implement --max-delete */
static void clean_flist(struct file_list *flist, int strip_root, int no_dups);
static void output_flist(struct file_list *flist, const char *whose_list);
return 0;
}
-/* used by the one_file_system code */
-static dev_t filesystem_dev;
-
-static void set_filesystem(char *fname)
-{
- STRUCT_STAT st;
- if (do_stat(fname, &st) != 0)
- return;
- filesystem_dev = st.st_dev;
-}
-
-
static int to_wire_mode(mode_t mode)
{
#if SUPPORT_LINKS
}
-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;
static gid_t gid;
static char lastname[MAXPATHLEN], *lastdir;
static int lastdir_depth, lastdir_len = -1;
- static unsigned int del_heir_name_len = -1;
+ static unsigned int del_heir_name_len = 0;
static int in_del_hier = 0;
char thisname[MAXPATHLEN];
unsigned int l1 = 0, l2 = 0;
rdev_major = 0;
uid = 0, gid = 0;
*lastname = '\0';
- del_heir_name_len = lastdir_len = -1;
+ lastdir_len = -1;
in_del_hier = 0;
return;
}
}
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 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_in_dir() function sets f to -1
+ * 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) and it avoids some per-arg init code for limited recursion (since
- * delete_in_dir() sets recurse before calling this function). */
+ * files). */
struct file_list *send_file_list(int f, int argc, char *argv[])
{
int l;
fname[l] = '\0';
}
}
- if (f == -1)
- ; /* recurse is pre-set */
- else if (fname[l-1] == '.' && (l == 1 || fname[l-2] == '/')) {
+ if (fname[l-1] == '.' && (l == 1 || fname[l-2] == '/')) {
if (!recurse && xfer_dirs)
recurse = 1; /* allow one level */
} else if (recurse > 0)
}
if (one_file_system)
- set_filesystem(fname);
+ filesystem_dev = st.st_dev;
do_subdirs = recurse >= 1 ? recurse-- : recurse;
send_file_name(f, flist, fname, do_subdirs, XMIT_DEL_START);
}
-/* Like f_name_to(), but we rotate through 5 static buffers of our own.
- */
+/* Like f_name_to(), but we rotate through 5 static buffers of our own. */
char *f_name(struct file_struct *f)
{
static char names[5][MAXPATHLEN];
return f_name_to(f, names[n]);
}
+
static int is_backup_file(char *fn)
{
int k = strlen(fn) - backup_suffix_len;
return k > 0 && strcmp(fn+k, backup_suffix) == 0;
}
+
+/* This function is used to implement --delete-during. */
void delete_in_dir(struct file_list *flist, char *fname)
{
- static int deletion_count = 0;
- struct file_list *del_flist;
- int save_recurse = recurse;
- int save_xfer_dirs = xfer_dirs;
- int save_implied_dirs = implied_dirs;
- int save_relative_paths = relative_paths;
- char *argv[1];
- int i, j, mode;
+ 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 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;
}
- if (delete_during) {
- recurse = 1; /* allow one level only */
- xfer_dirs = 1;
- implied_dirs = 0;
- relative_paths = 1;
+ 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;
}
- argv[0] = fname;
- del_flist = send_file_list(-1, 1, argv);
+ 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");
- relative_paths = save_relative_paths;
- implied_dirs = save_implied_dirs;
- xfer_dirs = save_xfer_dirs;
- recurse = save_recurse;
+ recurse = 0;
+ filt_array[fa_lvl++] = push_local_filters(fbuf, dlen);
+ send_directory(-1, dir_list, fbuf, dlen);
+ recurse = -1;
- if (!del_flist)
+ if (dlen == 1 && *fbuf == '.')
+ *fbuf = '\0';
+
+ clean_flist(dir_list, 0, 0);
+
+ if (verbose > 3)
+ output_flist(dir_list, "delete");
+
+ delete_missing(flist, dir_list, fname);
+
+ flist_free(dir_list);
+}
+
+
+/* If an item in dir_list is not found in full_list, delete it from the
+ * filesystem. */
+void delete_missing(struct file_list *full_list, struct file_list *dir_list,
+ const char *dirname)
+{
+ int i, j, mode;
+
+ if (max_delete && deletion_count >= max_delete)
return;
if (verbose > 1)
- rprintf(FINFO, "deleting in %s\n", safe_fname(fname));
+ rprintf(FINFO, "deleting in %s\n", safe_fname(dirname));
- for (i = del_flist->count-1; i >= 0; i--) {
- if (max_delete && deletion_count >= max_delete)
- break;
- if (!del_flist->files[i]->basename)
+ for (i = dir_list->count; i--; ) {
+ if (!dir_list->files[i]->basename)
continue;
- mode = del_flist->files[i]->mode;
- if ((j = flist_find(flist, del_flist->files[i])) < 0
+ mode = dir_list->files[i]->mode;
+ if ((j = flist_find(full_list, dir_list->files[i])) < 0
|| (delete_during && S_ISDIR(mode)
- && !S_ISDIR(flist->files[j]->mode))) {
- char *f = f_name(del_flist->files[i]);
+ && !S_ISDIR(full_list->files[j]->mode))) {
+ char *f = f_name(dir_list->files[i]);
if (make_backups && (backup_dir || !is_backup_file(f))
&& !S_ISDIR(mode)) {
make_backup(f);
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)
+ break;
}
}
- flist_free(del_flist);
}