extern int am_root;
extern int am_server;
extern int am_daemon;
+extern int am_sender;
extern int always_checksum;
extern int module_id;
extern int ignore_errors;
extern int numeric_ids;
-extern int cvs_exclude;
-
extern int recurse;
+extern int xfer_dirs;
extern char curr_dir[MAXPATHLEN];
-extern char *files_from;
+extern unsigned int curr_dir_len;
+extern char *backup_dir;
+extern char *backup_suffix;
extern int filesfrom_fd;
extern int one_file_system;
+extern int keep_dirlinks;
extern int preserve_links;
extern int preserve_hard_links;
extern int preserve_perms;
extern int preserve_gid;
extern int relative_paths;
extern int implied_dirs;
+extern int make_backups;
+extern int backup_suffix_len;
extern int copy_links;
extern int copy_unsafe_links;
extern int protocol_version;
extern int sanitize_paths;
+extern int delete_excluded;
+extern int max_delete;
+extern int orig_umask;
+extern int list_only;
-extern int read_batch;
-extern int write_batch;
-
-extern struct exclude_list_struct exclude_list;
-extern struct exclude_list_struct server_exclude_list;
-extern struct exclude_list_struct local_exclude_list;
+extern struct filter_list_struct filter_list;
+extern struct filter_list_struct server_filter_list;
int io_error;
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);
+static void output_flist(struct file_list *flist, const char *whose_list);
void init_flist(void)
{
static int show_filelist_p(void)
{
- return verbose && (recurse || files_from) && !am_server;
+ return verbose && xfer_dirs && !am_server;
}
static void start_filelist_progress(char *kind)
{
rprintf(FINFO, "%s ... ", kind);
- if ((verbose > 1) || do_progress)
+ if (verbose > 1 || do_progress)
rprintf(FINFO, "\n");
rflush(FINFO);
}
static void maybe_emit_filelist_progress(const struct file_list *flist)
{
- if (do_progress && show_filelist_p() && ((flist->count % 100) == 0))
+ if (do_progress && show_filelist_p() && (flist->count % 100) == 0)
emit_filelist_progress(flist);
}
{
char perms[11];
- if (!f->basename)
+ if (!f->basename) {
/* this can happen if duplicate names were removed */
return;
+ }
permstring(perms, f->mode);
if (preserve_links && S_ISLNK(f->mode)) {
rprintf(FINFO, "%s %11.0f %s %s -> %s\n",
perms,
- (double) f->length, timestring(f->modtime),
- f_name(f), f->u.link);
+ (double)f->length, timestring(f->modtime),
+ safe_fname(f_name(f)), safe_fname(f->u.link));
} else
#endif
+ {
rprintf(FINFO, "%s %11.0f %s %s\n",
perms,
- (double) f->length, timestring(f->modtime),
- f_name(f));
+ (double)f->length, timestring(f->modtime),
+ safe_fname(f_name(f)));
+ }
}
* @post @p buffer contains information about the link or the
* referrent as appropriate, if they exist.
**/
-int readlink_stat(const char *path, STRUCT_STAT *buffer, char *linkbuf)
+static int readlink_stat(const char *path, STRUCT_STAT *buffer, char *linkbuf)
{
#if SUPPORT_LINKS
if (copy_links)
return do_stat(path, buffer);
- if (do_lstat(path, buffer) == -1)
+ if (link_stat(path, buffer, 0) < 0)
return -1;
if (S_ISLNK(buffer->st_mode)) {
- int l = readlink((char *) path, linkbuf, MAXPATHLEN - 1);
+ int l = readlink((char *)path, linkbuf, MAXPATHLEN - 1);
if (l == -1)
return -1;
linkbuf[l] = 0;
if (copy_unsafe_links && unsafe_symlink(linkbuf, path)) {
if (verbose > 1) {
rprintf(FINFO,"copying unsafe symlink \"%s\" -> \"%s\"\n",
- path, linkbuf);
+ safe_fname(path), safe_fname(linkbuf));
}
return do_stat(path, buffer);
}
#endif
}
-int link_stat(const char *path, STRUCT_STAT * buffer)
+int link_stat(const char *path, STRUCT_STAT *buffer, int follow_dirlinks)
{
#if SUPPORT_LINKS
if (copy_links)
return do_stat(path, buffer);
- return do_lstat(path, buffer);
+ if (do_lstat(path, buffer) < 0)
+ return -1;
+ if (follow_dirlinks && S_ISLNK(buffer->st_mode)) {
+ STRUCT_STAT st;
+ if (do_stat(path, &st) == 0 && S_ISDIR(st.st_mode))
+ *buffer = st;
+ }
+ return 0;
#else
return do_stat(path, buffer);
#endif
}
-/*
- * This function is used to check if a file should be included/excluded
+/* This function is used to check if a file should be included/excluded
* from the list of files based on its name and type etc. The value of
- * exclude_level is set to either SERVER_EXCLUDES or ALL_EXCLUDES.
- */
-static int check_exclude_file(char *fname, int is_dir, int exclude_level)
+ * filter_level is set to either SERVER_FILTERS or ALL_FILTERS. */
+static int is_excluded(char *fname, int is_dir, int filter_level)
{
- int rc;
-
#if 0 /* This currently never happens, so avoid a useless compare. */
- if (exclude_level == NO_EXCLUDES)
+ if (filter_level == NO_FILTERS)
return 0;
#endif
if (fname) {
return 0;
}
}
- if (server_exclude_list.head
- && check_exclude(&server_exclude_list, fname, is_dir) < 0)
+ if (server_filter_list.head
+ && check_filter(&server_filter_list, fname, is_dir) < 0)
return 1;
- if (exclude_level != ALL_EXCLUDES)
+ if (filter_level != ALL_FILTERS)
return 0;
- if (exclude_list.head
- && (rc = check_exclude(&exclude_list, fname, is_dir)) != 0)
- return rc < 0;
- if (local_exclude_list.head
- && check_exclude(&local_exclude_list, fname, is_dir) < 0)
+ if (filter_list.head
+ && check_filter(&filter_list, fname, is_dir) < 0)
return 1;
return 0;
}
-/* used by the one_file_system code */
-static dev_t filesystem_dev;
-
-static void set_filesystem(char *fname)
-{
- STRUCT_STAT st;
- if (link_stat(fname, &st) != 0)
- return;
- filesystem_dev = st.st_dev;
-}
-
-
static int to_wire_mode(mode_t mode)
{
#if SUPPORT_LINKS
if (S_ISLNK(mode) && (_S_IFLNK != 0120000))
return (mode & ~(_S_IFMT)) | 0120000;
#endif
- return (int) mode;
+ return (int)mode;
}
static mode_t from_wire_mode(int mode)
{
if ((mode & (_S_IFMT)) == 0120000 && (_S_IFLNK != 0120000))
return (mode & ~(_S_IFMT)) | _S_IFLNK;
- return (mode_t) mode;
+ return (mode_t)mode;
}
-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 flist_expand(struct file_list *flist)
{
- void *new_ptr;
+ struct file_struct **new_ptr;
if (flist->count < flist->malloced)
return;
if (flist->malloced < flist->count)
flist->malloced = flist->count;
- if (flist->files) {
- new_ptr = realloc_array(flist->files,
- struct file_struct *, flist->malloced);
- } else {
- new_ptr = new_array(struct file_struct *, flist->malloced);
- }
+ new_ptr = realloc_array(flist->files, struct file_struct *,
+ flist->malloced);
- if (verbose >= 2) {
+ if (verbose >= 2 && flist->malloced != FLIST_START) {
rprintf(FINFO, "[%s] expand file_list to %.0f bytes, did%s move\n",
who_am_i(),
- (double) sizeof flist->files[0] * flist->malloced,
+ (double)sizeof flist->files[0] * flist->malloced,
(new_ptr == flist->files) ? " not" : "");
}
- flist->files = (struct file_struct **) new_ptr;
+ flist->files = new_ptr;
if (!flist->files)
out_of_memory("flist_expand");
unsigned short flags;
static time_t modtime;
static mode_t mode;
- static uint64 dev;
+ static int64 dev;
static dev_t rdev;
static uint32 rdev_major;
static uid_t uid;
static gid_t gid;
static char lastname[MAXPATHLEN];
- char *fname, fbuf[MAXPATHLEN];
+ char fname[MAXPATHLEN];
int l1, l2;
if (f == -1)
io_write_phase = "send_file_entry";
- fname = f_name_to(file, fbuf);
+ f_name_to(file, fname);
flags = base_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 uint64 dev;
+ static int64 dev;
static dev_t rdev;
static uint32 rdev_major;
static uid_t uid;
static gid_t gid;
static char lastname[MAXPATHLEN], *lastdir;
- static int lastdir_len = -1;
+ static int lastdir_depth, lastdir_len = -1;
+ static unsigned int del_hier_name_len = 0;
+ static int in_del_hier = 0;
char thisname[MAXPATHLEN];
unsigned int l1 = 0, l2 = 0;
int alloc_len, basename_len, dirname_len, linkname_len, sum_len;
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;
uid = 0, gid = 0;
*lastname = '\0';
lastdir_len = -1;
+ in_del_hier = 0;
return;
}
if (l2 >= MAXPATHLEN - l1) {
rprintf(FERROR,
"overflow: flags=0x%x l1=%d l2=%d lastname=%s\n",
- flags, l1, l2, lastname);
+ flags, l1, l2, safe_fname(lastname));
overflow("receive_file_entry");
}
strlcpy(lastname, thisname, MAXPATHLEN);
- clean_fname(thisname);
+ clean_fname(thisname, 0);
if (sanitize_paths)
- sanitize_path(thisname, NULL);
+ sanitize_path(thisname, thisname, "", 0);
if ((basename = strrchr(thisname, '/')) != NULL) {
dirname_len = ++basename - thisname; /* counts future '\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->flags = flags & XMIT_TOP_DIR ? FLAG_TOP_DIR : 0;
+ file->flags = 0;
file->modtime = modtime;
file->length = file_length;
file->mode = mode;
memcpy(bp, dirname, dirname_len - 1);
bp += dirname_len;
bp[-1] = '\0';
- } 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);
file->u.link = bp;
read_sbuf(f, bp, linkname_len - 1);
if (sanitize_paths)
- sanitize_path(bp, lastdir);
+ sanitize_path(bp, bp, "", lastdir_depth);
bp += linkname_len;
}
#endif
if (preserve_hard_links && protocol_version < 28 && S_ISREG(mode))
flags |= XMIT_HAS_IDEV_DATA;
if (flags & XMIT_HAS_IDEV_DATA) {
- uint64 inode;
+ int64 inode;
if (protocol_version < 26) {
dev = read_int(f);
inode = read_int(f);
}
if (!preserve_perms) {
- extern int orig_umask;
/* set an appropriate set of permissions based on original
* permissions and umask. This emulates what GNU cp does */
file->mode &= ~orig_umask;
* statting directories if we're not recursing, but this is not a very
* important case. Some systems may not have d_type.
**/
-struct file_struct *make_file(char *fname,
- struct file_list *flist, int exclude_level)
+struct file_struct *make_file(char *fname, struct file_list *flist,
+ int filter_level)
{
static char *lastdir;
static int lastdir_len = -1;
if (strlcpy(thisname, fname, sizeof thisname)
>= sizeof thisname - flist_dir_len) {
- rprintf(FINFO, "skipping overly long name: %s\n", fname);
+ rprintf(FINFO, "skipping overly long name: %s\n",
+ safe_fname(fname));
return NULL;
}
- clean_fname(thisname);
+ clean_fname(thisname, 0);
if (sanitize_paths)
- sanitize_path(thisname, NULL);
+ sanitize_path(thisname, thisname, "", 0);
memset(sum, 0, SUM_LENGTH);
if (readlink_stat(thisname, &st, linkname) != 0) {
int save_errno = errno;
- if (errno == ENOENT) {
- enum logcode c = am_daemon && protocol_version < 28
- ? FERROR : FINFO;
- /* either symlink pointing nowhere or file that
- * was removed during rsync run; see if excluded
- * before reporting an error */
- if (exclude_level != NO_EXCLUDES
- && check_exclude_file(thisname, 0, exclude_level)) {
- /* file is excluded anyway, ignore silently */
- return NULL;
+ /* See if file is excluded before reporting an error. */
+ if (filter_level != NO_FILTERS
+ && is_excluded(thisname, 0, filter_level))
+ return NULL;
+ if (save_errno == ENOENT) {
+#if SUPPORT_LINKS
+ /* Avoid "vanished" error if symlink points nowhere. */
+ if (copy_links && do_lstat(thisname, &st) == 0
+ && S_ISLNK(st.st_mode)) {
+ io_error |= IOERR_GENERAL;
+ rprintf(FERROR, "symlink has no referent: %s\n",
+ full_fname(thisname));
+ } else
+#endif
+ {
+ enum logcode c = am_daemon && protocol_version < 28
+ ? FERROR : FINFO;
+ io_error |= IOERR_VANISHED;
+ rprintf(c, "file has vanished: %s\n",
+ full_fname(thisname));
}
- io_error |= IOERR_VANISHED;
- rprintf(c, "file has vanished: %s\n",
- full_fname(thisname));
- }
- else {
+ } else {
io_error |= IOERR_GENERAL;
rsyserr(FERROR, save_errno, "readlink %s failed",
full_fname(thisname));
return NULL;
}
- /* backup.c calls us with exclude_level set to NO_EXCLUDES. */
- if (exclude_level == NO_EXCLUDES)
- goto skip_excludes;
+ /* backup.c calls us with filter_level set to NO_FILTERS. */
+ if (filter_level == NO_FILTERS)
+ goto skip_filters;
- if (S_ISDIR(st.st_mode) && !recurse && !files_from) {
- rprintf(FINFO, "skipping directory %s\n", thisname);
+ if (S_ISDIR(st.st_mode) && !xfer_dirs) {
+ rprintf(FINFO, "skipping directory %s\n", safe_fname(thisname));
return NULL;
}
&& S_ISDIR(st.st_mode))
flags |= FLAG_MOUNT_POINT;
- if (check_exclude_file(thisname, S_ISDIR(st.st_mode) != 0, exclude_level))
+ if (is_excluded(thisname, S_ISDIR(st.st_mode) != 0, filter_level))
return NULL;
- if (lp_ignore_nonreadable(module_id) && access(thisname, R_OK) != 0)
- return NULL;
+ if (lp_ignore_nonreadable(module_id)) {
+#if SUPPORT_LINKS
+ if (!S_ISLNK(st.st_mode))
+#endif
+ if (access(thisname, R_OK) != 0)
+ return NULL;
+ }
-skip_excludes:
+skip_filters:
if (verbose > 2) {
rprintf(FINFO, "[%s] make_file(%s,*,%d)\n",
- who_am_i(), thisname, exclude_level);
+ who_am_i(), safe_fname(thisname), filter_level);
}
if ((basename = strrchr(thisname, '/')) != NULL) {
memcpy(bp, basename, basename_len);
bp += basename_len;
-#ifdef HAVE_STRUCT_STAT_ST_RDEV
+#if HAVE_STRUCT_STAT_ST_RDEV
if (preserve_devices && IS_DEVICE(st.st_mode))
file->u.rdev = st.st_rdev;
#endif
/*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 (keep_dirlinks && linkname_len && flist) {
+ STRUCT_STAT st2;
+ int i = flist_find(received_flist, file);
+ if (i >= 0 && S_ISDIR(received_flist->files[i]->mode)
+ && do_stat(thisname, &st2) == 0 && S_ISDIR(st2.st_mode)) {
+ file->modtime = st2.st_mtime;
+ file->length = st2.st_size;
+ file->mode = st2.st_mode;
+ file->uid = st2.st_uid;
+ file->gid = st2.st_gid;
+ file->u.link = NULL;
+ if (file->link_u.idev) {
+ pool_free(flist->hlink_pool, 0, file->link_u.idev);
+ file->link_u.idev = NULL;
+ }
+ }
+ }
if (!S_ISDIR(st.st_mode))
stats.total_size += st.st_size;
{
struct file_struct *file;
char fbuf[MAXPATHLEN];
- extern int delete_excluded;
/* f is set to -1 when calculating deletion file list */
file = make_file(fname, flist,
- f == -1 && delete_excluded? SERVER_EXCLUDES : ALL_EXCLUDES);
+ f == -1 && delete_excluded? SERVER_FILTERS : ALL_FILTERS);
if (!file)
return;
flist_expand(flist);
- if (write_batch)
- file->flags |= FLAG_TOP_DIR;
-
if (file->basename[0]) {
flist->files[flist->count++] = file;
send_file_entry(file, f, base_flags);
}
if (recursive && S_ISDIR(file->mode)
- && !(file->flags & FLAG_MOUNT_POINT)) {
- struct exclude_list_struct last_list = local_exclude_list;
- local_exclude_list.head = local_exclude_list.tail = NULL;
- send_directory(f, flist, f_name_to(file, fbuf));
- if (verbose > 2) {
- rprintf(FINFO, "[%s] popping %sexclude list\n",
- who_am_i(), local_exclude_list.debug_type);
+ && !(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;
}
- free_exclude_list(&local_exclude_list);
- local_exclude_list = last_list;
+ save_filters = push_local_filters(fbuf, len);
+ send_directory(f, flist, fbuf, len);
+ pop_local_filters(save_filters);
}
}
-static void send_directory(int f, struct file_list *flist, char *dir)
+/* Note that the "recurse" value either contains -1, for infinite recursion,
+ * or a number >= 0 indicating how many levels of recursion we will allow.
+ * This function is normally called by the sender, but the receiving side
+ * also calls it from delete_in_dir() with f set to -1 so that we just
+ * construct the file list in memory without sending it over the wire. */
+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;
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++;
- }
-
- if (cvs_exclude) {
- if (strlcpy(p, ".cvsignore", MAXPATHLEN - offset)
- < MAXPATHLEN - offset) {
- add_exclude_file(&local_exclude_list, fname,
- XFLG_WORD_SPLIT | XFLG_WORDS_ONLY);
- } else {
- io_error |= IOERR_GENERAL;
- rprintf(FINFO,
- "cannot cvs-exclude in long-named directory %s\n",
- full_fname(fname));
- }
- }
+ *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)
- send_file_name(f, flist, fname, recurse, 0);
- else {
+ if (strlcpy(p, dname, MAXPATHLEN - len) < MAXPATHLEN - len) {
+ int do_subdirs = recurse >= 1 ? recurse-- : recurse;
+ 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)", full_fname(fbuf));
}
closedir(d);
}
-/**
- * The delete_files() function in receiver.c 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).
- **/
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;
+ struct timeval start_tv, end_tv;
int64 start_write;
int use_ff_fd = 0;
- if (show_filelist_p() && f != -1)
+ if (show_filelist_p())
start_filelist_progress("building file list");
start_write = stats.total_written;
+ gettimeofday(&start_tv, NULL);
- flist = flist_new(f == -1 ? WITHOUT_HLINK : WITH_HLINK,
- "send_file_list");
+ flist = flist_new(WITH_HLINK, "send_file_list");
- if (f != -1) {
- io_start_buffering_out(f);
- if (filesfrom_fd >= 0) {
- if (argv[0] && !push_dir(argv[0])) {
- rsyserr(FERROR, errno, "push_dir %s failed",
- full_fname(argv[0]));
- exit_cleanup(RERR_FILESELECT);
- }
- use_ff_fd = 1;
+ io_start_buffering_out();
+ if (filesfrom_fd >= 0) {
+ if (argv[0] && !push_dir(argv[0])) {
+ rsyserr(FERROR, errno, "push_dir %s failed",
+ full_fname(argv[0]));
+ exit_cleanup(RERR_FILESELECT);
}
+ use_ff_fd = 1;
}
while (1) {
char fname2[MAXPATHLEN];
char *fname = fname2;
+ int do_subdirs;
if (use_ff_fd) {
if (read_filesfrom_line(filesfrom_fd, fname) == 0)
break;
- sanitize_path(fname, NULL);
+ sanitize_path(fname, fname, "", 0);
} else {
if (argc-- == 0)
break;
strlcpy(fname, *argv++, MAXPATHLEN);
if (sanitize_paths)
- sanitize_path(fname, NULL);
+ sanitize_path(fname, fname, "", 0);
}
l = strlen(fname);
- if (fname[l - 1] == '/') {
+ if (!l || fname[l - 1] == '/') {
if (l == 2 && fname[0] == '.') {
/* Turn "./" into just "." rather than "./." */
fname[1] = '\0';
fname[l] = '\0';
}
}
+ 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 (link_stat(fname, &st) != 0) {
- if (f != -1) {
- io_error |= IOERR_GENERAL;
- rsyserr(FERROR, errno, "link_stat %s failed",
- full_fname(fname));
- }
+ if (link_stat(fname, &st, keep_dirlinks) != 0) {
+ io_error |= IOERR_GENERAL;
+ rsyserr(FERROR, errno, "link_stat %s failed",
+ full_fname(fname));
continue;
}
- if (S_ISDIR(st.st_mode) && !recurse && !files_from) {
- rprintf(FINFO, "skipping directory %s\n", fname);
+ if (S_ISDIR(st.st_mode) && !xfer_dirs) {
+ rprintf(FINFO, "skipping directory %s\n",
+ safe_fname(fname));
continue;
}
dir = fname;
fname = p + 1;
}
- } else if (f != -1 && implied_dirs && (p=strrchr(fname,'/')) && p != fname) {
+ } else if (implied_dirs && (p=strrchr(fname,'/')) && p != fname) {
/* this ensures we send the intermediate directories,
thus getting their permissions right */
char *lp = lastpath, *fn = fname, *slash = fname;
}
*p = '/';
if (fn != p || (*lp && *lp != '/')) {
- int copy_links_saved = copy_links;
- int recurse_saved = recurse;
+ int save_copy_links = copy_links;
+ int save_xfer_dirs = xfer_dirs;
copy_links = copy_unsafe_links;
- /* set recurse to 1 to prevent make_file
- * from ignoring directory, but still
- * turn off the recursive parameter to
- * send_file_name */
- recurse = 1;
+ xfer_dirs = 1;
while ((slash = strchr(slash+1, '/')) != 0) {
*slash = 0;
send_file_name(f, flist, fname, 0, 0);
*slash = '/';
}
- copy_links = copy_links_saved;
- recurse = recurse_saved;
+ copy_links = save_copy_links;
+ xfer_dirs = save_xfer_dirs;
*p = 0;
strlcpy(lastpath, fname, sizeof lastpath);
*p = '/';
}
if (one_file_system)
- set_filesystem(fname);
+ filesystem_dev = st.st_dev;
- send_file_name(f, flist, fname, recurse, XMIT_TOP_DIR);
+ do_subdirs = recurse >= 1 ? recurse-- : recurse;
+ send_file_name(f, flist, fname, do_subdirs, XMIT_TOP_DIR);
if (olddir[0]) {
flist_dir = NULL;
}
}
- if (f != -1) {
- send_file_entry(NULL, f, 0);
+ gettimeofday(&end_tv, NULL);
+ stats.flist_buildtime = (int64)(end_tv.tv_sec - start_tv.tv_sec) * 1000
+ + (end_tv.tv_usec - start_tv.tv_usec) / 1000;
+ if (stats.flist_buildtime == 0)
+ stats.flist_buildtime = 1;
+ start_tv = end_tv;
- if (show_filelist_p())
- finish_filelist_progress(flist);
- }
+ send_file_entry(NULL, f, 0);
+
+ if (show_filelist_p())
+ finish_filelist_progress(flist);
+
+ gettimeofday(&end_tv, NULL);
+ stats.flist_xfertime = (int64)(end_tv.tv_sec - start_tv.tv_sec) * 1000
+ + (end_tv.tv_usec - start_tv.tv_usec) / 1000;
if (flist->hlink_pool) {
pool_destroy(flist->hlink_pool);
clean_flist(flist, 0, 0);
- if (f != -1) {
- /* Now send the uid/gid list. This was introduced in
- * protocol version 15 */
- send_uid_list(f);
+ /* Now send the uid/gid list. This was introduced in
+ * protocol version 15 */
+ send_uid_list(f);
- /* send the io_error flag */
- write_int(f, lp_ignore_errors(module_id) ? 0 : io_error);
+ /* send the io_error flag */
+ write_int(f, lp_ignore_errors(module_id) ? 0 : io_error);
- io_end_buffering();
- stats.flist_size = stats.total_written - start_write;
- stats.num_files = flist->count;
- if (write_batch)
- write_batch_flist_info(flist->count, flist->files);
- }
+ io_end_buffering();
+ stats.flist_size = stats.total_written - start_write;
+ stats.num_files = flist->count;
if (verbose > 3)
- output_flist(flist);
+ output_flist(flist, who_am_i());
if (verbose > 2)
rprintf(FINFO, "send_file_list done\n");
struct file_list *flist;
unsigned short flags;
int64 start_read;
- extern int list_only;
if (show_filelist_p())
start_filelist_progress("receiving file list");
start_read = stats.total_read;
flist = flist_new(WITH_HLINK, "recv_file_list");
+ received_flist = flist;
flist->count = 0;
flist->malloced = 1000;
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;
if (verbose > 2) {
rprintf(FINFO, "recv_file_name(%s)\n",
- f_name(flist->files[i]));
+ safe_fname(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);
* protocol version 15 */
recv_uid_list(f, flist);
- if (!read_batch) {
- /* Recv the io_error flag */
- if (lp_ignore_errors(module_id) || ignore_errors)
- read_int(f);
- else
- io_error |= read_int(f);
- }
+ /* Recv the io_error flag */
+ if (lp_ignore_errors(module_id) || ignore_errors)
+ read_int(f);
+ else
+ io_error |= read_int(f);
}
if (verbose > 3)
- output_flist(flist);
+ output_flist(flist, who_am_i());
if (list_only) {
int i;
}
-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)
{
- 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;
}
return;
qsort(flist->files, flist->count,
- sizeof flist->files[0], (int (*)()) file_compare);
+ sizeof flist->files[0], (int (*)())file_compare);
for (i = no_dups? 0 : flist->count; i < flist->count; i++) {
if (flist->files[i]->basename) {
break;
}
}
+ flist->low = prev_i;
while (++i < flist->count) {
if (!flist->files[i]->basename)
continue;
if (verbose > 1 && !am_server) {
rprintf(FINFO,
"removing duplicate name %s from file list %d\n",
- f_name(flist->files[i]), i);
+ safe_fname(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). */
+ * lose track of a user-specified top directory. */
if (flist->files[i]->flags & FLAG_TOP_DIR)
flist->files[prev_i]->flags |= FLAG_TOP_DIR;
} 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)
+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;
for (i = 0; i < flist->count; i++) {
file = flist->files[i];
- if (am_root && preserve_uid)
+ if ((am_root || am_sender) && preserve_uid)
sprintf(uidbuf, " uid=%ld", (long)file->uid);
else
*uidbuf = '\0';
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",
- who_am_i(), 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 ? safe_fname(file->dirname) : "",
+ file->dirname ? "/" : "", NS(file->basename),
+ S_ISDIR(file->mode) ? "/" : "", (int)file->mode,
+ (double)file->length, uidbuf, gidbuf, file->flags);
}
}
-enum fnc_state { fnc_DIR, fnc_SLASH, fnc_BASE };
+enum fnc_state { fnc_DIR, fnc_SLASH, fnc_BASE, fnc_TRAILING };
-/* Compare the names of two file_struct entities, just like strcmp()
- * would do if it were operating on the joined strings. We assume
- * that there are no 0-length strings.
- */
+/* Compare the names of two file_struct entities, similar to how strcmp()
+ * would do if it were operating on the joined strings. The only difference
+ * is that, beginning with protocol_version 29, a directory name will always
+ * sort immediately prior to its contents (previously "foo." would sort in
+ * between directory "foo" and "foo/bar"). We do this by assuming that a dir
+ * has a trailing slash for comparison purposes, but only if we aren't about
+ * to match a file of the same name (because we need all identically named
+ * items to match each other). The dirname component can be an empty string,
+ * but the basename component cannot (and never is in the current codebase).
+ * The basename component may be NULL, in which case it is sorted to the end
+ * of the list (as a removed item). */
int f_name_cmp(struct file_struct *f1, struct file_struct *f2)
{
int dif;
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) {
c1 = (uchar*)f1->basename;
break;
case fnc_BASE:
+ state1 = fnc_TRAILING;
+ if (protocol_version >= 29 && S_ISDIR(f1->mode))
+ c1 = (uchar*)"/";
+ break;
+ case fnc_TRAILING:
break;
}
}
c2 = (uchar*)f2->basename;
break;
case fnc_BASE:
- if (!*c1)
+ if (state1 == fnc_TRAILING)
return 0;
+ state2 = fnc_TRAILING;
+ if (protocol_version >= 29 && S_ISDIR(f2->mode))
+ c2 = (uchar*)"/";
+ break;
+ case fnc_TRAILING:
break;
}
}
}
-/* 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 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 int min_depth = MAXPATHLEN, cur_depth = -1;
+ static void *filt_array[MAXPATHLEN/2+1];
+ struct file_list *dir_list;
+ STRUCT_STAT st;
+ int dlen;
+
+ if (!flist) {
+ 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");
+ max_delete = -1; /* avoid duplicating the above warning */
+ return;
+ }
+
+ 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 && file->flags & FLAG_TOP_DIR)
+ filesystem_dev = st.st_dev;
+
+ dir_list = flist_new(WITHOUT_HLINK, "delete_in_dir");
+
+ 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 > 2)
+ rprintf(FINFO, "delete_missing(%s)\n", safe_fname(dirname));
+
+ for (i = dir_list->count; i--; ) {
+ if (!dir_list->files[i]->basename)
+ continue;
+ mode = dir_list->files[i]->mode;
+ if ((j = flist_find(full_list, dir_list->files[i])) < 0
+ || (S_ISDIR(mode) && !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);
+ if (verbose) {
+ rprintf(FINFO, "deleting %s\n",
+ safe_fname(f));
+ }
+ } else if (S_ISDIR(mode))
+ delete_file(f, DEL_DIR | DEL_FORCE_RECURSE);
+ else
+ delete_file(f, 0);
+ deletion_count++;
+ if (max_delete && deletion_count >= max_delete)
+ break;
+ }
+ }
+}
git.samba.org / rsync.git / blobdiff