version 1.1.1.1, 2012/02/17 15:09:30
|
version 1.1.1.2, 2013/10/14 07:51:14
|
Line 4
|
Line 4
|
* Copyright (C) 1996 Andrew Tridgell |
* Copyright (C) 1996 Andrew Tridgell |
* Copyright (C) 1996 Paul Mackerras |
* Copyright (C) 1996 Paul Mackerras |
* Copyright (C) 2001, 2002 Martin Pool <mbp@samba.org> |
* Copyright (C) 2001, 2002 Martin Pool <mbp@samba.org> |
* Copyright (C) 2002-2009 Wayne Davison | * Copyright (C) 2002-2013 Wayne Davison |
* |
* |
* This program is free software; you can redistribute it and/or modify |
* 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 |
* it under the terms of the GNU General Public License as published by |
Line 23
|
Line 23
|
#include "rsync.h" |
#include "rsync.h" |
#include "ifuncs.h" |
#include "ifuncs.h" |
#include "rounding.h" |
#include "rounding.h" |
|
#include "inums.h" |
#include "io.h" |
#include "io.h" |
|
|
extern int verbose; |
|
extern int am_root; |
extern int am_root; |
extern int am_server; |
extern int am_server; |
extern int am_daemon; |
extern int am_daemon; |
extern int am_sender; |
extern int am_sender; |
extern int am_generator; |
extern int am_generator; |
extern int inc_recurse; |
extern int inc_recurse; |
extern int do_progress; |
|
extern int always_checksum; |
extern int always_checksum; |
extern int module_id; |
extern int module_id; |
extern int ignore_errors; |
extern int ignore_errors; |
Line 52 extern int preserve_hard_links;
|
Line 51 extern int preserve_hard_links;
|
extern int preserve_devices; |
extern int preserve_devices; |
extern int preserve_specials; |
extern int preserve_specials; |
extern int delete_during; |
extern int delete_during; |
|
extern int missing_args; |
extern int eol_nulls; |
extern int eol_nulls; |
extern int relative_paths; |
extern int relative_paths; |
extern int implied_dirs; |
extern int implied_dirs; |
Line 66 extern int munge_symlinks;
|
Line 66 extern int munge_symlinks;
|
extern int use_safe_inc_flist; |
extern int use_safe_inc_flist; |
extern int need_unsorted_flist; |
extern int need_unsorted_flist; |
extern int sender_symlink_iconv; |
extern int sender_symlink_iconv; |
|
extern int output_needs_newline; |
|
extern int sender_keeps_checksum; |
extern int unsort_ndx; |
extern int unsort_ndx; |
extern uid_t our_uid; |
extern uid_t our_uid; |
extern struct stats stats; |
extern struct stats stats; |
extern char *filesfrom_host; |
extern char *filesfrom_host; |
|
extern char *usermap, *groupmap; |
|
|
extern char curr_dir[MAXPATHLEN]; |
extern char curr_dir[MAXPATHLEN]; |
|
|
extern struct chmod_mode_struct *chmod_modes; |
extern struct chmod_mode_struct *chmod_modes; |
|
|
extern struct filter_list_struct filter_list; | extern filter_rule_list filter_list; |
extern struct filter_list_struct daemon_filter_list; | extern filter_rule_list daemon_filter_list; |
|
|
#ifdef ICONV_OPTION |
#ifdef ICONV_OPTION |
extern int filesfrom_convert; |
extern int filesfrom_convert; |
Line 93 struct file_list *cur_flist, *first_flist, *dir_flist;
|
Line 96 struct file_list *cur_flist, *first_flist, *dir_flist;
|
int send_dir_ndx = -1, send_dir_depth = -1; |
int send_dir_ndx = -1, send_dir_depth = -1; |
int flist_cnt = 0; /* how many (non-tmp) file list objects exist */ |
int flist_cnt = 0; /* how many (non-tmp) file list objects exist */ |
int file_total = 0; /* total of all active items over all file-lists */ |
int file_total = 0; /* total of all active items over all file-lists */ |
|
int file_old_total = 0; /* total of active items that will soon be gone */ |
int flist_eof = 0; /* all the file-lists are now known */ |
int flist_eof = 0; /* all the file-lists are now known */ |
|
|
#define NORMAL_NAME 0 |
#define NORMAL_NAME 0 |
#define SLASH_ENDING_NAME 1 |
#define SLASH_ENDING_NAME 1 |
#define DOTDIR_NAME 2 |
#define DOTDIR_NAME 2 |
|
#define MISSING_NAME 3 |
|
|
/* Starting from protocol version 26, we always use 64-bit ino_t and dev_t |
/* Starting from protocol version 26, we always use 64-bit ino_t and dev_t |
* internally, even if this platform does not allow files to have 64-bit inums. |
* internally, even if this platform does not allow files to have 64-bit inums. |
Line 122 static char tmp_sum[MAX_DIGEST_LEN];
|
Line 127 static char tmp_sum[MAX_DIGEST_LEN];
|
|
|
static char empty_sum[MAX_DIGEST_LEN]; |
static char empty_sum[MAX_DIGEST_LEN]; |
static int flist_count_offset; /* for --delete --progress */ |
static int flist_count_offset; /* for --delete --progress */ |
static int dir_count = 0; |
|
|
|
static void flist_sort_and_clean(struct file_list *flist, int strip_root); |
static void flist_sort_and_clean(struct file_list *flist, int strip_root); |
static void output_flist(struct file_list *flist); |
static void output_flist(struct file_list *flist); |
|
|
void init_flist(void) |
void init_flist(void) |
{ |
{ |
if (verbose > 4) { | if (DEBUG_GTE(FLIST, 4)) { |
rprintf(FINFO, "FILE_STRUCT_LEN=%d, EXTRA_LEN=%d\n", |
rprintf(FINFO, "FILE_STRUCT_LEN=%d, EXTRA_LEN=%d\n", |
(int)FILE_STRUCT_LEN, (int)EXTRA_LEN); |
(int)FILE_STRUCT_LEN, (int)EXTRA_LEN); |
} |
} |
Line 140 void init_flist(void)
|
Line 144 void init_flist(void)
|
|
|
static int show_filelist_p(void) |
static int show_filelist_p(void) |
{ |
{ |
return verbose && xfer_dirs && !am_server && !inc_recurse; | return INFO_GTE(FLIST, 1) && xfer_dirs && !am_server && !inc_recurse; |
} |
} |
|
|
static void start_filelist_progress(char *kind) |
static void start_filelist_progress(char *kind) |
{ |
{ |
rprintf(FCLIENT, "%s ... ", kind); |
rprintf(FCLIENT, "%s ... ", kind); |
if (verbose > 1 || do_progress) | output_needs_newline = 1; |
rprintf(FCLIENT, "\n"); | |
rflush(FINFO); |
rflush(FINFO); |
} |
} |
|
|
Line 158 static void emit_filelist_progress(int count)
|
Line 161 static void emit_filelist_progress(int count)
|
|
|
static void maybe_emit_filelist_progress(int count) |
static void maybe_emit_filelist_progress(int count) |
{ |
{ |
if (do_progress && show_filelist_p() && (count % 100) == 0) | if (INFO_GTE(FLIST, 2) && show_filelist_p() && (count % 100) == 0) |
emit_filelist_progress(count); |
emit_filelist_progress(count); |
} |
} |
|
|
static void finish_filelist_progress(const struct file_list *flist) |
static void finish_filelist_progress(const struct file_list *flist) |
{ |
{ |
if (do_progress) { | if (INFO_GTE(FLIST, 2)) { |
/* This overwrites the progress line */ |
/* This overwrites the progress line */ |
rprintf(FINFO, "%d file%sto consider\n", |
rprintf(FINFO, "%d file%sto consider\n", |
flist->used, flist->used == 1 ? " " : "s "); |
flist->used, flist->used == 1 ? " " : "s "); |
} else | } else { |
| output_needs_newline = 0; |
rprintf(FINFO, "done\n"); |
rprintf(FINFO, "done\n"); |
|
} |
} |
} |
|
|
void show_flist_stats(void) |
void show_flist_stats(void) |
Line 191 static int readlink_stat(const char *path, STRUCT_STAT
|
Line 196 static int readlink_stat(const char *path, STRUCT_STAT
|
if (link_stat(path, stp, copy_dirlinks) < 0) |
if (link_stat(path, stp, copy_dirlinks) < 0) |
return -1; |
return -1; |
if (S_ISLNK(stp->st_mode)) { |
if (S_ISLNK(stp->st_mode)) { |
int llen = readlink(path, linkbuf, MAXPATHLEN - 1); | int llen = do_readlink(path, linkbuf, MAXPATHLEN - 1); |
if (llen < 0) |
if (llen < 0) |
return -1; |
return -1; |
linkbuf[llen] = '\0'; |
linkbuf[llen] = '\0'; |
if (copy_unsafe_links && unsafe_symlink(linkbuf, path)) { |
if (copy_unsafe_links && unsafe_symlink(linkbuf, path)) { |
if (verbose > 1) { | if (INFO_GTE(SYMSAFE, 1)) { |
rprintf(FINFO,"copying unsafe symlink \"%s\" -> \"%s\"\n", |
rprintf(FINFO,"copying unsafe symlink \"%s\" -> \"%s\"\n", |
path, linkbuf); |
path, linkbuf); |
} |
} |
Line 316 static void flist_expand(struct file_list *flist, int
|
Line 321 static void flist_expand(struct file_list *flist, int
|
new_ptr = realloc_array(flist->files, struct file_struct *, |
new_ptr = realloc_array(flist->files, struct file_struct *, |
flist->malloced); |
flist->malloced); |
|
|
if (verbose >= 2 && flist->malloced != FLIST_START) { | if (DEBUG_GTE(FLIST, 1) && flist->malloced != FLIST_START) { |
rprintf(FCLIENT, "[%s] expand file_list pointer array to %.0f bytes, did%s move\n", | rprintf(FCLIENT, "[%s] expand file_list pointer array to %s bytes, did%s move\n", |
who_am_i(), |
who_am_i(), |
(double)sizeof flist->files[0] * flist->malloced, | big_num(sizeof flist->files[0] * flist->malloced), |
(new_ptr == flist->files) ? " not" : ""); |
(new_ptr == flist->files) ? " not" : ""); |
} |
} |
|
|
Line 403 static void send_file_entry(int f, const char *fname,
|
Line 408 static void send_file_entry(int f, const char *fname,
|
static gid_t gid; |
static gid_t gid; |
static const char *user_name, *group_name; |
static const char *user_name, *group_name; |
static char lastname[MAXPATHLEN]; |
static char lastname[MAXPATHLEN]; |
|
#ifdef SUPPORT_HARD_LINKS |
int first_hlink_ndx = -1; |
int first_hlink_ndx = -1; |
|
#endif |
int l1, l2; |
int l1, l2; |
int xflags; |
int xflags; |
|
|
/* Initialize starting value of xflags. */ | /* Initialize starting value of xflags and adjust counts. */ |
if (protocol_version >= 30 && S_ISDIR(file->mode)) { | if (S_ISREG(file->mode)) |
dir_count++; | xflags = 0; |
if (file->flags & FLAG_CONTENT_DIR) | else if (S_ISDIR(file->mode)) { |
xflags = file->flags & FLAG_TOP_DIR; | stats.num_dirs++; |
else if (file->flags & FLAG_IMPLIED_DIR) | if (protocol_version >= 30) { |
xflags = XMIT_TOP_DIR | XMIT_NO_CONTENT_DIR; | if (file->flags & FLAG_CONTENT_DIR) |
else | xflags = file->flags & FLAG_TOP_DIR; |
xflags = XMIT_NO_CONTENT_DIR; | else if (file->flags & FLAG_IMPLIED_DIR) |
} else | xflags = XMIT_TOP_DIR | XMIT_NO_CONTENT_DIR; |
xflags = file->flags & FLAG_TOP_DIR; /* FLAG_TOP_DIR == XMIT_TOP_DIR */ | else |
| xflags = XMIT_NO_CONTENT_DIR; |
| } else |
| xflags = file->flags & FLAG_TOP_DIR; /* FLAG_TOP_DIR == XMIT_TOP_DIR */ |
| } else { |
| if (S_ISLNK(file->mode)) |
| stats.num_symlinks++; |
| else if (IS_DEVICE(file->mode)) |
| stats.num_devices++; |
| else if (IS_SPECIAL(file->mode)) |
| stats.num_specials++; |
| xflags = 0; |
| } |
|
|
if (file->mode == mode) |
if (file->mode == mode) |
xflags |= XMIT_SAME_MODE; |
xflags |= XMIT_SAME_MODE; |
Line 439 static void send_file_entry(int f, const char *fname,
|
Line 458 static void send_file_entry(int f, const char *fname,
|
if (protocol_version < 30 && (uint32)minor(rdev) <= 0xFFu) |
if (protocol_version < 30 && (uint32)minor(rdev) <= 0xFFu) |
xflags |= XMIT_RDEV_MINOR_8_pre30; |
xflags |= XMIT_RDEV_MINOR_8_pre30; |
} |
} |
} else if (preserve_specials && IS_SPECIAL(mode)) { | } else if (preserve_specials && IS_SPECIAL(mode) && protocol_version < 31) { |
/* Special files don't need an rdev number, so just make |
/* Special files don't need an rdev number, so just make |
* the historical transmission of the value efficient. */ |
* the historical transmission of the value efficient. */ |
if (protocol_version < 28) |
if (protocol_version < 28) |
Line 476 static void send_file_entry(int f, const char *fname,
|
Line 495 static void send_file_entry(int f, const char *fname,
|
xflags |= XMIT_SAME_TIME; |
xflags |= XMIT_SAME_TIME; |
else |
else |
modtime = file->modtime; |
modtime = file->modtime; |
|
if (NSEC_BUMP(file) && protocol_version >= 31) |
|
xflags |= XMIT_MOD_NSEC; |
|
|
#ifdef SUPPORT_HARD_LINKS |
#ifdef SUPPORT_HARD_LINKS |
if (tmp_dev != -1) { |
if (tmp_dev != -1) { |
Line 486 static void send_file_entry(int f, const char *fname,
|
Line 507 static void send_file_entry(int f, const char *fname,
|
np->data = (void*)(long)(first_ndx + ndx + 1); |
np->data = (void*)(long)(first_ndx + ndx + 1); |
xflags |= XMIT_HLINK_FIRST; |
xflags |= XMIT_HLINK_FIRST; |
} |
} |
|
if (DEBUG_GTE(HLINK, 1)) { |
|
if (first_hlink_ndx >= 0) { |
|
rprintf(FINFO, "[%s] #%d hard-links #%d (%sabbrev)\n", |
|
who_am_i(), first_ndx + ndx, first_hlink_ndx, |
|
first_hlink_ndx >= first_ndx ? "" : "un"); |
|
} else if (DEBUG_GTE(HLINK, 3)) { |
|
rprintf(FINFO, "[%s] dev:inode for #%d is %s:%s\n", |
|
who_am_i(), first_ndx + ndx, |
|
big_num(tmp_dev), big_num(tmp_ino)); |
|
} |
|
} |
} else { |
} else { |
if (tmp_dev == dev) { |
if (tmp_dev == dev) { |
if (protocol_version >= 28) |
if (protocol_version >= 28) |
Line 532 static void send_file_entry(int f, const char *fname,
|
Line 564 static void send_file_entry(int f, const char *fname,
|
write_byte(f, l2); |
write_byte(f, l2); |
write_buf(f, fname + l1, l2); |
write_buf(f, fname + l1, l2); |
|
|
|
#ifdef SUPPORT_HARD_LINKS |
if (first_hlink_ndx >= 0) { |
if (first_hlink_ndx >= 0) { |
write_varint(f, first_hlink_ndx); |
write_varint(f, first_hlink_ndx); |
if (first_hlink_ndx >= first_ndx) |
if (first_hlink_ndx >= first_ndx) |
goto the_end; |
goto the_end; |
} |
} |
|
#endif |
|
|
write_varlong30(f, F_LENGTH(file), 3); |
write_varlong30(f, F_LENGTH(file), 3); |
if (!(xflags & XMIT_SAME_TIME)) { |
if (!(xflags & XMIT_SAME_TIME)) { |
Line 545 static void send_file_entry(int f, const char *fname,
|
Line 579 static void send_file_entry(int f, const char *fname,
|
else |
else |
write_int(f, modtime); |
write_int(f, modtime); |
} |
} |
|
if (xflags & XMIT_MOD_NSEC) |
|
write_varint(f, F_MOD_NSEC(file)); |
if (!(xflags & XMIT_SAME_MODE)) |
if (!(xflags & XMIT_SAME_MODE)) |
write_int(f, to_wire_mode(mode)); |
write_int(f, to_wire_mode(mode)); |
if (preserve_uid && !(xflags & XMIT_SAME_UID)) { |
if (preserve_uid && !(xflags & XMIT_SAME_UID)) { |
Line 572 static void send_file_entry(int f, const char *fname,
|
Line 608 static void send_file_entry(int f, const char *fname,
|
} |
} |
} |
} |
if ((preserve_devices && IS_DEVICE(mode)) |
if ((preserve_devices && IS_DEVICE(mode)) |
|| (preserve_specials && IS_SPECIAL(mode))) { | || (preserve_specials && IS_SPECIAL(mode) && protocol_version < 31)) { |
if (protocol_version < 28) { |
if (protocol_version < 28) { |
if (!(xflags & XMIT_SAME_RDEV_pre28)) |
if (!(xflags & XMIT_SAME_RDEV_pre28)) |
write_int(f, (int)rdev); |
write_int(f, (int)rdev); |
Line 623 static void send_file_entry(int f, const char *fname,
|
Line 659 static void send_file_entry(int f, const char *fname,
|
write_buf(f, sum, checksum_len); |
write_buf(f, sum, checksum_len); |
} |
} |
|
|
|
#ifdef SUPPORT_HARD_LINKS |
the_end: |
the_end: |
|
#endif |
strlcpy(lastname, fname, MAXPATHLEN); |
strlcpy(lastname, fname, MAXPATHLEN); |
|
|
if (S_ISREG(mode) || S_ISLNK(mode)) |
if (S_ISREG(mode) || S_ISLNK(mode)) |
Line 652 static struct file_struct *recv_file_entry(int f, stru
|
Line 690 static struct file_struct *recv_file_entry(int f, stru
|
int extra_len = file_extra_cnt * EXTRA_LEN; |
int extra_len = file_extra_cnt * EXTRA_LEN; |
int first_hlink_ndx = -1; |
int first_hlink_ndx = -1; |
int64 file_length; |
int64 file_length; |
|
uint32 modtime_nsec; |
const char *basename; |
const char *basename; |
struct file_struct *file; |
struct file_struct *file; |
alloc_pool_t *pool; |
alloc_pool_t *pool; |
Line 684 static struct file_struct *recv_file_entry(int f, stru
|
Line 723 static struct file_struct *recv_file_entry(int f, stru
|
xbuf outbuf, inbuf; |
xbuf outbuf, inbuf; |
|
|
INIT_CONST_XBUF(outbuf, thisname); |
INIT_CONST_XBUF(outbuf, thisname); |
INIT_XBUF(inbuf, lastname, basename_len, -1); | INIT_XBUF(inbuf, lastname, basename_len, (size_t)-1); |
|
|
if (iconvbufs(ic_recv, &inbuf, &outbuf, 0) < 0) { | if (iconvbufs(ic_recv, &inbuf, &outbuf, ICB_INIT) < 0) { |
io_error |= IOERR_GENERAL; |
io_error |= IOERR_GENERAL; |
rprintf(FERROR_UTF8, |
rprintf(FERROR_UTF8, |
"[%s] cannot convert filename: %s (%s)\n", |
"[%s] cannot convert filename: %s (%s)\n", |
Line 726 static struct file_struct *recv_file_entry(int f, stru
|
Line 765 static struct file_struct *recv_file_entry(int f, stru
|
first_hlink_ndx, flist->ndx_start + flist->used); |
first_hlink_ndx, flist->ndx_start + flist->used); |
exit_cleanup(RERR_PROTOCOL); |
exit_cleanup(RERR_PROTOCOL); |
} |
} |
|
if (DEBUG_GTE(HLINK, 1)) { |
|
rprintf(FINFO, "[%s] #%d hard-links #%d (%sabbrev)\n", |
|
who_am_i(), flist->used+flist->ndx_start, first_hlink_ndx, |
|
first_hlink_ndx >= flist->ndx_start ? "" : "un"); |
|
} |
if (first_hlink_ndx >= flist->ndx_start) { |
if (first_hlink_ndx >= flist->ndx_start) { |
struct file_struct *first = flist->files[first_hlink_ndx - flist->ndx_start]; |
struct file_struct *first = flist->files[first_hlink_ndx - flist->ndx_start]; |
file_length = F_LENGTH(first); |
file_length = F_LENGTH(first); |
modtime = first->modtime; |
modtime = first->modtime; |
|
modtime_nsec = F_MOD_NSEC(first); |
mode = first->mode; |
mode = first->mode; |
if (preserve_uid) |
if (preserve_uid) |
uid = F_OWNER(first); |
uid = F_OWNER(first); |
Line 763 static struct file_struct *recv_file_entry(int f, stru
|
Line 808 static struct file_struct *recv_file_entry(int f, stru
|
} else |
} else |
modtime = read_int(f); |
modtime = read_int(f); |
} |
} |
|
if (xflags & XMIT_MOD_NSEC) |
|
modtime_nsec = read_varint(f); |
|
else |
|
modtime_nsec = 0; |
if (!(xflags & XMIT_SAME_MODE)) |
if (!(xflags & XMIT_SAME_MODE)) |
mode = from_wire_mode(read_int(f)); |
mode = from_wire_mode(read_int(f)); |
|
|
if (chmod_modes && !S_ISLNK(mode)) | if (chmod_modes && !S_ISLNK(mode) && mode) |
mode = tweak_mode(mode, chmod_modes); |
mode = tweak_mode(mode, chmod_modes); |
|
|
if (preserve_uid && !(xflags & XMIT_SAME_UID)) { |
if (preserve_uid && !(xflags & XMIT_SAME_UID)) { |
Line 776 static struct file_struct *recv_file_entry(int f, stru
|
Line 825 static struct file_struct *recv_file_entry(int f, stru
|
uid = (uid_t)read_varint(f); |
uid = (uid_t)read_varint(f); |
if (xflags & XMIT_USER_NAME_FOLLOWS) |
if (xflags & XMIT_USER_NAME_FOLLOWS) |
uid = recv_user_name(f, uid); |
uid = recv_user_name(f, uid); |
else if (inc_recurse && am_root && !numeric_ids) | else if (inc_recurse && am_root && (!numeric_ids || usermap)) |
uid = match_uid(uid); |
uid = match_uid(uid); |
} |
} |
} |
} |
Line 788 static struct file_struct *recv_file_entry(int f, stru
|
Line 837 static struct file_struct *recv_file_entry(int f, stru
|
gid_flags = 0; |
gid_flags = 0; |
if (xflags & XMIT_GROUP_NAME_FOLLOWS) |
if (xflags & XMIT_GROUP_NAME_FOLLOWS) |
gid = recv_group_name(f, gid, &gid_flags); |
gid = recv_group_name(f, gid, &gid_flags); |
else if (inc_recurse && (!am_root || !numeric_ids)) | else if (inc_recurse && (!am_root || !numeric_ids || groupmap)) |
gid = match_gid(gid, &gid_flags); |
gid = match_gid(gid, &gid_flags); |
} |
} |
} |
} |
|
|
if ((preserve_devices && IS_DEVICE(mode)) |
if ((preserve_devices && IS_DEVICE(mode)) |
|| (preserve_specials && IS_SPECIAL(mode))) { | || (preserve_specials && IS_SPECIAL(mode) && protocol_version < 31)) { |
if (protocol_version < 28) { |
if (protocol_version < 28) { |
if (!(xflags & XMIT_SAME_RDEV_pre28)) |
if (!(xflags & XMIT_SAME_RDEV_pre28)) |
rdev = (dev_t)read_int(f); |
rdev = (dev_t)read_int(f); |
Line 861 static struct file_struct *recv_file_entry(int f, stru
|
Line 910 static struct file_struct *recv_file_entry(int f, stru
|
if (file_length > 0xFFFFFFFFu && S_ISREG(mode)) |
if (file_length > 0xFFFFFFFFu && S_ISREG(mode)) |
extra_len += EXTRA_LEN; |
extra_len += EXTRA_LEN; |
#endif |
#endif |
|
#ifdef HAVE_UTIMENSAT |
|
if (modtime_nsec) |
|
extra_len += EXTRA_LEN; |
|
#endif |
if (file_length < 0) { |
if (file_length < 0) { |
rprintf(FERROR, "Offset underflow: file-length is negative\n"); |
rprintf(FERROR, "Offset underflow: file-length is negative\n"); |
exit_cleanup(RERR_UNSUPPORTED); |
exit_cleanup(RERR_UNSUPPORTED); |
Line 896 static struct file_struct *recv_file_entry(int f, stru
|
Line 949 static struct file_struct *recv_file_entry(int f, stru
|
file->flags |= FLAG_HLINKED; |
file->flags |= FLAG_HLINKED; |
#endif |
#endif |
file->modtime = (time_t)modtime; |
file->modtime = (time_t)modtime; |
|
#ifdef HAVE_UTIMENSAT |
|
if (modtime_nsec) { |
|
file->flags |= FLAG_MOD_NSEC; |
|
OPT_EXTRA(file, 0)->unum = modtime_nsec; |
|
} |
|
#endif |
file->len32 = (uint32)file_length; |
file->len32 = (uint32)file_length; |
#if SIZEOF_INT64 >= 8 |
#if SIZEOF_INT64 >= 8 |
if (file_length > 0xFFFFFFFFu && S_ISREG(mode)) { |
if (file_length > 0xFFFFFFFFu && S_ISREG(mode)) { |
Line 904 static struct file_struct *recv_file_entry(int f, stru
|
Line 963 static struct file_struct *recv_file_entry(int f, stru
|
exit_cleanup(RERR_UNSUPPORTED); |
exit_cleanup(RERR_UNSUPPORTED); |
#else |
#else |
file->flags |= FLAG_LENGTH64; |
file->flags |= FLAG_LENGTH64; |
OPT_EXTRA(file, 0)->unum = (uint32)(file_length >> 32); | OPT_EXTRA(file, NSEC_BUMP(file))->unum = (uint32)(file_length >> 32); |
#endif |
#endif |
} |
} |
#endif |
#endif |
Line 984 static struct file_struct *recv_file_entry(int f, stru
|
Line 1043 static struct file_struct *recv_file_entry(int f, stru
|
read_sbuf(f, inbuf.buf, inbuf.len); |
read_sbuf(f, inbuf.buf, inbuf.len); |
INIT_XBUF(outbuf, bp, 0, alloc_len); |
INIT_XBUF(outbuf, bp, 0, alloc_len); |
|
|
if (iconvbufs(ic_recv, &inbuf, &outbuf, 0) < 0) { | if (iconvbufs(ic_recv, &inbuf, &outbuf, ICB_INIT) < 0) { |
io_error |= IOERR_GENERAL; |
io_error |= IOERR_GENERAL; |
rprintf(FERROR_XFER, |
rprintf(FERROR_XFER, |
"[%s] cannot convert symlink data for: %s (%s)\n", |
"[%s] cannot convert symlink data for: %s (%s)\n", |
Line 1097 struct file_struct *make_file(const char *fname, struc
|
Line 1156 struct file_struct *make_file(const char *fname, struc
|
if (sanitize_paths) |
if (sanitize_paths) |
sanitize_path(thisname, thisname, "", 0, SP_DEFAULT); |
sanitize_path(thisname, thisname, "", 0, SP_DEFAULT); |
|
|
if (stp && S_ISDIR(stp->st_mode)) { | if (stp && (S_ISDIR(stp->st_mode) || stp->st_mode == 0)) { |
st = *stp; /* Needed for "symlink/." with --relative. */ | /* This is needed to handle a "symlink/." with a --relative |
| * dir, or a request to delete a specific file. */ |
| st = *stp; |
*linkname = '\0'; /* make IBM code checker happy */ |
*linkname = '\0'; /* make IBM code checker happy */ |
} else if (readlink_stat(thisname, &st, linkname) != 0) { |
} else if (readlink_stat(thisname, &st, linkname) != 0) { |
int save_errno = errno; |
int save_errno = errno; |
Line 1139 struct file_struct *make_file(const char *fname, struc
|
Line 1200 struct file_struct *make_file(const char *fname, struc
|
full_fname(thisname)); |
full_fname(thisname)); |
} |
} |
return NULL; |
return NULL; |
|
} else if (st.st_mode == 0) { |
|
io_error |= IOERR_GENERAL; |
|
rprintf(FINFO, "skipping file with bogus (zero) st_mode: %s\n", |
|
full_fname(thisname)); |
|
return NULL; |
} |
} |
|
|
if (filter_level == NO_FILTERS) |
if (filter_level == NO_FILTERS) |
Line 1155 struct file_struct *make_file(const char *fname, struc
|
Line 1221 struct file_struct *make_file(const char *fname, struc
|
if (one_file_system && st.st_dev != filesystem_dev |
if (one_file_system && st.st_dev != filesystem_dev |
&& BITS_SETnUNSET(flags, FLAG_CONTENT_DIR, FLAG_TOP_DIR)) { |
&& BITS_SETnUNSET(flags, FLAG_CONTENT_DIR, FLAG_TOP_DIR)) { |
if (one_file_system > 1) { |
if (one_file_system > 1) { |
if (verbose > 1) { | if (INFO_GTE(MOUNT, 1)) { |
rprintf(FINFO, |
rprintf(FINFO, |
"[%s] skipping mount-point dir %s\n", |
"[%s] skipping mount-point dir %s\n", |
who_am_i(), thisname); |
who_am_i(), thisname); |
Line 1204 struct file_struct *make_file(const char *fname, struc
|
Line 1270 struct file_struct *make_file(const char *fname, struc
|
pool = NULL; |
pool = NULL; |
} |
} |
|
|
if (verbose > 2) { | if (DEBUG_GTE(FLIST, 2)) { |
rprintf(FINFO, "[%s] make_file(%s,*,%d)\n", |
rprintf(FINFO, "[%s] make_file(%s,*,%d)\n", |
who_am_i(), thisname, filter_level); |
who_am_i(), thisname, filter_level); |
} |
} |
Line 1227 struct file_struct *make_file(const char *fname, struc
|
Line 1293 struct file_struct *make_file(const char *fname, struc
|
linkname_len = 0; |
linkname_len = 0; |
#endif |
#endif |
|
|
|
#ifdef ST_MTIME_NSEC |
|
if (st.ST_MTIME_NSEC && protocol_version >= 31) |
|
extra_len += EXTRA_LEN; |
|
#endif |
#if SIZEOF_CAPITAL_OFF_T >= 8 |
#if SIZEOF_CAPITAL_OFF_T >= 8 |
if (st.st_size > 0xFFFFFFFFu && S_ISREG(st.st_mode)) |
if (st.st_size > 0xFFFFFFFFu && S_ISREG(st.st_mode)) |
extra_len += EXTRA_LEN; |
extra_len += EXTRA_LEN; |
#endif |
#endif |
|
|
|
if (always_checksum && am_sender && S_ISREG(st.st_mode)) { |
|
file_checksum(thisname, tmp_sum, st.st_size); |
|
if (sender_keeps_checksum) |
|
extra_len += SUM_EXTRA_CNT * EXTRA_LEN; |
|
} |
|
|
#if EXTRA_ROUNDING > 0 |
#if EXTRA_ROUNDING > 0 |
if (extra_len & (EXTRA_ROUNDING * EXTRA_LEN)) |
if (extra_len & (EXTRA_ROUNDING * EXTRA_LEN)) |
extra_len = (extra_len | (EXTRA_ROUNDING * EXTRA_LEN)) + EXTRA_LEN; |
extra_len = (extra_len | (EXTRA_ROUNDING * EXTRA_LEN)) + EXTRA_LEN; |
Line 1275 struct file_struct *make_file(const char *fname, struc
|
Line 1351 struct file_struct *make_file(const char *fname, struc
|
|
|
file->flags = flags; |
file->flags = flags; |
file->modtime = st.st_mtime; |
file->modtime = st.st_mtime; |
|
#ifdef ST_MTIME_NSEC |
|
if (st.ST_MTIME_NSEC && protocol_version >= 31) { |
|
file->flags |= FLAG_MOD_NSEC; |
|
OPT_EXTRA(file, 0)->unum = st.ST_MTIME_NSEC; |
|
} |
|
#endif |
file->len32 = (uint32)st.st_size; |
file->len32 = (uint32)st.st_size; |
#if SIZEOF_CAPITAL_OFF_T >= 8 |
#if SIZEOF_CAPITAL_OFF_T >= 8 |
if (st.st_size > 0xFFFFFFFFu && S_ISREG(st.st_mode)) { |
if (st.st_size > 0xFFFFFFFFu && S_ISREG(st.st_mode)) { |
file->flags |= FLAG_LENGTH64; |
file->flags |= FLAG_LENGTH64; |
OPT_EXTRA(file, 0)->unum = (uint32)(st.st_size >> 32); | OPT_EXTRA(file, NSEC_BUMP(file))->unum = (uint32)(st.st_size >> 32); |
} |
} |
#endif |
#endif |
file->mode = st.st_mode; |
file->mode = st.st_mode; |
Line 1298 struct file_struct *make_file(const char *fname, struc
|
Line 1380 struct file_struct *make_file(const char *fname, struc
|
memcpy(bp + basename_len, linkname, linkname_len); |
memcpy(bp + basename_len, linkname, linkname_len); |
#endif |
#endif |
|
|
if (always_checksum && am_sender && S_ISREG(st.st_mode)) |
|
file_checksum(thisname, tmp_sum, st.st_size); |
|
|
|
if (am_sender) |
if (am_sender) |
F_PATHNAME(file) = pathname; |
F_PATHNAME(file) = pathname; |
else if (!pool) |
else if (!pool) |
Line 1312 struct file_struct *make_file(const char *fname, struc
|
Line 1391 struct file_struct *make_file(const char *fname, struc
|
return NULL; |
return NULL; |
} |
} |
|
|
|
if (sender_keeps_checksum && S_ISREG(st.st_mode)) |
|
memcpy(F_SUM(file), tmp_sum, checksum_len); |
|
|
if (unsort_ndx) |
if (unsort_ndx) |
F_NDX(file) = dir_count; | F_NDX(file) = stats.num_dirs; |
|
|
return file; |
return file; |
} |
} |
Line 1334 static struct file_struct *send_file_name(int f, struc
|
Line 1416 static struct file_struct *send_file_name(int f, struc
|
if (!file) |
if (!file) |
return NULL; |
return NULL; |
|
|
if (chmod_modes && !S_ISLNK(file->mode)) | if (chmod_modes && !S_ISLNK(file->mode) && file->mode) |
file->mode = tweak_mode(file->mode, chmod_modes); |
file->mode = tweak_mode(file->mode, chmod_modes); |
|
|
if (f >= 0) { |
if (f >= 0) { |
Line 1348 static struct file_struct *send_file_name(int f, struc
|
Line 1430 static struct file_struct *send_file_name(int f, struc
|
#endif |
#endif |
#if defined SUPPORT_ACLS || defined SUPPORT_XATTRS |
#if defined SUPPORT_ACLS || defined SUPPORT_XATTRS |
stat_x sx; |
stat_x sx; |
|
init_stat_x(&sx); |
#endif |
#endif |
|
|
#ifdef SUPPORT_LINKS |
#ifdef SUPPORT_LINKS |
Line 1377 static struct file_struct *send_file_name(int f, struc
|
Line 1460 static struct file_struct *send_file_name(int f, struc
|
if (file->dirname) { |
if (file->dirname) { |
INIT_XBUF_STRLEN(inbuf, (char*)file->dirname); |
INIT_XBUF_STRLEN(inbuf, (char*)file->dirname); |
outbuf.size -= 2; /* Reserve room for '/' & 1 more char. */ |
outbuf.size -= 2; /* Reserve room for '/' & 1 more char. */ |
if (iconvbufs(ic_send, &inbuf, &outbuf, 0) < 0) | if (iconvbufs(ic_send, &inbuf, &outbuf, ICB_INIT) < 0) |
goto convert_error; |
goto convert_error; |
outbuf.size += 2; |
outbuf.size += 2; |
fbuf[outbuf.len++] = '/'; |
fbuf[outbuf.len++] = '/'; |
} |
} |
|
|
INIT_XBUF_STRLEN(inbuf, (char*)file->basename); |
INIT_XBUF_STRLEN(inbuf, (char*)file->basename); |
if (iconvbufs(ic_send, &inbuf, &outbuf, 0) < 0) { | if (iconvbufs(ic_send, &inbuf, &outbuf, ICB_INIT) < 0) { |
convert_error: |
convert_error: |
io_error |= IOERR_GENERAL; |
io_error |= IOERR_GENERAL; |
rprintf(FERROR_XFER, |
rprintf(FERROR_XFER, |
Line 1398 static struct file_struct *send_file_name(int f, struc
|
Line 1481 static struct file_struct *send_file_name(int f, struc
|
if (symlink_len && sender_symlink_iconv) { |
if (symlink_len && sender_symlink_iconv) { |
INIT_XBUF(inbuf, (char*)symlink_name, symlink_len, (size_t)-1); |
INIT_XBUF(inbuf, (char*)symlink_name, symlink_len, (size_t)-1); |
INIT_CONST_XBUF(outbuf, symlink_buf); |
INIT_CONST_XBUF(outbuf, symlink_buf); |
if (iconvbufs(ic_send, &inbuf, &outbuf, 0) < 0) { | if (iconvbufs(ic_send, &inbuf, &outbuf, ICB_INIT) < 0) { |
io_error |= IOERR_GENERAL; |
io_error |= IOERR_GENERAL; |
f_name(file, fbuf); |
f_name(file, fbuf); |
rprintf(FERROR_XFER, |
rprintf(FERROR_XFER, |
Line 1419 static struct file_struct *send_file_name(int f, struc
|
Line 1502 static struct file_struct *send_file_name(int f, struc
|
#ifdef SUPPORT_ACLS |
#ifdef SUPPORT_ACLS |
if (preserve_acls && !S_ISLNK(file->mode)) { |
if (preserve_acls && !S_ISLNK(file->mode)) { |
sx.st.st_mode = file->mode; |
sx.st.st_mode = file->mode; |
sx.acc_acl = sx.def_acl = NULL; |
|
if (get_acl(fname, &sx) < 0) { |
if (get_acl(fname, &sx) < 0) { |
io_error |= IOERR_GENERAL; |
io_error |= IOERR_GENERAL; |
return NULL; |
return NULL; |
Line 1429 static struct file_struct *send_file_name(int f, struc
|
Line 1511 static struct file_struct *send_file_name(int f, struc
|
#ifdef SUPPORT_XATTRS |
#ifdef SUPPORT_XATTRS |
if (preserve_xattrs) { |
if (preserve_xattrs) { |
sx.st.st_mode = file->mode; |
sx.st.st_mode = file->mode; |
sx.xattr = NULL; |
|
if (get_xattr(fname, &sx) < 0) { |
if (get_xattr(fname, &sx) < 0) { |
io_error |= IOERR_GENERAL; |
io_error |= IOERR_GENERAL; |
return NULL; |
return NULL; |
Line 1700 static void send_implied_dirs(int f, struct file_list
|
Line 1781 static void send_implied_dirs(int f, struct file_list
|
item_list *relname_list; |
item_list *relname_list; |
relnamecache **rnpp; |
relnamecache **rnpp; |
int len, need_new_dir, depth = 0; |
int len, need_new_dir, depth = 0; |
struct filter_list_struct save_filter_list = filter_list; | filter_rule_list save_filter_list = filter_list; |
|
|
flags = (flags | FLAG_IMPLIED_DIR) & ~(FLAG_TOP_DIR | FLAG_CONTENT_DIR); |
flags = (flags | FLAG_IMPLIED_DIR) & ~(FLAG_TOP_DIR | FLAG_CONTENT_DIR); |
filter_list.head = filter_list.tail = NULL; /* Don't filter implied dirs. */ |
filter_list.head = filter_list.tail = NULL; /* Don't filter implied dirs. */ |
Line 1796 static NORETURN void fatal_unsafe_io_error(void)
|
Line 1877 static NORETURN void fatal_unsafe_io_error(void)
|
/* This (sadly) can only happen when pushing data because |
/* This (sadly) can only happen when pushing data because |
* the sender does not know about what kind of delete |
* the sender does not know about what kind of delete |
* is in effect on the receiving side when pulling. */ |
* is in effect on the receiving side when pulling. */ |
rprintf(FERROR_XFER, "FATAL I/O ERROR: dying to avoid a --delete-during issue with a pre-3.0.7 receiver.\n"); | rprintf(FERROR_XFER, "FATAL I/O ERROR: dying to avoid a --delete-%s issue with a pre-3.0.7 receiver.\n", |
| delete_during == 2 ? "delay" : "during"); |
exit_cleanup(RERR_UNSUPPORTED); |
exit_cleanup(RERR_UNSUPPORTED); |
} |
} |
|
|
Line 1853 static void send1extra(int f, struct file_struct *file
|
Line 1935 static void send1extra(int f, struct file_struct *file
|
|
|
if (name_type != NORMAL_NAME) { |
if (name_type != NORMAL_NAME) { |
STRUCT_STAT st; |
STRUCT_STAT st; |
if (link_stat(fbuf, &st, 1) != 0) { | if (name_type == MISSING_NAME) |
| memset(&st, 0, sizeof st); |
| else if (link_stat(fbuf, &st, 1) != 0) { |
interpret_stat_error(fbuf, True); |
interpret_stat_error(fbuf, True); |
continue; |
continue; |
} |
} |
Line 1870 void send_extra_file_list(int f, int at_least)
|
Line 1954 void send_extra_file_list(int f, int at_least)
|
struct file_list *flist; |
struct file_list *flist; |
int64 start_write; |
int64 start_write; |
uint16 prev_flags; |
uint16 prev_flags; |
int old_cnt, save_io_error = io_error; | int save_io_error = io_error; |
|
|
if (flist_eof) |
if (flist_eof) |
return; |
return; |
|
|
|
if (at_least < 0) |
|
at_least = file_total - file_old_total + 1; |
|
|
/* Keep sending data until we have the requested number of |
/* Keep sending data until we have the requested number of |
* files in the upcoming file-lists. */ |
* files in the upcoming file-lists. */ |
old_cnt = cur_flist->used; | while (file_total - file_old_total < at_least) { |
for (flist = first_flist; flist != cur_flist; flist = flist->next) | |
old_cnt += flist->used; | |
while (file_total - old_cnt < at_least) { | |
struct file_struct *file = dir_flist->sorted[send_dir_ndx]; |
struct file_struct *file = dir_flist->sorted[send_dir_ndx]; |
int dir_ndx, dstart = dir_count; | int dir_ndx, dstart = stats.num_dirs; |
const char *pathname = F_PATHNAME(file); |
const char *pathname = F_PATHNAME(file); |
int32 *dp; |
int32 *dp; |
|
|
Line 1936 void send_extra_file_list(int f, int at_least)
|
Line 2020 void send_extra_file_list(int f, int at_least)
|
|
|
flist_sort_and_clean(flist, 0); |
flist_sort_and_clean(flist, 0); |
|
|
add_dirs_to_tree(send_dir_ndx, flist, dir_count - dstart); | add_dirs_to_tree(send_dir_ndx, flist, stats.num_dirs - dstart); |
flist_done_allocating(flist); |
flist_done_allocating(flist); |
|
|
file_total += flist->used; |
file_total += flist->used; |
stats.flist_size += stats.total_written - start_write; |
stats.flist_size += stats.total_written - start_write; |
stats.num_files += flist->used; |
stats.num_files += flist->used; |
if (verbose > 3) | if (DEBUG_GTE(FLIST, 3)) |
output_flist(flist); |
output_flist(flist); |
|
|
if (DIR_FIRST_CHILD(dp) >= 0) { |
if (DIR_FIRST_CHILD(dp) >= 0) { |
Line 1953 void send_extra_file_list(int f, int at_least)
|
Line 2037 void send_extra_file_list(int f, int at_least)
|
if ((send_dir_ndx = DIR_PARENT(dp)) < 0) { |
if ((send_dir_ndx = DIR_PARENT(dp)) < 0) { |
write_ndx(f, NDX_FLIST_EOF); |
write_ndx(f, NDX_FLIST_EOF); |
flist_eof = 1; |
flist_eof = 1; |
|
if (DEBUG_GTE(FLIST, 3)) |
|
rprintf(FINFO, "[%s] flist_eof=1\n", who_am_i()); |
change_local_filter_dir(NULL, 0, 0); |
change_local_filter_dir(NULL, 0, 0); |
goto finish; |
goto finish; |
} |
} |
Line 1965 void send_extra_file_list(int f, int at_least)
|
Line 2051 void send_extra_file_list(int f, int at_least)
|
} |
} |
|
|
finish: |
finish: |
if (io_error != save_io_error && !ignore_errors) | if (io_error != save_io_error && protocol_version == 30 && !ignore_errors) |
send_msg_int(MSG_IO_ERROR, io_error); |
send_msg_int(MSG_IO_ERROR, io_error); |
} |
} |
|
|
Line 1980 struct file_list *send_file_list(int f, int argc, char
|
Line 2066 struct file_list *send_file_list(int f, int argc, char
|
struct timeval start_tv, end_tv; |
struct timeval start_tv, end_tv; |
int64 start_write; |
int64 start_write; |
int use_ff_fd = 0; |
int use_ff_fd = 0; |
int disable_buffering; | int disable_buffering, reenable_multiplex = -1; |
int flags = recurse ? FLAG_CONTENT_DIR : 0; |
int flags = recurse ? FLAG_CONTENT_DIR : 0; |
int reading_remotely = filesfrom_host != NULL; |
int reading_remotely = filesfrom_host != NULL; |
int rl_flags = (reading_remotely ? 0 : RL_DUMP_COMMENTS) |
int rl_flags = (reading_remotely ? 0 : RL_DUMP_COMMENTS) |
Line 1993 struct file_list *send_file_list(int f, int argc, char
|
Line 2079 struct file_list *send_file_list(int f, int argc, char
|
rprintf(FLOG, "building file list\n"); |
rprintf(FLOG, "building file list\n"); |
if (show_filelist_p()) |
if (show_filelist_p()) |
start_filelist_progress("building file list"); |
start_filelist_progress("building file list"); |
else if (inc_recurse && verbose && !am_server) | else if (inc_recurse && INFO_GTE(FLIST, 1) && !am_server) |
rprintf(FCLIENT, "sending incremental file list\n"); |
rprintf(FCLIENT, "sending incremental file list\n"); |
|
|
start_write = stats.total_written; |
start_write = stats.total_written; |
Line 2021 struct file_list *send_file_list(int f, int argc, char
|
Line 2107 struct file_list *send_file_list(int f, int argc, char
|
full_fname(argv[0])); |
full_fname(argv[0])); |
exit_cleanup(RERR_FILESELECT); |
exit_cleanup(RERR_FILESELECT); |
} |
} |
|
if (protocol_version < 31) { |
|
/* Older protocols send the files-from data w/o packaging |
|
* it in multiplexed I/O packets, so temporarily switch |
|
* to buffered I/O to match this behavior. */ |
|
reenable_multiplex = io_end_multiplex_in(MPLX_TO_BUFFERED); |
|
} |
use_ff_fd = 1; |
use_ff_fd = 1; |
} |
} |
|
|
Line 2162 struct file_list *send_file_list(int f, int argc, char
|
Line 2254 struct file_list *send_file_list(int f, int argc, char
|
if (link_stat(fbuf, &st, copy_dirlinks || name_type != NORMAL_NAME) != 0 |
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_daemon_excluded(fbuf, S_ISDIR(st.st_mode))) |
|| (relative_paths && path_is_daemon_excluded(fbuf, 1))) { |
|| (relative_paths && path_is_daemon_excluded(fbuf, 1))) { |
io_error |= IOERR_GENERAL; | if (errno != ENOENT || missing_args == 0) { |
rsyserr(FERROR_XFER, errno, "link_stat %s failed", | /* This is a transfer error, but inhibit deletion |
full_fname(fbuf)); | * only if we might be omitting an existing file. */ |
continue; | if (errno != ENOENT) |
| io_error |= IOERR_GENERAL; |
| rsyserr(FERROR_XFER, errno, "link_stat %s failed", |
| full_fname(fbuf)); |
| continue; |
| } else if (missing_args == 1) { |
| /* Just ignore the arg. */ |
| continue; |
| } else /* (missing_args == 2) */ { |
| /* Send the arg as a "missing" entry with |
| * mode 0, which tells the generator to delete it. */ |
| memset(&st, 0, sizeof st); |
| } |
} |
} |
|
|
/* A dot-dir should not be excluded! */ |
/* A dot-dir should not be excluded! */ |
if (name_type != DOTDIR_NAME | if (name_type != DOTDIR_NAME && st.st_mode != 0 |
&& is_excluded(fbuf, S_ISDIR(st.st_mode) != 0, ALL_FILTERS)) |
&& is_excluded(fbuf, S_ISDIR(st.st_mode) != 0, ALL_FILTERS)) |
continue; |
continue; |
|
|
Line 2185 struct file_list *send_file_list(int f, int argc, char
|
Line 2289 struct file_list *send_file_list(int f, int argc, char
|
p = fn; |
p = fn; |
} else |
} else |
fn = p; |
fn = p; |
send_implied_dirs(f, flist, fbuf, fbuf, p, flags, name_type); | send_implied_dirs(f, flist, fbuf, fbuf, p, flags, |
| st.st_mode == 0 ? MISSING_NAME : name_type); |
if (fn == p) |
if (fn == p) |
continue; |
continue; |
} |
} |
Line 2219 struct file_list *send_file_list(int f, int argc, char
|
Line 2324 struct file_list *send_file_list(int f, int argc, char
|
send_file_name(f, flist, fbuf, &st, flags, NO_FILTERS); |
send_file_name(f, flist, fbuf, &st, flags, NO_FILTERS); |
} |
} |
|
|
|
if (reenable_multiplex >= 0) |
|
io_start_multiplex_in(reenable_multiplex); |
|
|
gettimeofday(&end_tv, NULL); |
gettimeofday(&end_tv, NULL); |
stats.flist_buildtime = (int64)(end_tv.tv_sec - start_tv.tv_sec) * 1000 |
stats.flist_buildtime = (int64)(end_tv.tv_sec - start_tv.tv_sec) * 1000 |
+ (end_tv.tv_usec - start_tv.tv_usec) / 1000; |
+ (end_tv.tv_usec - start_tv.tv_usec) / 1000; |
Line 2267 struct file_list *send_file_list(int f, int argc, char
|
Line 2375 struct file_list *send_file_list(int f, int argc, char
|
flist->sorted = flist->files; |
flist->sorted = flist->files; |
flist_sort_and_clean(flist, 0); |
flist_sort_and_clean(flist, 0); |
file_total += flist->used; |
file_total += flist->used; |
|
file_old_total += flist->used; |
|
|
if (numeric_ids <= 0 && !inc_recurse) |
if (numeric_ids <= 0 && !inc_recurse) |
send_id_list(f); |
send_id_list(f); |
|
|
set_msg_fd_in(-1); |
|
|
|
/* send the io_error flag */ |
/* send the io_error flag */ |
if (protocol_version < 30) |
if (protocol_version < 30) |
write_int(f, ignore_errors ? 0 : io_error); |
write_int(f, ignore_errors ? 0 : io_error); |
Line 2280 struct file_list *send_file_list(int f, int argc, char
|
Line 2387 struct file_list *send_file_list(int f, int argc, char
|
send_msg_int(MSG_IO_ERROR, io_error); |
send_msg_int(MSG_IO_ERROR, io_error); |
|
|
if (disable_buffering) |
if (disable_buffering) |
io_end_buffering_out(); | io_end_buffering_out(IOBUF_FREE_BUFS); |
|
|
stats.flist_size = stats.total_written - start_write; |
stats.flist_size = stats.total_written - start_write; |
stats.num_files = flist->used; |
stats.num_files = flist->used; |
|
|
if (verbose > 3) | if (DEBUG_GTE(FLIST, 3)) |
output_flist(flist); |
output_flist(flist); |
|
|
if (verbose > 2) | if (DEBUG_GTE(FLIST, 2)) |
rprintf(FINFO, "send_file_list done\n"); |
rprintf(FINFO, "send_file_list done\n"); |
|
|
if (inc_recurse) { |
if (inc_recurse) { |
send_dir_depth = 1; |
send_dir_depth = 1; |
add_dirs_to_tree(-1, flist, dir_count); | add_dirs_to_tree(-1, flist, stats.num_dirs); |
if (!file_total || strcmp(flist->sorted[flist->low]->basename, ".") != 0) |
if (!file_total || strcmp(flist->sorted[flist->low]->basename, ".") != 0) |
flist->parent_ndx = -1; |
flist->parent_ndx = -1; |
flist_done_allocating(flist); |
flist_done_allocating(flist); |
if (send_dir_ndx < 0) { |
if (send_dir_ndx < 0) { |
write_ndx(f, NDX_FLIST_EOF); |
write_ndx(f, NDX_FLIST_EOF); |
flist_eof = 1; |
flist_eof = 1; |
|
if (DEBUG_GTE(FLIST, 3)) |
|
rprintf(FINFO, "[%s] flist_eof=1\n", who_am_i()); |
} |
} |
else if (file_total == 1) { |
else if (file_total == 1) { |
/* If we're creating incremental file-lists and there |
/* If we're creating incremental file-lists and there |
Line 2307 struct file_list *send_file_list(int f, int argc, char
|
Line 2416 struct file_list *send_file_list(int f, int argc, char
|
* file-list to check if this is a 1-file xfer. */ |
* file-list to check if this is a 1-file xfer. */ |
send_extra_file_list(f, 1); |
send_extra_file_list(f, 1); |
} |
} |
|
} else { |
|
flist_eof = 1; |
|
if (DEBUG_GTE(FLIST, 3)) |
|
rprintf(FINFO, "[%s] flist_eof=1\n", who_am_i()); |
} |
} |
|
|
return flist; |
return flist; |
Line 2317 struct file_list *recv_file_list(int f)
|
Line 2430 struct file_list *recv_file_list(int f)
|
struct file_list *flist; |
struct file_list *flist; |
int dstart, flags; |
int dstart, flags; |
int64 start_read; |
int64 start_read; |
int save_verbose = verbose; |
|
|
|
if (!first_flist) | if (!first_flist) { |
| if (show_filelist_p()) |
| start_filelist_progress("receiving file list"); |
| else if (inc_recurse && INFO_GTE(FLIST, 1) && !am_server) |
| rprintf(FCLIENT, "receiving incremental file list\n"); |
rprintf(FLOG, "receiving file list\n"); |
rprintf(FLOG, "receiving file list\n"); |
if (show_filelist_p()) | if (usermap) |
start_filelist_progress("receiving file list"); | parse_name_map(usermap, True); |
else if (inc_recurse && verbose && !am_server && !first_flist) | if (groupmap) |
rprintf(FCLIENT, "receiving incremental file list\n"); | parse_name_map(groupmap, False); |
| } |
|
|
start_read = stats.total_read; |
start_read = stats.total_read; |
|
|
Line 2344 struct file_list *recv_file_list(int f)
|
Line 2461 struct file_list *recv_file_list(int f)
|
dstart = 0; |
dstart = 0; |
} |
} |
|
|
if (am_server && verbose > 2) |
|
verbose = 2; |
|
while ((flags = read_byte(f)) != 0) { |
while ((flags = read_byte(f)) != 0) { |
struct file_struct *file; |
struct file_struct *file; |
|
|
Line 2367 struct file_list *recv_file_list(int f)
|
Line 2482 struct file_list *recv_file_list(int f)
|
flist_expand(flist, 1); |
flist_expand(flist, 1); |
file = recv_file_entry(f, flist, flags); |
file = recv_file_entry(f, flist, flags); |
|
|
if (inc_recurse && S_ISDIR(file->mode)) { | if (S_ISREG(file->mode)) { |
flist_expand(dir_flist, 1); | /* Already counted */ |
dir_flist->files[dir_flist->used++] = file; | } else if (S_ISDIR(file->mode)) { |
} | if (inc_recurse) { |
| flist_expand(dir_flist, 1); |
| dir_flist->files[dir_flist->used++] = file; |
| } |
| stats.num_dirs++; |
| } else if (S_ISLNK(file->mode)) |
| stats.num_symlinks++; |
| else if (IS_DEVICE(file->mode)) |
| stats.num_symlinks++; |
| else |
| stats.num_specials++; |
|
|
flist->files[flist->used++] = file; |
flist->files[flist->used++] = file; |
|
|
maybe_emit_filelist_progress(flist->used); |
maybe_emit_filelist_progress(flist->used); |
|
|
if (verbose > 2) { | if (DEBUG_GTE(FLIST, 2)) { |
char *name = f_name(file, NULL); |
char *name = f_name(file, NULL); |
rprintf(FINFO, "recv_file_name(%s)\n", NS(name)); |
rprintf(FINFO, "recv_file_name(%s)\n", NS(name)); |
} |
} |
} |
} |
file_total += flist->used; |
file_total += flist->used; |
verbose = save_verbose; |
|
|
|
if (verbose > 2) | if (DEBUG_GTE(FLIST, 2)) |
rprintf(FINFO, "received %d names\n", flist->used); |
rprintf(FINFO, "received %d names\n", flist->used); |
|
|
if (show_filelist_p()) |
if (show_filelist_p()) |
Line 2422 struct file_list *recv_file_list(int f)
|
Line 2546 struct file_list *recv_file_list(int f)
|
|
|
if (inc_recurse) |
if (inc_recurse) |
flist_done_allocating(flist); |
flist_done_allocating(flist); |
else if (f >= 0) | else if (f >= 0) { |
recv_id_list(f, flist); |
recv_id_list(f, flist); |
|
flist_eof = 1; |
|
if (DEBUG_GTE(FLIST, 3)) |
|
rprintf(FINFO, "[%s] flist_eof=1\n", who_am_i()); |
|
} |
|
|
flist_sort_and_clean(flist, relative_paths); |
flist_sort_and_clean(flist, relative_paths); |
|
|
if (protocol_version < 30) { |
if (protocol_version < 30) { |
/* Recv the io_error flag */ |
/* Recv the io_error flag */ |
if (ignore_errors) | int err = read_int(f); |
read_int(f); | if (!ignore_errors) |
else | io_error |= err; |
io_error |= read_int(f); | |
} else if (inc_recurse && flist->ndx_start == 1) { |
} else if (inc_recurse && flist->ndx_start == 1) { |
if (!file_total || strcmp(flist->sorted[flist->low]->basename, ".") != 0) |
if (!file_total || strcmp(flist->sorted[flist->low]->basename, ".") != 0) |
flist->parent_ndx = -1; |
flist->parent_ndx = -1; |
} |
} |
|
|
if (verbose > 3) | if (DEBUG_GTE(FLIST, 3)) |
output_flist(flist); |
output_flist(flist); |
|
|
if (verbose > 2) | if (DEBUG_GTE(FLIST, 2)) |
rprintf(FINFO, "recv_file_list done\n"); |
rprintf(FINFO, "recv_file_list done\n"); |
|
|
stats.flist_size += stats.total_read - start_read; |
stats.flist_size += stats.total_read - start_read; |
Line 2458 void recv_additional_file_list(int f)
|
Line 2585 void recv_additional_file_list(int f)
|
int ndx = read_ndx(f); |
int ndx = read_ndx(f); |
if (ndx == NDX_FLIST_EOF) { |
if (ndx == NDX_FLIST_EOF) { |
flist_eof = 1; |
flist_eof = 1; |
|
if (DEBUG_GTE(FLIST, 3)) |
|
rprintf(FINFO, "[%s] flist_eof=1\n", who_am_i()); |
change_local_filter_dir(NULL, 0, 0); |
change_local_filter_dir(NULL, 0, 0); |
} else { |
} else { |
ndx = NDX_FLIST_OFFSET - ndx; |
ndx = NDX_FLIST_OFFSET - ndx; |
Line 2469 void recv_additional_file_list(int f)
|
Line 2598 void recv_additional_file_list(int f)
|
NDX_FLIST_OFFSET - dir_flist->used + 1); |
NDX_FLIST_OFFSET - dir_flist->used + 1); |
exit_cleanup(RERR_PROTOCOL); |
exit_cleanup(RERR_PROTOCOL); |
} |
} |
if (verbose > 3) { | if (DEBUG_GTE(FLIST, 3)) { |
rprintf(FINFO, "[%s] receiving flist for dir %d\n", |
rprintf(FINFO, "[%s] receiving flist for dir %d\n", |
who_am_i(), ndx); |
who_am_i(), ndx); |
} |
} |
Line 2576 struct file_list *flist_new(int flags, char *msg)
|
Line 2705 struct file_list *flist_new(int flags, char *msg)
|
|
|
if (flags & FLIST_TEMP) { |
if (flags & FLIST_TEMP) { |
if (!(flist->file_pool = pool_create(SMALL_EXTENT, 0, |
if (!(flist->file_pool = pool_create(SMALL_EXTENT, 0, |
out_of_memory, POOL_INTERN))) | out_of_memory, |
| POOL_INTERN))) |
out_of_memory(msg); |
out_of_memory(msg); |
} else { |
} else { |
/* This is a doubly linked list with prev looping back to |
/* This is a doubly linked list with prev looping back to |
* the end of the list, but the last next pointer is NULL. */ |
* the end of the list, but the last next pointer is NULL. */ |
if (!first_flist) { |
if (!first_flist) { |
flist->file_pool = pool_create(NORMAL_EXTENT, 0, |
flist->file_pool = pool_create(NORMAL_EXTENT, 0, |
out_of_memory, POOL_INTERN); | out_of_memory, |
| POOL_INTERN); |
if (!flist->file_pool) |
if (!flist->file_pool) |
out_of_memory(msg); |
out_of_memory(msg); |
|
|
Line 2713 static void flist_sort_and_clean(struct file_list *fli
|
Line 2844 static void flist_sort_and_clean(struct file_list *fli
|
keep = j, drop = i; |
keep = j, drop = i; |
|
|
if (!am_sender) { |
if (!am_sender) { |
if (verbose > 1) { | if (DEBUG_GTE(DUP, 1)) { |
rprintf(FINFO, |
rprintf(FINFO, |
"removing duplicate name %s from file list (%d)\n", |
"removing duplicate name %s from file list (%d)\n", |
f_name(file, fbuf), drop + flist->ndx_start); |
f_name(file, fbuf), drop + flist->ndx_start); |
Line 2854 static void output_flist(struct file_list *flist)
|
Line 2985 static void output_flist(struct file_list *flist)
|
} else |
} else |
root = dir = slash = name = trail = ""; |
root = dir = slash = name = trail = ""; |
rprintf(FINFO, |
rprintf(FINFO, |
"[%s] i=%d %s %s%s%s%s mode=0%o len=%.0f%s%s flags=%x\n", | "[%s] i=%d %s %s%s%s%s mode=0%o len=%s%s%s flags=%x\n", |
who, i + flist->ndx_start, |
who, i + flist->ndx_start, |
root, dir, slash, name, trail, |
root, dir, slash, name, trail, |
(int)file->mode, (double)F_LENGTH(file), | (int)file->mode, comma_num(F_LENGTH(file)), |
uidbuf, gidbuf, file->flags); |
uidbuf, gidbuf, file->flags); |
} |
} |
} |
} |
Line 3072 struct file_list *get_dirlist(char *dirname, int dlen,
|
Line 3203 struct file_list *get_dirlist(char *dirname, int dlen,
|
send_directory(senddir_fd, dirlist, dirname, dlen, FLAG_CONTENT_DIR); |
send_directory(senddir_fd, dirlist, dirname, dlen, FLAG_CONTENT_DIR); |
xfer_dirs = save_xfer_dirs; |
xfer_dirs = save_xfer_dirs; |
recurse = save_recurse; |
recurse = save_recurse; |
if (do_progress) | if (INFO_GTE(PROGRESS, 1)) |
flist_count_offset += dirlist->used; |
flist_count_offset += dirlist->used; |
|
|
prune_empty_dirs = 0; |
prune_empty_dirs = 0; |
Line 3080 struct file_list *get_dirlist(char *dirname, int dlen,
|
Line 3211 struct file_list *get_dirlist(char *dirname, int dlen,
|
flist_sort_and_clean(dirlist, 0); |
flist_sort_and_clean(dirlist, 0); |
prune_empty_dirs = save_prune_empty_dirs; |
prune_empty_dirs = save_prune_empty_dirs; |
|
|
if (verbose > 3) | if (DEBUG_GTE(FLIST, 3)) |
output_flist(dirlist); |
output_flist(dirlist); |
|
|
return dirlist; |
return dirlist; |