* Copyright (C) 1996 Andrew Tridgell
* Copyright (C) 1996 Paul Mackerras
* Copyright (C) 2001, 2002 Martin Pool <mbp@samba.org>
- * Copyright (C) 2002-2013 Wayne Davison
+ * Copyright (C) 2002-2019 Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
extern int am_generator;
extern int inc_recurse;
extern int always_checksum;
+extern int checksum_type;
extern int module_id;
extern int ignore_errors;
extern int numeric_ids;
+extern int quiet;
extern int recurse;
extern int use_qsort;
extern int xfer_dirs;
#define PTR_SIZE (sizeof (struct file_struct *))
int io_error;
-int checksum_len;
+int flist_csum_len;
dev_t filesystem_dev; /* used to implement -x */
struct file_list *cur_flist, *first_flist, *dir_flist;
static char empty_sum[MAX_DIGEST_LEN];
static int flist_count_offset; /* for --delete --progress */
+static int show_filelist_progress;
static void flist_sort_and_clean(struct file_list *flist, int strip_root);
static void output_flist(struct file_list *flist);
rprintf(FINFO, "FILE_STRUCT_LEN=%d, EXTRA_LEN=%d\n",
(int)FILE_STRUCT_LEN, (int)EXTRA_LEN);
}
- checksum_len = protocol_version < 21 ? 2
- : protocol_version < 30 ? MD4_DIGEST_LEN
- : MD5_DIGEST_LEN;
-}
+ parse_checksum_choice(); /* Sets checksum_type && xfersum_type */
+ flist_csum_len = csum_len_for_type(checksum_type, 1);
-static int show_filelist_p(void)
-{
- return INFO_GTE(FLIST, 1) && xfer_dirs && !am_server && !inc_recurse;
+ show_filelist_progress = INFO_GTE(FLIST, 1) && xfer_dirs && !am_server && !inc_recurse;
}
static void start_filelist_progress(char *kind)
{
+ if (quiet)
+ return;
rprintf(FCLIENT, "%s ... ", kind);
output_needs_newline = 1;
rflush(FINFO);
static void emit_filelist_progress(int count)
{
+ if (quiet)
+ return;
+ if (output_needs_newline == 2) /* avoid a newline in the middle of this filelist-progress output */
+ output_needs_newline = 0;
rprintf(FCLIENT, " %d files...\r", count);
+ output_needs_newline = 2;
}
static void maybe_emit_filelist_progress(int count)
{
- if (INFO_GTE(FLIST, 2) && show_filelist_p() && (count % 100) == 0)
+ if (INFO_GTE(FLIST, 2) && show_filelist_progress && (count % 100) == 0)
emit_filelist_progress(count);
}
static void finish_filelist_progress(const struct file_list *flist)
{
+ output_needs_newline = 0;
if (INFO_GTE(FLIST, 2)) {
/* This overwrites the progress line */
rprintf(FINFO, "%d file%sto consider\n",
flist->used, flist->used == 1 ? " " : "s ");
} else {
- output_needs_newline = 0;
rprintf(FINFO, "done\n");
}
}
#endif
}
-static inline int is_daemon_excluded(const char *fname, int is_dir)
-{
- if (daemon_filter_list.head
- && check_filter(&daemon_filter_list, FLOG, fname, is_dir) < 0) {
- errno = ENOENT;
- return 1;
- }
- return 0;
-}
-
static inline int path_is_daemon_excluded(char *path, int ignore_filename)
{
if (daemon_filter_list.head) {
return 0;
}
-/* 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
- * filter_level is set to either SERVER_FILTERS or ALL_FILTERS. */
-static int is_excluded(const char *fname, int is_dir, int filter_level)
+static inline int is_excluded(const char *fname, int is_dir, int filter_level)
{
-#if 0 /* This currently never happens, so avoid a useless compare. */
- if (filter_level == NO_FILTERS)
- return 0;
-#endif
- if (is_daemon_excluded(fname, is_dir))
- return 1;
- if (filter_level != ALL_FILTERS)
- return 0;
- if (filter_list.head
- && check_filter(&filter_list, FINFO, fname, is_dir) < 0)
- return 1;
- return 0;
+ return name_is_excluded(fname, is_dir ? NAME_IS_DIR : NAME_IS_FILE, filter_level);
}
static void send_directory(int f, struct file_list *flist,
/* Prior to 28, we sent a useless set of nulls. */
sum = empty_sum;
}
- write_buf(f, sum, checksum_len);
+ write_buf(f, sum, flist_csum_len);
}
#ifdef SUPPORT_HARD_LINKS
}
#endif
- if (*thisname)
- clean_fname(thisname, 0);
+ if (*thisname
+ && (clean_fname(thisname, CFN_REFUSE_DOT_DOT_DIRS) < 0 || (!relative_paths && *thisname == '/'))) {
+ rprintf(FERROR, "ABORTING due to unsafe pathname from sender: %s\n", thisname);
+ exit_cleanup(RERR_PROTOCOL);
+ }
if (sanitize_paths)
sanitize_path(thisname, thisname, "", 0, SP_DEFAULT);
if (file_length > 0xFFFFFFFFu && S_ISREG(mode))
extra_len += EXTRA_LEN;
#endif
-#ifdef HAVE_UTIMENSAT
+#ifdef CAN_SET_NSEC
if (modtime_nsec)
extra_len += EXTRA_LEN;
#endif
memcpy(bp, basename, basename_len);
#ifdef SUPPORT_HARD_LINKS
- if (xflags & XMIT_HLINKED)
+ if (xflags & XMIT_HLINKED
+#ifndef CAN_HARDLINK_SYMLINK
+ && !S_ISLNK(mode)
+#endif
+#ifndef CAN_HARDLINK_SPECIAL
+ && !IS_SPECIAL(mode) && !IS_DEVICE(mode)
+#endif
+ )
file->flags |= FLAG_HLINKED;
#endif
file->modtime = (time_t)modtime;
-#ifdef HAVE_UTIMENSAT
+#ifdef CAN_SET_NSEC
if (modtime_nsec) {
file->flags |= FLAG_MOD_NSEC;
OPT_EXTRA(file, 0)->unum = modtime_nsec;
}
if (first_hlink_ndx >= flist->ndx_start) {
struct file_struct *first = flist->files[first_hlink_ndx - flist->ndx_start];
- memcpy(bp, F_SUM(first), checksum_len);
+ memcpy(bp, F_SUM(first), flist_csum_len);
} else
- read_buf(f, bp, checksum_len);
+ read_buf(f, bp, flist_csum_len);
}
#ifdef SUPPORT_ACLS
if (sanitize_paths)
sanitize_path(thisname, thisname, "", 0, SP_DEFAULT);
- if (stp && (S_ISDIR(stp->st_mode) || stp->st_mode == 0)) {
+ if (stp && (S_ISDIR(stp->st_mode) || IS_MISSING_FILE(*stp))) {
/* This is needed to handle a "symlink/." with a --relative
* dir, or a request to delete a specific file. */
st = *stp;
full_fname(thisname));
}
return NULL;
- } else if (st.st_mode == 0) {
+ } else if (IS_MISSING_FILE(st)) {
io_error |= IOERR_GENERAL;
rprintf(FINFO, "skipping file with bogus (zero) st_mode: %s\n",
full_fname(thisname));
#endif
if (always_checksum && am_sender && S_ISREG(st.st_mode)) {
- file_checksum(thisname, tmp_sum, st.st_size);
+ file_checksum(thisname, &st, tmp_sum);
if (sender_keeps_checksum)
extra_len += SUM_EXTRA_CNT * EXTRA_LEN;
}
}
if (sender_keeps_checksum && S_ISREG(st.st_mode))
- memcpy(F_SUM(file), tmp_sum, checksum_len);
+ memcpy(F_SUM(file), tmp_sum, flist_csum_len);
if (unsort_ndx)
F_NDX(file) = stats.num_dirs;
int32 *parent_dp = parent_ndx < 0 ? NULL
: F_DIR_NODE_P(dir_flist->sorted[parent_ndx]);
+ /* The sending side is adding entries to dir_flist in sorted order, so sorted & files are the same. */
flist_expand(dir_flist, dir_cnt);
dir_flist->sorted = dir_flist->files;
else
dir_ndx = send_dir_ndx;
write_ndx(f, NDX_FLIST_OFFSET - dir_ndx);
- flist->parent_ndx = dir_ndx;
+ flist->parent_ndx = send_dir_ndx; /* the sending side must remember the sorted ndx value */
send1extra(f, file, flist);
prev_flags = file->flags;
int implied_dot_dir = 0;
rprintf(FLOG, "building file list\n");
- if (show_filelist_p())
+ if (show_filelist_progress)
start_filelist_progress("building file list");
else if (inc_recurse && INFO_GTE(FLIST, 1) && !am_server)
rprintf(FCLIENT, "sending incremental file list\n");
memmove(fbuf, fn, len + 1);
if (link_stat(fbuf, &st, copy_dirlinks || name_type != NORMAL_NAME) != 0
- || (name_type != DOTDIR_NAME && is_daemon_excluded(fbuf, S_ISDIR(st.st_mode)))
+ || (name_type != DOTDIR_NAME && is_excluded(fbuf, S_ISDIR(st.st_mode) != 0, SERVER_FILTERS))
|| (relative_paths && path_is_daemon_excluded(fbuf, 1))) {
if (errno != ENOENT || missing_args == 0) {
/* This is a transfer error, but inhibit deletion
} else
fn = p;
send_implied_dirs(f, flist, fbuf, fbuf, p, flags,
- st.st_mode == 0 ? MISSING_NAME : name_type);
+ IS_MISSING_FILE(st) ? MISSING_NAME : name_type);
if (fn == p)
continue;
}
idev_destroy();
#endif
- if (show_filelist_p())
+ if (show_filelist_progress)
finish_filelist_progress(flist);
gettimeofday(&end_tv, NULL);
return flist;
}
-struct file_list *recv_file_list(int f)
+struct file_list *recv_file_list(int f, int dir_ndx)
{
+ const char *good_dirname = NULL;
struct file_list *flist;
int dstart, flags;
int64 start_read;
if (!first_flist) {
- if (show_filelist_p())
+ if (show_filelist_progress)
start_filelist_progress("receiving file list");
else if (inc_recurse && INFO_GTE(FLIST, 1) && !am_server)
rprintf(FCLIENT, "receiving incremental file list\n");
flist_expand(flist, 1);
file = recv_file_entry(f, flist, flags);
+ if (inc_recurse) {
+ static const char empty_dir[] = "\0";
+ const char *cur_dir = file->dirname ? file->dirname : empty_dir;
+ if (relative_paths && *cur_dir == '/')
+ cur_dir++;
+ if (cur_dir != good_dirname) {
+ const char *d = dir_ndx >= 0 ? f_name(dir_flist->files[dir_ndx], NULL) : empty_dir;
+ if (strcmp(cur_dir, d) != 0) {
+ rprintf(FERROR,
+ "ABORTING due to invalid path from sender: %s/%s\n",
+ cur_dir, file->basename);
+ exit_cleanup(RERR_PROTOCOL);
+ }
+ good_dirname = cur_dir;
+ }
+ }
+
if (S_ISREG(file->mode)) {
/* Already counted */
} else if (S_ISDIR(file->mode)) {
if (DEBUG_GTE(FLIST, 2))
rprintf(FINFO, "received %d names\n", flist->used);
- if (show_filelist_p())
+ if (show_filelist_progress)
finish_filelist_progress(flist);
if (need_unsorted_flist) {
rprintf(FINFO, "[%s] flist_eof=1\n", who_am_i());
}
+ /* The --relative option sends paths with a leading slash, so we need
+ * to specify the strip_root option here. We rejected leading slashes
+ * for a non-relative transfer in recv_file_entry(). */
flist_sort_and_clean(flist, relative_paths);
if (protocol_version < 30) {
rprintf(FINFO, "[%s] receiving flist for dir %d\n",
who_am_i(), ndx);
}
- flist = recv_file_list(f);
+ flist = recv_file_list(f, ndx);
flist->parent_ndx = ndx;
}
}
return -1;
}
+/* Search for a name in the file list. You must specify want_dir_match as:
+ * 1=match directories, 0=match non-directories, or -1=match either. */
+int flist_find_name(struct file_list *flist, const char *fname, int want_dir_match)
+{
+ struct { /* We have to create a temporary file_struct for the search. */
+ struct file_struct f;
+ char name_space[MAXPATHLEN];
+ } t;
+ char fbuf[MAXPATHLEN];
+ const char *slash = strrchr(fname, '/');
+ const char *basename = slash ? slash+1 : fname;
+
+ memset(&t.f, 0, FILE_STRUCT_LEN);
+ memcpy((void *)t.f.basename, basename, strlen(basename)+1);
+
+ if (slash) {
+ strlcpy(fbuf, fname, slash - fname + 1);
+ t.f.dirname = fbuf;
+ } else
+ t.f.dirname = NULL;
+
+ t.f.mode = want_dir_match > 0 ? S_IFDIR : S_IFREG;
+
+ if (want_dir_match < 0)
+ return flist_find_ignore_dirness(flist, &t.f);
+ return flist_find(flist, &t.f);
+}
+
/* Search for an identically-named item in the file list. Differs from
* flist_find in that an item that agrees with "f" in directory-ness is
* preferred but one that does not is still found. */
clear_file(fp);
}
prev_depth = F_DEPTH(file);
- if (is_excluded(f_name(file, fbuf), 1,
- ALL_FILTERS)) {
+ if (is_excluded(f_name(file, fbuf), 1, ALL_FILTERS)) {
/* Keep dirs through this dir. */
for (j = prev_depth-1; ; j--) {
fp = flist->sorted[prev_i];
git.samba.org / rsync.git / blobdiff