embedaddon/rsync/receiver.c - diff

Return to receiver.c CVS log

Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / rsync

Diff for /embedaddon/rsync/receiver.c between versions 1.1 and 1.1.1.4

version 1.1, 2012/02/17 15:09:30	version 1.1.1.4, 2021/03/17 00:32:36
Line 3	Line 3
*	*
* Copyright (C) 1996-2000 Andrew Tridgell	* Copyright (C) 1996-2000 Andrew Tridgell
* Copyright (C) 1996 Paul Mackerras	* Copyright (C) 1996 Paul Mackerras
* Copyright (C) 2003-2009 Wayne Davison	* Copyright (C) 2003-2020 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 20	Line 20
*/	*/

#include "rsync.h"	#include "rsync.h"
	#include "inums.h"

extern int verbose;
extern int dry_run;	extern int dry_run;
extern int do_xfers;	extern int do_xfers;
	extern int use_db;
	extern int db_lax;
extern int am_root;	extern int am_root;
extern int am_server;	extern int am_server;
extern int do_progress;
extern int inc_recurse;	extern int inc_recurse;
extern int log_before_transfer;	extern int log_before_transfer;
extern int stdout_format_has_i;	extern int stdout_format_has_i;
extern int logfile_format_has_i;	extern int logfile_format_has_i;
	extern int want_xattr_optim;
extern int csum_length;	extern int csum_length;
extern int read_batch;	extern int read_batch;
extern int write_batch;	extern int write_batch;
Line 39 extern int protocol_version;	Line 41 extern int protocol_version;
extern int relative_paths;	extern int relative_paths;
extern int preserve_hard_links;	extern int preserve_hard_links;
extern int preserve_perms;	extern int preserve_perms;
	extern int write_devices;
extern int preserve_xattrs;	extern int preserve_xattrs;
	extern int do_fsync;
extern int basis_dir_cnt;	extern int basis_dir_cnt;
extern int make_backups;	extern int make_backups;
extern int cleanup_got_literal;	extern int cleanup_got_literal;
extern int remove_source_files;	extern int remove_source_files;
extern int append_mode;	extern int append_mode;
extern int sparse_files;	extern int sparse_files;
	extern int preallocate_files;
extern int keep_partial;	extern int keep_partial;
extern int checksum_seed;	extern int checksum_seed;
	extern int checksum_files;
	extern int whole_file;
extern int inplace;	extern int inplace;
	extern int inplace_partial;
	extern int allowed_lull;
extern int delay_updates;	extern int delay_updates;
	extern int xfersum_type;
	extern BOOL want_progress_now;
extern mode_t orig_umask;	extern mode_t orig_umask;
extern struct stats stats;	extern struct stats stats;
extern char *tmpdir;	extern char *tmpdir;
	extern char *dest_filter;
extern char *partial_dir;	extern char *partial_dir;
extern char *basis_dir[MAX_BASIS_DIRS+1];	extern char *basis_dir[MAX_BASIS_DIRS+1];
	extern char sender_file_sum[MAX_DIGEST_LEN];
extern struct file_list cur_flist, first_flist, *dir_flist;	extern struct file_list cur_flist, first_flist, *dir_flist;
extern struct filter_list_struct daemon_filter_list;	extern filter_rule_list daemon_filter_list;
	extern OFF_T preallocated_len;

static struct bitbag *delayed_bits = NULL;	static struct bitbag *delayed_bits = NULL;
static int phase = 0, redoing = 0;	static int phase = 0, redoing = 0;
static flist_ndx_list batch_redo_list;	static flist_ndx_list batch_redo_list;
/* We're either updating the basis file or an identical copy: */	/* This is non-0 when we are updating the basis file or an identical copy: */
static int updating_basis_or_equiv;	static int updating_basis_or_equiv;

#define TMPNAME_SUFFIX ".XXXXXX"	#define TMPNAME_SUFFIX ".XXXXXX"
#define TMPNAME_SUFFIX_LEN ((int)sizeof TMPNAME_SUFFIX - 1)	#define TMPNAME_SUFFIX_LEN ((int)sizeof TMPNAME_SUFFIX - 1)
	#define MAX_UNIQUE_NUMBER 999999
	#define MAX_UNIQUE_LOOP 100

/* get_tmpname() - create a tmp filename for a given filename	/* get_tmpname() - create a tmp filename for a given filename
*	*
Line 79 static int updating_basis_or_equiv;	Line 95 static int updating_basis_or_equiv;
* the basename basically becomes 8 characters longer. In such a case, the	* the basename basically becomes 8 characters longer. In such a case, the
* original name is shortened sufficiently to make it all fit.	* original name is shortened sufficiently to make it all fit.
*	*
	* If the make_unique arg is True, the XXXXXX string is replaced with a unique
	* string that doesn't exist at the time of the check. This is intended to be
	* used for creating hard links, symlinks, devices, and special files, since
	* normal files should be handled by mkstemp() for safety.
	*
* Of course, the only reason the file is based on the original name is to	* Of course, the only reason the file is based on the original name is to
* make it easier to figure out what purpose a temp file is serving when a	* make it easier to figure out what purpose a temp file is serving when a
* transfer is in progress. */	* transfer is in progress. */
int get_tmpname(char fnametmp, const char fname)	int get_tmpname(char fnametmp, const char fname, BOOL make_unique)
{	{
int maxname, added, length = 0;	int maxname, length = 0;
const char *f;	const char *f;
char *suf;	char *suf;

Line 103 int get_tmpname(char fnametmp, const char fname)	Line 124 int get_tmpname(char fnametmp, const char fname)
}	}
} else	} else
f = fname;	f = fname;
fnametmp[length++] = '.';

	if (!tmpdir) { /* using a tmpdir avoids the leading dot on our temp names */
	if (f == '.') / avoid an extra leading dot for OS X's sake */
	f++;
	fnametmp[length++] = '.';
	}

/* The maxname value is bufsize, and includes space for the '\0'.	/* The maxname value is bufsize, and includes space for the '\0'.
* NAME_MAX needs an extra -1 for the name's leading dot. */	* NAME_MAX needs an extra -1 for the name's leading dot. */
maxname = MIN(MAXPATHLEN - length - TMPNAME_SUFFIX_LEN,	maxname = MIN(MAXPATHLEN - length - TMPNAME_SUFFIX_LEN,
NAME_MAX - 1 - TMPNAME_SUFFIX_LEN);	NAME_MAX - 1 - TMPNAME_SUFFIX_LEN);

if (maxname < 1) {	if (maxname < 0) {
rprintf(FERROR_XFER, "temporary filename too long: %s\n", fname);	rprintf(FERROR_XFER, "temporary filename too long: %s\n", fname);
fnametmp[0] = '\0';	fnametmp[0] = '\0';
return 0;	return 0;
}	}

added = strlcpy(fnametmp + length, f, maxname);	if (maxname) {
if (added >= maxname)	int added = strlcpy(fnametmp + length, f, maxname);
added = maxname - 1;	if (added >= maxname)
suf = fnametmp + length + added;	added = maxname - 1;
	suf = fnametmp + length + added;

/* Trim any dangling high-bit chars if the first-trimmed char (if any) is	/* Trim any dangling high-bit chars if the first-trimmed char (if any) is
* also a high-bit char, just in case we cut into a multi-byte sequence.	* also a high-bit char, just in case we cut into a multi-byte sequence.
* We are guaranteed to stop because of the leading '.' we added. */	* We are guaranteed to stop because of the leading '.' we added. */
if ((int)f[added] & 0x80) {	if ((int)f[added] & 0x80) {
while ((int)suf[-1] & 0x80)	while ((int)suf[-1] & 0x80)
	suf--;
	}
	/* trim one trailing dot before our suffix's dot */
	if (suf[-1] == '.')
suf--;	suf--;
}	} else
	suf = fnametmp + length - 1; /* overwrite the leading dot with suffix's dot */

memcpy(suf, TMPNAME_SUFFIX, TMPNAME_SUFFIX_LEN+1);	if (make_unique) {
	static unsigned counter_limit;
	unsigned counter;

	if (!counter_limit) {
	counter_limit = (unsigned)getpid() + MAX_UNIQUE_LOOP;
	if (counter_limit > MAX_UNIQUE_NUMBER \|\| counter_limit < MAX_UNIQUE_LOOP)
	counter_limit = MAX_UNIQUE_LOOP;
	}
	counter = counter_limit - MAX_UNIQUE_LOOP;

	/* This doesn't have to be very good because we don't need
	* to worry about someone trying to guess the values: all
	* a conflict will do is cause a device, special file, hard
	* link, or symlink to fail to be created. Also: avoid
	* using mktemp() due to gcc's annoying warning. */
	while (1) {
	snprintf(suf, TMPNAME_SUFFIX_LEN+1, ".%d", counter);
	if (access(fnametmp, 0) < 0)
	break;
	if (++counter >= counter_limit)
	return 0;
	}
	} else
	memcpy(suf, TMPNAME_SUFFIX, TMPNAME_SUFFIX_LEN+1);

return 1;	return 1;
}	}

