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);
/* We must make sure we don't send a zero flag byte or the
* other end will terminate the flist transfer. Note that
- * the use of XMIT_DEL_START on a non-dir has no meaning, so
+ * the use of XMIT_TOP_DIR on a non-dir has no meaning, so
* it's harmless way to add a bit to the first flag byte. */
if (protocol_version >= 28) {
if (!flags && !S_ISDIR(mode))
- flags |= XMIT_DEL_START;
+ flags |= XMIT_TOP_DIR;
if ((flags & 0xFF00) || !flags) {
flags |= XMIT_EXTENDED_FLAGS;
write_byte(f, flags);
write_byte(f, flags);
} else {
if (!(flags & 0xFF) && !S_ISDIR(mode))
- flags |= XMIT_DEL_START;
+ flags |= XMIT_TOP_DIR;
if (!(flags & 0xFF))
flags |= XMIT_LONG_NAME;
write_byte(f, flags);
-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 (S_ISDIR(mode)) {
- if (flags & XMIT_DEL_START) {
- in_del_hier = 1;
- del_heir_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] == '/'))
- 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;
+ 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 == '.') /* +1 for '\0' */
+ file->dir.depth--;
+ if (flags & XMIT_TOP_DIR) {
+ in_del_hier = 1;
+ del_hier_name_len = file->dir.depth == 0 ? 0 : l1 + l2;
+ file->flags |= FLAG_TOP_DIR | FLAG_DEL_HERE;
+ } else if (in_del_hier) {
+ if (!relative_paths || !del_hier_name_len
+ || (l1 >= del_hier_name_len
+ && thisname[del_hier_name_len] == '/'))
+ file->flags |= FLAG_DEL_HERE;
+ else
+ in_del_hier = 0;
+ }
+ }
file->basename = bp;
memcpy(bp, basename, 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. */
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;
- }
}
}
} 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;
filesystem_dev = st.st_dev;
do_subdirs = recurse >= 1 ? recurse-- : recurse;
- send_file_name(f, flist, fname, do_subdirs, XMIT_DEL_START);
+ send_file_name(f, flist, fname, do_subdirs, XMIT_TOP_DIR);
if (olddir[0]) {
flist_dir = NULL;
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;
f_name(flist->files[i]), i);
}
/* Make sure that if we unduplicate '.', that we don't
- * lose track of a user-specified starting point (or
- * else deletions will mysteriously fail with -R). */
- if (flist->files[i]->flags & FLAG_DEL_START)
- flist->files[prev_i]->flags |= FLAG_DEL_START;
+ * lose track of a user-specified top directory. */
+ if (flist->files[i]->flags & FLAG_TOP_DIR)
+ flist->files[prev_i]->flags |= FLAG_TOP_DIR;
clear_file(i, flist);
} 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) {
}
-/* This function is used to implement --delete-during. */
-void delete_in_dir(struct file_list *flist, char *fname)
+/* This function is used to implement per-directory deletion, and
+ * is used by all the --delete-WHEN options. Note that the fbuf
+ * pointer must point to a MAXPATHLEN buffer with the name of the
+ * directory in it (the functions we call will append names onto
+ * the end, but the old dir value will be restored on exit). */
+void delete_in_dir(struct file_list *flist, char *fbuf,
+ struct file_struct *file)
{
- static void *filt_array[MAXPATHLEN/2];
- static int fa_lvl = 0;
- static char fbuf[MAXPATHLEN];
+ static int min_depth = MAXPATHLEN, cur_depth = -1;
+ static void *filt_array[MAXPATHLEN/2+1];
struct file_list *dir_list;
STRUCT_STAT st;
- int dlen, j;
+ int dlen;
if (!flist) {
- while (fa_lvl)
- pop_local_filters(filt_array[--fa_lvl]);
- *fbuf = '\0';
+ while (cur_depth >= min_depth)
+ pop_local_filters(filt_array[cur_depth--]);
+ min_depth = MAXPATHLEN;
+ cur_depth = -1;
return;
}
+ if (file->dir.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");
+ "IO error encountered -- skipping file deletion\n");
max_delete = -1; /* avoid duplicating the above warning */
return;
}
- if (link_stat(fname, &st, keep_dirlinks) < 0)
+ while (cur_depth >= file->dir.depth && cur_depth >= min_depth)
+ pop_local_filters(filt_array[cur_depth--]);
+ cur_depth = file->dir.depth;
+ if (min_depth > cur_depth)
+ min_depth = cur_depth;
+ dlen = strlen(fbuf);
+ filt_array[cur_depth] = push_local_filters(fbuf, dlen);
+
+ if (link_stat(fbuf, &st, keep_dirlinks) < 0)
return;
- if (one_file_system)
+ if (one_file_system && file->flags & FLAG_TOP_DIR)
filesystem_dev = st.st_dev;
- 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 (dlen >= MAXPATHLEN - 1)
- return;
- if (fa_lvl >= MAXPATHLEN/2)
- return; /* impossible... */
-
dir_list = flist_new(WITHOUT_HLINK, "delete_in_dir");
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);
+ fbuf[dlen] = '\0';
if (verbose > 3)
output_flist(dir_list, "delete");
- delete_missing(flist, dir_list, fname);
+ delete_missing(flist, dir_list, fbuf);
flist_free(dir_list);
}
if (max_delete && deletion_count >= max_delete)
return;
- if (verbose > 1)
- rprintf(FINFO, "deleting in %s\n", safe_fname(dirname));
+ if (verbose > 2)
+ rprintf(FINFO, "delete_missing(%s)\n", safe_fname(dirname));
for (i = dir_list->count; i--; ) {
if (!dir_list->files[i]->basename)
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff