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 int flist_find(struct file_list *flist, struct file_struct *f);
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;
-void receive_file_entry(struct file_struct **fptr, unsigned short flags,
- struct file_list *flist, int f)
+static void receive_file_entry(struct file_list *flist, int ndx,
+ unsigned short flags, int f)
{
static time_t modtime;
static mode_t mode;
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;
char *basename, *dirname, *bp;
struct file_struct *file;
- if (!fptr) {
+ if (!flist) {
modtime = 0, mode = 0;
dev = 0, rdev = makedev(0, 0);
rdev_major = 0;
+ linkname_len + sum_len;
bp = pool_alloc(flist->file_pool, alloc_len, "receive_file_entry");
- file = *fptr = (struct file_struct *)bp;
+ file = flist->files[ndx] = (struct file_struct *)bp;
memset(bp, 0, file_struct_len);
bp += file_struct_len;
file->uid = uid;
file->gid = gid;
+ if (dirname_len) {
+ file->dirname = lastdir = bp;
+ lastdir_len = dirname_len - 1;
+ memcpy(bp, dirname, dirname_len - 1);
+ bp += dirname_len;
+ bp[-1] = '\0';
+ lastdir_depth = count_dir_elements(lastdir);
+ file->dir.depth = lastdir_depth + 1;
+ } else if (dirname) {
+ file->dirname = dirname; /* we're reusing lastname */
+ file->dir.depth = lastdir_depth + 1;
+ } else
+ file->dir.depth = 1;
+
if (S_ISDIR(mode)) {
+ if (basename_len == 1+1 && *basename == '.') /* N.B. null */
+ file->dir.depth--;
if (flags & XMIT_DEL_START) {
in_del_hier = 1;
- del_heir_name_len = l1 + l2;
+ del_hier_name_len = file->dir.depth == 0 ? 0 : 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 || !del_hier_name_len
+ || (l1 >= del_hier_name_len
+ && thisname[del_hier_name_len] == '/'))
file->flags |= FLAG_DEL_START;
else
in_del_hier = 0;
}
}
- if (dirname_len) {
- file->dirname = lastdir = bp;
- lastdir_len = dirname_len - 1;
- memcpy(bp, dirname, dirname_len - 1);
- bp += dirname_len;
- bp[-1] = '\0';
- if (sanitize_paths)
- lastdir_depth = count_dir_elements(lastdir);
- } else if (dirname)
- file->dirname = dirname;
-
file->basename = bp;
memcpy(bp, basename, basename_len);
bp += basename_len;
/*bp += sum_len;*/
}
- file->basedir = flist_dir;
+ file->dir.root = flist_dir;
/* This code is only used by the receiver when it is building
* a list of files for a delete pass. */
}
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;
char *p, *dir, olddir[sizeof curr_dir];
char lastpath[MAXPATHLEN] = "";
struct file_list *flist;
- BOOL need_first_push = True;
struct timeval start_tv, end_tv;
int64 start_write;
int use_ff_fd = 0;
exit_cleanup(RERR_FILESELECT);
}
use_ff_fd = 1;
- if (curr_dir_len < MAXPATHLEN - 1) {
- push_local_filters(curr_dir, curr_dir_len);
- need_first_push = False;
- }
}
}
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)
recurse = 0;
- if (need_first_push) {
- if ((p = strrchr(fname, '/')) != NULL) {
- if (*++p && strcmp(p, ".") != 0)
- push_local_filters(fname, p - fname);
- } else if (strcmp(fname, ".") != 0)
- push_local_filters(fname, 0);
- need_first_push = False;
- }
-
if (link_stat(fname, &st, keep_dirlinks) != 0) {
if (f != -1) {
io_error |= IOERR_GENERAL;
}
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);
if (protocol_version >= 28 && (flags & XMIT_EXTENDED_FLAGS))
flags |= read_byte(f) << 8;
- receive_file_entry(&flist->files[i], flags, flist, f);
+ receive_file_entry(flist, i, flags, f);
if (S_ISREG(flist->files[i]->mode))
stats.total_size += flist->files[i]->length;
f_name(flist->files[i]));
}
}
- receive_file_entry(NULL, 0, NULL, 0); /* Signal that we're done. */
+ receive_file_entry(NULL, 0, 0, 0); /* Signal that we're done. */
if (verbose > 2)
rprintf(FINFO, "received %d names\n", flist->count);
}
-int file_compare(struct file_struct **file1, struct file_struct **file2)
+static int file_compare(struct file_struct **file1, struct file_struct **file2)
{
- struct file_struct *f1 = *file1;
- struct file_struct *f2 = *file2;
-
- if (!f1->basename && !f2->basename)
- return 0;
- if (!f1->basename)
- return -1;
- if (!f2->basename)
- return 1;
- if (f1->dirname == f2->dirname)
- return u_strcmp(f1->basename, f2->basename);
- return f_name_cmp(f1, f2);
+ return f_name_cmp(*file1, *file2);
}
-int flist_find(struct file_list *flist, struct file_struct *f)
+static int flist_find(struct file_list *flist, struct file_struct *f)
{
- int low = 0, high = flist->count - 1;
-
- while (high >= 0 && !flist->files[high]->basename) high--;
-
- if (high < 0)
- return -1;
-
- while (low != high) {
- int mid = (low + high) / 2;
- int ret = file_compare(&flist->files[flist_up(flist, mid)],&f);
+ int low = flist->low, high = flist->high;
+ int ret, mid, mid_up;
+
+ while (low <= high) {
+ mid = (low + high) / 2;
+ for (mid_up = mid; !flist->files[mid_up]->basename; mid_up++) {}
+ if (mid_up <= high)
+ ret = f_name_cmp(flist->files[mid_up], f);
+ else
+ ret = 1;
if (ret == 0)
- return flist_up(flist, mid);
+ return mid_up;
if (ret > 0)
- high = mid;
+ high = mid - 1;
else
- low = mid + 1;
+ low = mid_up + 1;
}
-
- if (file_compare(&flist->files[flist_up(flist, low)], &f) == 0)
- return flist_up(flist, low);
return -1;
}
break;
}
}
+ flist->low = prev_i;
while (++i < flist->count) {
if (!flist->files[i]->basename)
continue;
} else
prev_i = i;
}
+ flist->high = prev_i;
if (strip_root) {
/* we need to strip off the root directory in the case
static void output_flist(struct file_list *flist, const char *whose_list)
{
- char uidbuf[16], gidbuf[16];
+ char uidbuf[16], gidbuf[16], depthbuf[16];
struct file_struct *file;
int i;
sprintf(gidbuf, " gid=%ld", (long)file->gid);
else
*gidbuf = '\0';
- rprintf(FINFO, "[%s] i=%d %s %s %s mode=0%o len=%.0f%s%s\n",
- whose_list, i, NS(file->basedir), NS(file->dirname),
- NS(file->basename), (int)file->mode,
- (double)file->length, uidbuf, gidbuf);
+ if (!am_sender)
+ sprintf(depthbuf, "%d", file->dir.depth);
+ rprintf(FINFO, "[%s] i=%d %s %s%s%s%s mode=0%o len=%.0f%s%s flags=%x\n",
+ whose_list, i, am_sender ? NS(file->dir.root) : depthbuf,
+ file->dirname ? file->dirname : "",
+ file->dirname ? "/" : "", NS(file->basename),
+ S_ISDIR(file->mode) ? "/" : "", (int)file->mode,
+ (double)file->length, uidbuf, gidbuf, file->flags);
}
}
if (!f2 || !f2->basename)
return 1;
- if (!(c1 = (uchar*)f1->dirname)) {
+ c1 = (uchar*)f1->dirname;
+ c2 = (uchar*)f2->dirname;
+ if (c1 == c2)
+ c1 = c2 = NULL;
+ if (!c1) {
state1 = fnc_BASE;
c1 = (uchar*)f1->basename;
} else if (!*c1) {
c1 = (uchar*)"/";
} else
state1 = fnc_DIR;
- if (!(c2 = (uchar*)f2->dirname)) {
+ if (!c2) {
state2 = fnc_BASE;
c2 = (uchar*)f2->basename;
} else if (!*c2) {
}
-/* 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;
}
-void delete_in_dir(struct file_list *flist, char *fname)
+
+/* This function is used to implement --delete-during. */
+void delete_in_dir(struct file_list *flist, char *fbuf, int dlen, int new_depth)
{
- 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 int min_depth = MAXPATHLEN, cur_depth = -1;
+ static void *filt_array[MAXPATHLEN/2+1];
+ struct file_list *dir_list;
+ STRUCT_STAT st;
+
+ if (!flist) {
+ while (cur_depth >= min_depth)
+ pop_local_filters(filt_array[cur_depth--]);
+ min_depth = MAXPATHLEN;
+ cur_depth = -1;
+ return;
+ }
+ if (new_depth >= MAXPATHLEN/2+1)
+ return; /* Impossible... */
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;
- }
+ while (cur_depth >= new_depth && cur_depth >= min_depth)
+ pop_local_filters(filt_array[cur_depth--]);
+ cur_depth = new_depth;
+ if (min_depth > cur_depth)
+ min_depth = cur_depth;
+ filt_array[cur_depth] = push_local_filters(fbuf, dlen);
+
+ if (link_stat(fbuf, &st, keep_dirlinks) < 0)
+ return;
- argv[0] = fname;
- del_flist = send_file_list(-1, 1, argv);
+ if (one_file_system)
+ filesystem_dev = st.st_dev;
- relative_paths = save_relative_paths;
- implied_dirs = save_implied_dirs;
- xfer_dirs = save_xfer_dirs;
- recurse = save_recurse;
+ dir_list = flist_new(WITHOUT_HLINK, "delete_in_dir");
- if (!del_flist)
+ recurse = 0;
+ send_directory(-1, dir_list, fbuf, dlen);
+ recurse = -1;
+ fbuf[dlen] = '\0';
+
+ if (verbose > 3)
+ output_flist(dir_list, "delete");
+
+ delete_missing(flist, dir_list, fbuf);
+
+ 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));
+ if (verbose > 2)
+ rprintf(FINFO, "delete_missing(%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);
}