extern long block_size; /* "long" because popt can't set an int32. */
extern int max_delete;
extern int force_delete;
-extern int one_file_system;
extern struct stats stats;
-extern dev_t filesystem_dev;
extern char *backup_dir;
extern char *backup_suffix;
extern int backup_suffix_len;
static int already_warned = 0;
struct file_list *dirlist;
char delbuf[MAXPATHLEN];
- STRUCT_STAT st;
int dlen, i;
if (!flist) {
dlen = strlen(fbuf);
filt_array[cur_depth] = push_local_filters(fbuf, dlen);
- if (link_stat(fbuf, &st, keep_dirlinks) < 0)
+ if (file->flags & FLAG_MOUNT_POINT)
return;
- if (one_file_system) {
- if (file->flags & FLAG_TOP_DIR)
- filesystem_dev = st.st_dev;
- else if (filesystem_dev != st.st_dev)
- return;
- }
-
dirlist = get_dirlist(fbuf, dlen, 0);
/* If an item in dirlist is not found in flist, delete it
* from the filesystem. */
for (i = dirlist->count; i--; ) {
struct file_struct *fp = dirlist->files[i];
- if (!fp->basename || fp->flags & FLAG_MOUNT_POINT)
+ if (!fp->basename)
continue;
+ if (fp->flags & FLAG_MOUNT_POINT) {
+ int j = flist_find(flist, fp);
+ if (j >= 0)
+ flist->files[j]->flags |= FLAG_MOUNT_POINT;
+ continue;
+ }
if (flist_find(flist, fp) < 0) {
int mode = fp->mode;
f_name(fp, delbuf);
static void do_delete_pass(struct file_list *flist)
{
char fbuf[MAXPATHLEN];
+ STRUCT_STAT st;
int j;
if (dry_run > 1 /* destination doesn't exist yet */
if (verbose > 1 && file->flags & FLAG_TOP_DIR)
rprintf(FINFO, "deleting in %s\n", fbuf);
+ if (link_stat(fbuf, &st, keep_dirlinks) < 0
+ || !S_ISDIR(st.st_mode))
+ continue;
+
delete_in_dir(flist, fbuf, file);
}
delete_in_dir(NULL, NULL, NULL);
iflags &= 0xffff;
if ((iflags & SIGNIFICANT_ITEM_FLAGS || verbose > 1
- || (xname && *xname)) && !read_batch) {
+ || log_format_has_i > 1 || (xname && *xname)) && !read_batch) {
if (protocol_version >= 29) {
if (ndx >= 0)
write_int(sock_f_out, ndx);
|| !unchanged_attrs(file, &st))
continue;
if (S_ISLNK(file->mode)) {
+#ifdef SUPPORT_LINKS
if ((len = readlink(fnamebuf, lnk, MAXPATHLEN-1)) <= 0)
continue;
lnk[len] = '\0';
if (strcmp(lnk, file->u.link) != 0)
+#endif
continue;
} else {
if (!IS_DEVICE(st.st_mode) || st.st_rdev != file->u.rdev)
close(fd);
return;
}
- if (!(back_file = make_file(fname, NULL, NO_FILTERS))) {
+ if (!(back_file = make_file(fname, NULL, NULL, 0, NO_FILTERS))) {
close(fd);
goto pretend_missing;
}
close(fd);
}
-
void generate_files(int f_out, struct file_list *flist, char *local_name)
{
int i;
* modified-time values. */
for (i = 0; i < flist->count; i++) {
struct file_struct *file = flist->files[i];
+
if (!file->basename || !S_ISDIR(file->mode))
continue;
if (!need_retouch_dir_times && file->mode & S_IWUSR)