Line 143 int open_tmpfile(char fnametmp, const char fname, st	Line 199 int open_tmpfile(char fnametmp, const char fname, st
int fd;	int fd;
mode_t added_perms;	mode_t added_perms;

if (!get_tmpname(fnametmp, fname))	if (!get_tmpname(fnametmp, fname, False))
return -1;	return -1;

if (am_root < 0) {	if (am_root < 0) {
Line 166 int open_tmpfile(char fnametmp, const char fname, st	Line 222 int open_tmpfile(char fnametmp, const char fname, st
* information should have been previously transferred, but that may	* information should have been previously transferred, but that may
* not be the case with -R */	* not be the case with -R */
if (fd == -1 && relative_paths && errno == ENOENT	if (fd == -1 && relative_paths && errno == ENOENT
&& create_directory_path(fnametmp) == 0) {	&& make_path(fnametmp, ACCESSPERMS, MKP_SKIP_SLASH \| MKP_DROP_NAME) == 0) {
/* Get back to name with XXXXXX in it. */	/* Get back to name with XXXXXX in it. */
get_tmpname(fnametmp, fname);	get_tmpname(fnametmp, fname, False);
fd = do_mkstemp(fnametmp, (file->mode\|added_perms) & INITACCESSPERMS);	fd = do_mkstemp(fnametmp, (file->mode\|added_perms) & INITACCESSPERMS);
}	}
#endif	#endif
Line 183 int open_tmpfile(char fnametmp, const char fname, st	Line 239 int open_tmpfile(char fnametmp, const char fname, st
}	}

static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,	static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
const char *fname, int fd, OFF_T total_size)	const char fname, int fd, struct file_struct file, int inplace_sizing)
{	{
static char file_sum1[MAX_DIGEST_LEN];	static char file_sum1[MAX_DIGEST_LEN];
static char file_sum2[MAX_DIGEST_LEN];
struct map_struct *mapbuf;	struct map_struct *mapbuf;
struct sum_struct sum;	struct sum_struct sum;
int32 len, sum_len;	int sum_len;
	int32 len;
	OFF_T total_size = F_LENGTH(file);
OFF_T offset = 0;	OFF_T offset = 0;
OFF_T offset2;	OFF_T offset2;
char *data;	char *data;
int32 i;	int32 i;
char *map = NULL;	char *map = NULL;

	#ifdef SUPPORT_PREALLOCATION
	if (preallocate_files && fd != -1 && total_size > 0 && (!inplace_sizing \|\| total_size > size_r)) {
	/* Try to preallocate enough space for file's eventual length. Can
	* reduce fragmentation on filesystems like ext4, xfs, and NTFS. */
	if ((preallocated_len = do_fallocate(fd, 0, total_size)) < 0)
	rsyserr(FWARNING, errno, "do_fallocate %s", full_fname(fname));
	} else
	#endif
	if (inplace_sizing) {
	#ifdef HAVE_FTRUNCATE
	/* The most compatible way to create a sparse file is to start with no length. */
	if (sparse_files > 0 && whole_file && fd >= 0 && do_ftruncate(fd, 0) == 0)
	preallocated_len = 0;
	else
	#endif
	preallocated_len = size_r;
	} else
	preallocated_len = 0;

read_sum_head(f_in, &sum);	read_sum_head(f_in, &sum);

if (fd_r >= 0 && size_r > 0) {	if (fd_r >= 0 && size_r > 0) {
int32 read_size = MAX(sum.blength * 2, 16*1024);	int32 read_size = MAX(sum.blength * 2, 16*1024);
mapbuf = map_file(fd_r, size_r, read_size, sum.blength);	mapbuf = map_file(fd_r, size_r, read_size, sum.blength);
if (verbose > 2) {	if (DEBUG_GTE(DELTASUM, 2)) {
rprintf(FINFO, "recv mapped %s of size %.0f\n",	rprintf(FINFO, "recv mapped %s of size %s\n",
fname_r, (double)size_r);	fname_r, big_num(size_r));
}	}
} else	} else
mapbuf = NULL;	mapbuf = NULL;

sum_init(checksum_seed);	sum_init(xfersum_type, checksum_seed);

if (append_mode > 0) {	if (append_mode > 0) {
OFF_T j;	OFF_T j;
sum.flength = (OFF_T)sum.count * sum.blength;	sum.flength = (OFF_T)sum.count * sum.blength;
if (sum.remainder)	if (sum.remainder)
sum.flength -= sum.blength - sum.remainder;	sum.flength -= sum.blength - sum.remainder;
if (append_mode == 2) {	if (append_mode == 2 && mapbuf) {
for (j = CHUNK_SIZE; j < sum.flength; j += CHUNK_SIZE) {	for (j = CHUNK_SIZE; j < sum.flength; j += CHUNK_SIZE) {
if (do_progress)	if (INFO_GTE(PROGRESS, 1))
show_progress(offset, total_size);	show_progress(offset, total_size);
sum_update(map_ptr(mapbuf, offset, CHUNK_SIZE),	sum_update(map_ptr(mapbuf, offset, CHUNK_SIZE),
CHUNK_SIZE);	CHUNK_SIZE);
Line 225 static int receive_data(int f_in, char *fname_r, int f	Line 301 static int receive_data(int f_in, char *fname_r, int f
}	}
if (offset < sum.flength) {	if (offset < sum.flength) {
int32 len = (int32)(sum.flength - offset);	int32 len = (int32)(sum.flength - offset);
if (do_progress)	if (INFO_GTE(PROGRESS, 1))
show_progress(offset, total_size);	show_progress(offset, total_size);
sum_update(map_ptr(mapbuf, offset, len), len);	sum_update(map_ptr(mapbuf, offset, len), len);
}	}
}	}
offset = sum.flength;	offset = sum.flength;
if (fd != -1 && (j = do_lseek(fd, offset, SEEK_SET)) != offset) {	if (fd != -1 && (j = do_lseek(fd, offset, SEEK_SET)) != offset) {
rsyserr(FERROR_XFER, errno, "lseek of %s returned %.0f, not %.0f",	rsyserr(FERROR_XFER, errno, "lseek of %s returned %s, not %s",
full_fname(fname), (double)j, (double)offset);	full_fname(fname), big_num(j), big_num(offset));
exit_cleanup(RERR_FILEIO);	exit_cleanup(RERR_FILEIO);
}	}
}	}

while ((i = recv_token(f_in, &data)) != 0) {	while ((i = recv_token(f_in, &data)) != 0) {
if (do_progress)	if (INFO_GTE(PROGRESS, 1))
show_progress(offset, total_size);	show_progress(offset, total_size);

	if (allowed_lull)
	maybe_send_keepalive(time(NULL), MSK_ALLOW_FLUSH \| MSK_ACTIVE_RECEIVER);

if (i > 0) {	if (i > 0) {
if (verbose > 3) {	if (DEBUG_GTE(DELTASUM, 3)) {
rprintf(FINFO,"data recv %d at %.0f\n",	rprintf(FINFO,"data recv %d at %s\n",
i,(double)offset);	i, big_num(offset));
}	}

stats.literal_data += i;	stats.literal_data += i;
Line 253 static int receive_data(int f_in, char *fname_r, int f	Line 332 static int receive_data(int f_in, char *fname_r, int f

sum_update(data, i);	sum_update(data, i);

if (fd != -1 && write_file(fd,data,i) != i)	if (fd != -1 && write_file(fd, 0, offset, data, i) != i)
goto report_write_error;	goto report_write_error;
offset += i;	offset += i;
continue;	continue;
Line 267 static int receive_data(int f_in, char *fname_r, int f	Line 346 static int receive_data(int f_in, char *fname_r, int f

stats.matched_data += len;	stats.matched_data += len;

if (verbose > 3) {	if (DEBUG_GTE(DELTASUM, 3)) {
rprintf(FINFO,	rprintf(FINFO,
"chunk[%d] of size %ld at %.0f offset=%.0f%s\n",	"chunk[%d] of size %ld at %s offset=%s%s\n",
i, (long)len, (double)offset2, (double)offset,	i, (long)len, big_num(offset2), big_num(offset),
updating_basis_or_equiv && offset == offset2 ? " (seek)" : "");	updating_basis_or_equiv && offset == offset2 ? " (seek)" : "");
}	}

Line 283 static int receive_data(int f_in, char *fname_r, int f	Line 362 static int receive_data(int f_in, char *fname_r, int f

if (updating_basis_or_equiv) {	if (updating_basis_or_equiv) {
if (offset == offset2 && fd != -1) {	if (offset == offset2 && fd != -1) {
OFF_T pos;	if (skip_matched(fd, offset, map, len) < 0)
if (flush_write_file(fd) < 0)
goto report_write_error;	goto report_write_error;
offset += len;	offset += len;
if ((pos = do_lseek(fd, len, SEEK_CUR)) != offset) {
rsyserr(FERROR_XFER, errno,
"lseek of %s returned %.0f, not %.0f",
full_fname(fname),
(double)pos, (double)offset);
exit_cleanup(RERR_FILEIO);
}
continue;	continue;
}	}
}	}
if (fd != -1 && map && write_file(fd, map, len) != (int)len)	if (fd != -1 && map && write_file(fd, 0, offset, map, len) != (int)len)
goto report_write_error;	goto report_write_error;
offset += len;	offset += len;
}	}

if (flush_write_file(fd) < 0)	if (fd != -1 && offset > 0) {
goto report_write_error;	if (sparse_files > 0) {
	if (sparse_end(fd, offset) != 0)
	goto report_write_error;
	} else if (flush_write_file(fd) < 0) {
	report_write_error:
	rsyserr(FERROR_XFER, errno, "write failed on %s", full_fname(fname));
	exit_cleanup(RERR_FILEIO);
	}
	}

#ifdef HAVE_FTRUNCATE	#ifdef HAVE_FTRUNCATE
if (inplace && fd != -1 && do_ftruncate(fd, offset) < 0) {	/* inplace: New data could be shorter than old data.
rsyserr(FERROR_XFER, errno, "ftruncate failed on %s",	* preallocate_files: total_size could have been an overestimate.
full_fname(fname));	* Cut off any extra preallocated zeros from dest file. */
	if ((inplace_sizing \|\| preallocated_len > offset) && fd != -1 && !IS_DEVICE(file->mode)) {
	if (do_ftruncate(fd, offset) < 0)
	rsyserr(FERROR_XFER, errno, "ftruncate failed on %s", full_fname(fname));
}	}
#endif	#endif

if (do_progress)	if (INFO_GTE(PROGRESS, 1))
end_progress(total_size);	end_progress(total_size);

if (fd != -1 && offset > 0 && sparse_end(fd, offset) != 0) {	sum_len = sum_end(file_sum1);
report_write_error:
rsyserr(FERROR_XFER, errno, "write failed on %s",	if (do_fsync && fd != -1 && fsync(fd) != 0) {
	rsyserr(FERROR, errno, "fsync failed on %s",
full_fname(fname));	full_fname(fname));
exit_cleanup(RERR_FILEIO);	exit_cleanup(RERR_FILEIO);
}	}

sum_len = sum_end(file_sum1);

if (mapbuf)	if (mapbuf)
unmap_file(mapbuf);	unmap_file(mapbuf);

read_buf(f_in, file_sum2, sum_len);	read_buf(f_in, sender_file_sum, sum_len);
if (verbose > 2)	if (DEBUG_GTE(DELTASUM, 2))
rprintf(FINFO,"got file_sum\n");	rprintf(FINFO,"got file_sum\n");
if (fd != -1 && memcmp(file_sum1, file_sum2, sum_len) != 0)	if (fd != -1 && memcmp(file_sum1, sender_file_sum, sum_len) != 0)
return 0;	return 0;
return 1;	return 1;
}	}


static void discard_receive_data(int f_in, OFF_T length)	static void discard_receive_data(int f_in, struct file_struct *file)
{	{
receive_data(f_in, NULL, -1, 0, NULL, -1, length);	receive_data(f_in, NULL, -1, 0, NULL, -1, file, 0);
}	}

static void handle_delayed_updates(char *local_name)	static void handle_delayed_updates(char *local_name)
Line 350 static void handle_delayed_updates(char *local_name)	Line 431 static void handle_delayed_updates(char *local_name)
struct file_struct *file = cur_flist->files[ndx];	struct file_struct *file = cur_flist->files[ndx];
fname = local_name ? local_name : f_name(file, NULL);	fname = local_name ? local_name : f_name(file, NULL);
if ((partialptr = partial_dir_fname(fname)) != NULL) {	if ((partialptr = partial_dir_fname(fname)) != NULL) {
if (make_backups > 0 && !make_backup(fname))	if (make_backups > 1 && !make_backup(fname, False))
continue;	continue;
if (verbose > 2) {	if (DEBUG_GTE(RECV, 1)) {
rprintf(FINFO, "renaming %s to %s\n",	rprintf(FINFO, "renaming %s to %s\n",
partialptr, fname);	partialptr, fname);
}	}
Line 363 static void handle_delayed_updates(char *local_name)	Line 444 static void handle_delayed_updates(char *local_name)
"rename failed for %s (from %s)",	"rename failed for %s (from %s)",
full_fname(fname), partialptr);	full_fname(fname), partialptr);
} else {	} else {
if (remove_source_files	if (remove_source_files \|\| checksum_files & CSF_UPDATE
\|\| (preserve_hard_links && F_IS_HLINKED(file)))	\|\| (preserve_hard_links && F_IS_HLINKED(file)))
send_msg_int(MSG_SUCCESS, ndx);	send_msg_int(MSG_SUCCESS, ndx);
handle_partial_dir(partialptr, PDIR_DELETE);	handle_partial_dir(partialptr, PDIR_DELETE);
Line 403 static int we_want_redo(int desired_ndx)	Line 484 static int we_want_redo(int desired_ndx)
return 0;	return 0;
}	}

static int gen_wants_ndx(int desired_ndx)	static int gen_wants_ndx(int desired_ndx, int flist_num)
{	{
static int next_ndx = -1;	static int next_ndx = -1;
static int done_cnt = 0;	static int done_cnt = 0;
static BOOL got_eof = False;	static BOOL got_eof = False;
int flist_num = first_flist->flist_num;

if (got_eof)	if (got_eof)
return 0;	return 0;

	/* TODO: integrate gen-reading I/O into perform_io() so this is not needed? */
	io_flush(FULL_FLUSH);

while (next_ndx < desired_ndx) {	while (next_ndx < desired_ndx) {
if (inc_recurse && flist_num <= done_cnt)	if (inc_recurse && flist_num <= done_cnt)
return 0;	return 0;
Line 440 static int gen_wants_ndx(int desired_ndx)	Line 523 static int gen_wants_ndx(int desired_ndx)
* main routine for receiver process.	* main routine for receiver process.
*	*
* Receiver process runs on the same host as the generator process. */	* Receiver process runs on the same host as the generator process. */
int recv_files(int f_in, char *local_name)	int recv_files(int f_in, int f_out, char *local_name)
{	{
int fd1,fd2;	int fd1,fd2;
STRUCT_STAT st;	STRUCT_STAT st;
int iflags, xlen;	int iflags, xlen;
char *fname, fbuf[MAXPATHLEN];	char *fname, fbuf[MAXPATHLEN];
char xname[MAXPATHLEN];	char xname[MAXPATHLEN];
char fnametmp[MAXPATHLEN];	char *fnametmp, fnametmpbuf[MAXPATHLEN];
char fnamecmp, partialptr;	char fnamecmp, partialptr;
char fnamecmpbuf[MAXPATHLEN];	char fnamecmpbuf[MAXPATHLEN];
	char *filter_argv[MAX_FILTER_ARGS + 1];
uchar fnamecmp_type;	uchar fnamecmp_type;
struct file_struct *file;	struct file_struct *file;
struct stats initial_stats;
int itemizing = am_server ? logfile_format_has_i : stdout_format_has_i;	int itemizing = am_server ? logfile_format_has_i : stdout_format_has_i;
enum logcode log_code = log_before_transfer ? FLOG : FINFO;	enum logcode log_code = log_before_transfer ? FLOG : FINFO;
int max_phase = protocol_version >= 29 ? 2 : 1;	int max_phase = protocol_version >= 29 ? 2 : 1;
Line 460 int recv_files(int f_in, char *local_name)	Line 543 int recv_files(int f_in, char *local_name)
#ifdef SUPPORT_ACLS	#ifdef SUPPORT_ACLS
const char *parent_dirname = "";	const char *parent_dirname = "";
#endif	#endif
int ndx, recv_ok;	int ndx, recv_ok, one_inplace;
	pid_t pid = 0;

if (verbose > 2)	if (DEBUG_GTE(RECV, 1))
rprintf(FINFO, "recv_files(%d) starting\n", cur_flist->used);	rprintf(FINFO, "recv_files(%d) starting\n", cur_flist->used);

if (delay_updates)	if (delay_updates)
delayed_bits = bitbag_create(cur_flist->used + 1);	delayed_bits = bitbag_create(cur_flist->used + 1);

	if (use_db && (append_mode == 1 \|\| protocol_version < 30))
	use_db = 0; /* We can't note finished md5 values */

	if (dest_filter) {
	char *p;
	char *sep = " \t";
	int i;
	for (p = strtok(dest_filter, sep), i = 0;
	p && i < MAX_FILTER_ARGS;
	p = strtok(0, sep))
	filter_argv[i++] = p;
	filter_argv[i] = NULL;
	if (p) {
	rprintf(FERROR,
	"Too many arguments to dest-filter (> %d)\n",
	MAX_FILTER_ARGS);
	exit_cleanup(RERR_SYNTAX);
	}
	}

	progress_init();

while (1) {	while (1) {
cleanup_disable();	cleanup_disable();

/* This call also sets cur_flist. */	/* This call also sets cur_flist. */
ndx = read_ndx_and_attrs(f_in, &iflags, &fnamecmp_type,	ndx = read_ndx_and_attrs(f_in, f_out, &iflags, &fnamecmp_type,
xname, &xlen);	xname, &xlen);
if (ndx == NDX_DONE) {	if (ndx == NDX_DONE) {
	if (!am_server && cur_flist) {
	set_current_file_index(NULL, 0);
	if (INFO_GTE(PROGRESS, 2))
	end_progress(0);
	}
if (inc_recurse && first_flist) {	if (inc_recurse && first_flist) {
if (read_batch)	if (read_batch) {
gen_wants_ndx(first_flist->used + first_flist->ndx_start);	ndx = first_flist->used + first_flist->ndx_start;
	gen_wants_ndx(ndx, first_flist->flist_num);
	}
flist_free(first_flist);	flist_free(first_flist);
if (first_flist)	if (first_flist)
continue;	continue;
} else if (read_batch && first_flist)	} else if (read_batch && first_flist) {
gen_wants_ndx(first_flist->used);	ndx = first_flist->used;
	gen_wants_ndx(ndx, first_flist->flist_num);
	}
if (++phase > max_phase)	if (++phase > max_phase)
break;	break;
if (verbose > 2)	if (DEBUG_GTE(RECV, 1))
rprintf(FINFO, "recv_files phase=%d\n", phase);	rprintf(FINFO, "recv_files phase=%d\n", phase);
if (phase == 2 && delay_updates)	if (phase == 2 && delay_updates)
handle_delayed_updates(local_name);	handle_delayed_updates(local_name);
send_msg(MSG_DONE, "", 0, 0);	write_int(f_out, NDX_DONE);
continue;	continue;
}	}

Line 499 int recv_files(int f_in, char *local_name)	Line 614 int recv_files(int f_in, char *local_name)
file = dir_flist->files[cur_flist->parent_ndx];	file = dir_flist->files[cur_flist->parent_ndx];
fname = local_name ? local_name : f_name(file, fbuf);	fname = local_name ? local_name : f_name(file, fbuf);

if (verbose > 2)	if (DEBUG_GTE(RECV, 1))
rprintf(FINFO, "recv_files(%s)\n", fname);	rprintf(FINFO, "recv_files(%s)\n", fname);

	if (daemon_filter_list.head && (*fname != '.' \|\| fname[1] != '\0')
	&& check_filter(&daemon_filter_list, FLOG, fname, 0) < 0) {
	rprintf(FERROR, "attempt to hack rsync failed.\n");
	exit_cleanup(RERR_PROTOCOL);
	}

#ifdef SUPPORT_XATTRS	#ifdef SUPPORT_XATTRS
if (preserve_xattrs && iflags & ITEM_REPORT_XATTR && do_xfers)	if (preserve_xattrs && iflags & ITEM_REPORT_XATTR && do_xfers
	&& !(want_xattr_optim && BITS_SET(iflags, ITEM_XNAME_FOLLOWS\|ITEM_LOCAL_CHANGE)))
recv_xattr_request(file, f_in);	recv_xattr_request(file, f_in);
#endif	#endif

Line 514 int recv_files(int f_in, char *local_name)	Line 636 int recv_files(int f_in, char *local_name)
&& !BITS_SET(iflags, ITEM_XNAME_FOLLOWS\|ITEM_LOCAL_CHANGE))	&& !BITS_SET(iflags, ITEM_XNAME_FOLLOWS\|ITEM_LOCAL_CHANGE))
set_file_attrs(fname, file, NULL, fname, 0);	set_file_attrs(fname, file, NULL, fname, 0);
#endif	#endif
	if (iflags & ITEM_IS_NEW) {
	stats.created_files++;
	if (S_ISREG(file->mode)) {
	/* Nothing further to count. */
	} else if (S_ISDIR(file->mode))
	stats.created_dirs++;
	#ifdef SUPPORT_LINKS
	else if (S_ISLNK(file->mode))
	stats.created_symlinks++;
	#endif
	else if (IS_DEVICE(file->mode))
	stats.created_devices++;
	else
	stats.created_specials++;
	}
continue;	continue;
}	}
if (phase == 2) {	if (phase == 2) {
Line 543 int recv_files(int f_in, char *local_name)	Line 680 int recv_files(int f_in, char *local_name)
csum_length = SHORT_SUM_LENGTH;	csum_length = SHORT_SUM_LENGTH;
redoing = 0;	redoing = 0;
}	}
	if (iflags & ITEM_IS_NEW)
	stats.created_files++;
}	}

if (!am_server && do_progress)	if (!am_server)
set_current_file_index(file, ndx);	set_current_file_index(file, ndx);
stats.num_transferred_files++;	stats.xferred_files++;
stats.total_transferred_size += F_LENGTH(file);	stats.total_transferred_size += F_LENGTH(file);

cleanup_got_literal = 0;	cleanup_got_literal = 0;

if (daemon_filter_list.head
&& check_filter(&daemon_filter_list, FLOG, fname, 0) < 0) {
rprintf(FERROR, "attempt to hack rsync failed.\n");
exit_cleanup(RERR_PROTOCOL);
}

if (read_batch) {	if (read_batch) {
int wanted = redoing	int wanted = redoing
? we_want_redo(ndx)	? we_want_redo(ndx)
: gen_wants_ndx(ndx);	: gen_wants_ndx(ndx, cur_flist->flist_num);
if (!wanted) {	if (!wanted) {
rprintf(FINFO,	rprintf(FINFO,
"(Skipping batched update for%s \"%s\")\n",	"(Skipping batched update for%s \"%s\")\n",
redoing ? " resend of" : "",	redoing ? " resend of" : "",
fname);	fname);
discard_receive_data(f_in, F_LENGTH(file));	discard_receive_data(f_in, file);
file->flags \|= FLAG_FILE_SENT;	file->flags \|= FLAG_FILE_SENT;
continue;	continue;
}	}
}	}

	remember_initial_stats();

if (!do_xfers) { /* log the transfer */	if (!do_xfers) { /* log the transfer */
log_item(FCLIENT, file, &stats, iflags, NULL);	log_item(FCLIENT, file, iflags, NULL);
if (read_batch)	if (read_batch)
discard_receive_data(f_in, F_LENGTH(file));	discard_receive_data(f_in, file);
continue;	continue;
}	}
if (write_batch < 0) {	if (write_batch < 0) {
log_item(FCLIENT, file, &stats, iflags, NULL);	log_item(FCLIENT, file, iflags, NULL);
if (!am_server)	if (!am_server)
discard_receive_data(f_in, F_LENGTH(file));	discard_receive_data(f_in, file);
	if (inc_recurse)
	send_msg_int(MSG_SUCCESS, ndx);
continue;	continue;
}	}

Line 601 int recv_files(int f_in, char *local_name)	Line 738 int recv_files(int f_in, char *local_name)
break;	break;
case FNAMECMP_FUZZY:	case FNAMECMP_FUZZY:
if (file->dirname) {	if (file->dirname) {
pathjoin(fnamecmpbuf, MAXPATHLEN,	pathjoin(fnamecmpbuf, sizeof fnamecmpbuf, file->dirname, xname);
file->dirname, xname);
fnamecmp = fnamecmpbuf;	fnamecmp = fnamecmpbuf;
} else	} else
fnamecmp = xname;	fnamecmp = xname;
break;	break;
default:	default:
if (fnamecmp_type >= basis_dir_cnt) {	if (fnamecmp_type > FNAMECMP_FUZZY && fnamecmp_type-FNAMECMP_FUZZY <= basis_dir_cnt) {
	fnamecmp_type -= FNAMECMP_FUZZY + 1;
	if (file->dirname) {
	stringjoin(fnamecmpbuf, sizeof fnamecmpbuf,
	basis_dir[fnamecmp_type], "/", file->dirname, "/", xname, NULL);
	} else
	pathjoin(fnamecmpbuf, sizeof fnamecmpbuf, basis_dir[fnamecmp_type], xname);
	} else if (fnamecmp_type >= basis_dir_cnt) {
rprintf(FERROR,	rprintf(FERROR,
"invalid basis_dir index: %d.\n",	"invalid basis_dir index: %d.\n",
fnamecmp_type);	fnamecmp_type);
exit_cleanup(RERR_PROTOCOL);	exit_cleanup(RERR_PROTOCOL);
}	} else
pathjoin(fnamecmpbuf, sizeof fnamecmpbuf,	pathjoin(fnamecmpbuf, sizeof fnamecmpbuf, basis_dir[fnamecmp_type], fname);
basis_dir[fnamecmp_type], fname);
fnamecmp = fnamecmpbuf;	fnamecmp = fnamecmpbuf;
break;	break;
}	}
if (!fnamecmp \|\| (daemon_filter_list.head	if (!fnamecmp \|\| (daemon_filter_list.head
&& check_filter(&daemon_filter_list, FLOG, fname, 0) < 0)) {	&& check_filter(&daemon_filter_list, FLOG, fnamecmp, 0) < 0)) {
fnamecmp = fname;	fnamecmp = fname;
fnamecmp_type = FNAMECMP_FNAME;	fnamecmp_type = FNAMECMP_FNAME;
}	}
} else {	} else {
/* Reminder: --inplace && --partial-dir are never	/* Reminder: --inplace && --partial-dir are never
* enabled at the same time. */	* enabled at the same time. */
if (inplace && make_backups > 0) {	if (inplace && make_backups > 1) {
if (!(fnamecmp = get_backup_name(fname)))	if (!(fnamecmp = get_backup_name(fname)))
fnamecmp = fname;	fnamecmp = fname;
else	else
Line 638 int recv_files(int f_in, char *local_name)	Line 780 int recv_files(int f_in, char *local_name)
fnamecmp = fname;	fnamecmp = fname;
}	}

initial_stats = stats;

/* open the file */	/* open the file */
fd1 = do_open(fnamecmp, O_RDONLY, 0);	fd1 = do_open(fnamecmp, O_RDONLY, 0);

if (fd1 == -1 && protocol_version < 29) {	if (fd1 == -1 && protocol_version < 29) {
if (fnamecmp != fname) {	if (fnamecmp != fname) {
fnamecmp = fname;	fnamecmp = fname;
	fnamecmp_type = FNAMECMP_FNAME;
fd1 = do_open(fnamecmp, O_RDONLY, 0);	fd1 = do_open(fnamecmp, O_RDONLY, 0);
}	}

Line 654 int recv_files(int f_in, char *local_name)	Line 795 int recv_files(int f_in, char *local_name)
pathjoin(fnamecmpbuf, sizeof fnamecmpbuf,	pathjoin(fnamecmpbuf, sizeof fnamecmpbuf,
basis_dir[0], fname);	basis_dir[0], fname);
fnamecmp = fnamecmpbuf;	fnamecmp = fnamecmpbuf;
	fnamecmp_type = FNAMECMP_BASIS_DIR_LOW;
fd1 = do_open(fnamecmp, O_RDONLY, 0);	fd1 = do_open(fnamecmp, O_RDONLY, 0);
}	}
}	}

updating_basis_or_equiv = inplace	one_inplace = inplace_partial && fnamecmp_type == FNAMECMP_PARTIAL_DIR;
&& (fnamecmp == fname \|\| fnamecmp_type == FNAMECMP_BACKUP);	updating_basis_or_equiv = one_inplace
	\|\| (inplace && (fnamecmp == fname \|\| fnamecmp_type == FNAMECMP_BACKUP));

if (fd1 == -1) {	if (fd1 == -1) {
st.st_mode = 0;	st.st_mode = 0;
Line 667 int recv_files(int f_in, char *local_name)	Line 810 int recv_files(int f_in, char *local_name)
} else if (do_fstat(fd1,&st) != 0) {	} else if (do_fstat(fd1,&st) != 0) {
rsyserr(FERROR_XFER, errno, "fstat %s failed",	rsyserr(FERROR_XFER, errno, "fstat %s failed",
full_fname(fnamecmp));	full_fname(fnamecmp));
discard_receive_data(f_in, F_LENGTH(file));	discard_receive_data(f_in, file);
close(fd1);	close(fd1);
if (inc_recurse)	if (inc_recurse)
send_msg_int(MSG_NO_SEND, ndx);	send_msg_int(MSG_NO_SEND, ndx);
Line 682 int recv_files(int f_in, char *local_name)	Line 825 int recv_files(int f_in, char *local_name)
*/	*/
rprintf(FERROR_XFER, "recv_files: %s is a directory\n",	rprintf(FERROR_XFER, "recv_files: %s is a directory\n",
full_fname(fnamecmp));	full_fname(fnamecmp));
discard_receive_data(f_in, F_LENGTH(file));	discard_receive_data(f_in, file);
close(fd1);	close(fd1);
if (inc_recurse)	if (inc_recurse)
send_msg_int(MSG_NO_SEND, ndx);	send_msg_int(MSG_NO_SEND, ndx);
continue;	continue;
}	}

if (fd1 != -1 && !S_ISREG(st.st_mode)) {	if (fd1 != -1 && !(S_ISREG(st.st_mode) \|\| (write_devices && IS_DEVICE(st.st_mode)))) {
close(fd1);	close(fd1);
fd1 = -1;	fd1 = -1;
}	}

	if (fd1 != -1 && IS_DEVICE(st.st_mode) && st.st_size == 0)
	st.st_size = get_device_size(fd1, fname);

/* If we're not preserving permissions, change the file-list's	/* If we're not preserving permissions, change the file-list's
* mode based on the local permissions and some heuristics. */	* mode based on the local permissions and some heuristics. */
if (!preserve_perms) {	if (!preserve_perms) {
Line 706 int recv_files(int f_in, char *local_name)	Line 852 int recv_files(int f_in, char *local_name)
parent_dirname = dn;	parent_dirname = dn;
}	}
#endif	#endif
file->mode = dest_mode(file->mode, st.st_mode,	file->mode = dest_mode(file->mode, st.st_mode, dflt_perms, exists);
dflt_perms, exists);
}	}

/* We now check to see if we are writing the file "inplace" */	/* We now check to see if we are writing the file "inplace" */
if (inplace) {	if (inplace \|\| one_inplace) {
fd2 = do_open(fname, O_WRONLY\|O_CREAT, 0600);	fnametmp = one_inplace ? partialptr : fname;
	fd2 = do_open(fnametmp, O_WRONLY\|O_CREAT, 0600);
if (fd2 == -1) {	if (fd2 == -1) {
rsyserr(FERROR_XFER, errno, "open %s failed",	rsyserr(FERROR_XFER, errno, "open %s failed",
full_fname(fname));	full_fname(fnametmp));
}	} else if (updating_basis_or_equiv)
	cleanup_set(NULL, NULL, file, fd1, fd2);
} else {	} else {
	fnametmp = fnametmpbuf;
fd2 = open_tmpfile(fnametmp, fname, file);	fd2 = open_tmpfile(fnametmp, fname, file);
if (fd2 != -1)	if (fd2 != -1)
cleanup_set(fnametmp, partialptr, file, fd1, fd2);	cleanup_set(fnametmp, partialptr, file, fd1, fd2);
}	}

if (fd2 == -1) {	if (fd2 == -1) {
discard_receive_data(f_in, F_LENGTH(file));	discard_receive_data(f_in, file);
if (fd1 != -1)	if (fd1 != -1)
close(fd1);	close(fd1);
if (inc_recurse)	if (inc_recurse)
Line 734 int recv_files(int f_in, char *local_name)	Line 882 int recv_files(int f_in, char *local_name)

/* log the transfer */	/* log the transfer */
if (log_before_transfer)	if (log_before_transfer)
log_item(FCLIENT, file, &initial_stats, iflags, NULL);	log_item(FCLIENT, file, iflags, NULL);
else if (!am_server && verbose && do_progress)	else if (!am_server && INFO_GTE(NAME, 1) && INFO_EQ(PROGRESS, 1))
rprintf(FINFO, "%s\n", fname);	rprintf(FINFO, "%s\n", fname);

	if (dest_filter)
	pid = run_filter(filter_argv, fd2, &fd2);

/* recv file data */	/* recv file data */
recv_ok = receive_data(f_in, fnamecmp, fd1, st.st_size,	recv_ok = receive_data(f_in, fnamecmp, fd1, st.st_size, fname, fd2, file, inplace \|\| one_inplace);
fname, fd2, F_LENGTH(file));

log_item(log_code, file, &initial_stats, iflags, NULL);	log_item(log_code, file, iflags, NULL);
	if (want_progress_now)
	instant_progress(fname);

if (fd1 != -1)	if (fd1 != -1)
close(fd1);	close(fd1);
Line 752 int recv_files(int f_in, char *local_name)	Line 904 int recv_files(int f_in, char *local_name)
exit_cleanup(RERR_FILEIO);	exit_cleanup(RERR_FILEIO);
}	}

	if (dest_filter) {
	int status;
	wait_process_with_flush(pid, &status);
	if (status != 0) {
	rprintf(FERROR, "filter %s exited code: %d\n",
	dest_filter, status);
	continue;
	}
	}

if ((recv_ok && (!delay_updates \|\| !partialptr)) \|\| inplace) {	if ((recv_ok && (!delay_updates \|\| !partialptr)) \|\| inplace) {
if (partialptr == fname)	if (partialptr == fname)
partialptr = NULL;	partialptr = NULL;
if (!finish_transfer(fname, fnametmp, fnamecmp,	if (!finish_transfer(fname, fnametmp, fnamecmp, partialptr, file, recv_ok, 1))
partialptr, file, recv_ok, 1))
recv_ok = -1;	recv_ok = -1;
else if (fnamecmp == partialptr) {	else if (fnamecmp == partialptr) {
do_unlink(partialptr);	if (!one_inplace)
	do_unlink(partialptr);
handle_partial_dir(partialptr, PDIR_DELETE);	handle_partial_dir(partialptr, PDIR_DELETE);
}	}
} else if (keep_partial && partialptr) {	if (use_db && do_lstat(fname, &st) == 0)
	db_set_checksum(5, &st, sender_file_sum);
	} else if (keep_partial && partialptr && !one_inplace) {
if (!handle_partial_dir(partialptr, PDIR_CREATE)) {	if (!handle_partial_dir(partialptr, PDIR_CREATE)) {
rprintf(FERROR,	rprintf(FERROR,
"Unable to create partial-dir for %s -- discarding %s.\n",	"Unable to create partial-dir for %s -- discarding %s.\n",
local_name ? local_name : f_name(file, NULL),	local_name ? local_name : f_name(file, NULL),
recv_ok ? "completed file" : "partial file");	recv_ok ? "completed file" : "partial file");
do_unlink(fnametmp);	do_unlink(fnametmp);
recv_ok = -1;	recv_ok = -1;
} else if (!finish_transfer(partialptr, fnametmp, fnamecmp, NULL,	} else if (!finish_transfer(partialptr, fnametmp, fnamecmp, NULL,
Line 775 int recv_files(int f_in, char *local_name)	Line 939 int recv_files(int f_in, char *local_name)
recv_ok = -1;	recv_ok = -1;
else if (delay_updates && recv_ok) {	else if (delay_updates && recv_ok) {
bitbag_set_bit(delayed_bits, ndx);	bitbag_set_bit(delayed_bits, ndx);
	if (use_db && do_lstat(partialptr, &st) == 0)
	db_set_checksum(5, &st, sender_file_sum);
recv_ok = 2;	recv_ok = 2;
} else	} else
partialptr = NULL;	partialptr = NULL;
} else	} else if (!one_inplace)
do_unlink(fnametmp);	do_unlink(fnametmp);

cleanup_disable();	cleanup_disable();
Line 790 int recv_files(int f_in, char *local_name)	Line 956 int recv_files(int f_in, char *local_name)
case 2:	case 2:
break;	break;
case 1:	case 1:
if (remove_source_files \|\| inc_recurse	if (remove_source_files \|\| inc_recurse \|\| checksum_files & CSF_UPDATE
\|\| (preserve_hard_links && F_IS_HLINKED(file)))	\|\| (preserve_hard_links && F_IS_HLINKED(file)))
send_msg_int(MSG_SUCCESS, ndx);	send_msg_int(MSG_SUCCESS, ndx);
break;	break;
case 0: {	case 0: {
enum logcode msgtype = redoing ? FERROR_XFER : FWARNING;	enum logcode msgtype = redoing ? FERROR_XFER : FWARNING;
if (msgtype == FERROR_XFER \|\| verbose) {	if (msgtype == FERROR_XFER \|\| INFO_GTE(NAME, 1)) {
char errstr, redostr, *keptstr;	char errstr, redostr, *keptstr;
if (!(keep_partial && partialptr) && !inplace)	if (!(keep_partial && partialptr) && !inplace)
keptstr = "discarded";	keptstr = "discarded";
Line 825 int recv_files(int f_in, char *local_name)	Line 991 int recv_files(int f_in, char *local_name)
} else if (inc_recurse)	} else if (inc_recurse)
send_msg_int(MSG_NO_SEND, ndx);	send_msg_int(MSG_NO_SEND, ndx);
break;	break;
}	}
case -1:	case -1:
if (inc_recurse)	if (inc_recurse)
send_msg_int(MSG_NO_SEND, ndx);	send_msg_int(MSG_NO_SEND, ndx);
Line 838 int recv_files(int f_in, char *local_name)	Line 1004 int recv_files(int f_in, char *local_name)
if (phase == 2 && delay_updates) /* for protocol_version < 29 */	if (phase == 2 && delay_updates) /* for protocol_version < 29 */
handle_delayed_updates(local_name);	handle_delayed_updates(local_name);

if (verbose > 2)	if (DEBUG_GTE(RECV, 1))
rprintf(FINFO,"recv_files finished\n");	rprintf(FINFO,"recv_files finished\n");

return 0;	return 0;

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.1
changed lines
	Added in v.1.1.1.4