#include "rsync.h"
extern int verbose;
-extern int dry_run;
+extern int do_xfers;
extern int am_daemon;
extern int am_server;
extern int do_progress;
extern int log_before_transfer;
extern int log_format_has_i;
extern int daemon_log_format_has_i;
-extern int delete_after;
extern int csum_length;
extern int read_batch;
+extern int write_batch;
extern int batch_gen_fd;
extern int protocol_version;
extern int relative_paths;
extern char *tmpdir;
extern char *partial_dir;
extern char *basis_dir[];
-
+extern struct file_list *the_file_list;
extern struct filter_list_struct server_filter_list;
-
-/* This deletes any files on the receiving side that are not present on the
- * sending side. This is used by --delete-before and --delete-after. */
-void delete_files(struct file_list *flist)
-{
- char fbuf[MAXPATHLEN];
- int j;
-
- for (j = 0; j < flist->count; j++) {
- struct file_struct *file = flist->files[j];
-
- if (!(file->flags & FLAG_DEL_HERE))
- continue;
-
- f_name_to(file, fbuf);
- if (verbose > 1 && file->flags & FLAG_TOP_DIR)
- rprintf(FINFO, "deleting in %s\n", safe_fname(fbuf));
-
- delete_in_dir(flist, fbuf, file);
- }
-}
-
#define SLOT_SIZE (16*1024) /* Desired size in bytes */
#define PER_SLOT_BITS (SLOT_SIZE * 8) /* Number of bits per slot */
#define PER_SLOT_INTS (SLOT_SIZE / 4) /* Number of int32s per slot */
static uint32 **delayed_bits = NULL;
static int delayed_slot_cnt = 0;
+static int phase = 0;
static void init_delayed_bits(int max_ndx)
{
continue;
}
}
- if (fd != -1 && write_file(fd, map, len) != (int)len)
+ if (fd != -1 && map && write_file(fd, map, len) != (int)len)
goto report_write_error;
offset += len;
}
}
-static void read_gen_name(int fd, char *dirname, char *buf)
+static void discard_receive_data(int f_in, OFF_T length)
{
- int dlen;
- int len = read_byte(fd);
-
- if (len & 0x80) {
-#if MAXPATHLEN > 32767
- uchar lenbuf[2];
- read_buf(fd, (char *)lenbuf, 2);
- len = (len & ~0x80) * 0x10000 + lenbuf[0] * 0x100 + lenbuf[1];
-#else
- len = (len & ~0x80) * 0x100 + read_byte(fd);
-#endif
- }
-
- if (dirname) {
- dlen = strlcpy(buf, dirname, MAXPATHLEN);
- buf[dlen++] = '/';
- } else
- dlen = 0;
+ receive_data(f_in, NULL, -1, 0, NULL, -1, length);
+}
- if (dlen + len >= MAXPATHLEN) {
- rprintf(FERROR, "bogus data on generator name pipe\n");
- exit_cleanup(RERR_PROTOCOL);
+static void handle_delayed_updates(struct file_list *flist, char *local_name)
+{
+ char *fname, *partialptr, numbuf[4];
+ int i;
+
+ for (i = -1; (i = next_delayed_bit(i)) >= 0; ) {
+ struct file_struct *file = flist->files[i];
+ fname = local_name ? local_name : f_name(file);
+ if ((partialptr = partial_dir_fname(fname)) != NULL) {
+ if (make_backups && !make_backup(fname))
+ continue;
+ if (verbose > 2) {
+ rprintf(FINFO, "renaming %s to %s\n",
+ safe_fname(partialptr),
+ safe_fname(fname));
+ }
+ if (do_rename(partialptr, fname) < 0) {
+ rsyserr(FERROR, errno,
+ "rename failed for %s (from %s)",
+ full_fname(fname),
+ safe_fname(partialptr));
+ } else {
+ if (remove_sent_files
+ || (preserve_hard_links
+ && file->link_u.links)) {
+ SIVAL(numbuf, 0, i);
+ send_msg(MSG_SUCCESS,numbuf,4);
+ }
+ handle_partial_dir(partialptr,
+ PDIR_DELETE);
+ }
+ }
}
-
- read_sbuf(fd, buf + dlen, len);
}
-
-static void discard_receive_data(int f_in, OFF_T length)
+static int get_next_gen_i(int batch_gen_fd, int next_gen_i, int desired_i)
{
- receive_data(f_in, NULL, -1, 0, NULL, -1, length);
+ while (next_gen_i < desired_i) {
+ if (next_gen_i >= 0) {
+ rprintf(FINFO,
+ "(No batched update for%s \"%s\")\n",
+ phase ? " resend of" : "",
+ safe_fname(f_name(the_file_list->files[next_gen_i])));
+ }
+ next_gen_i = read_int(batch_gen_fd);
+ if (next_gen_i == -1)
+ next_gen_i = the_file_list->count;
+ }
+ return next_gen_i;
}
* main routine for receiver process.
*
* Receiver process runs on the same host as the generator process. */
-int recv_files(int f_in, struct file_list *flist, char *local_name,
- int f_in_name)
+int recv_files(int f_in, struct file_list *flist, char *local_name)
{
int next_gen_i = -1;
int fd1,fd2;
STRUCT_STAT st;
- int iflags;
+ int iflags, xlen;
char *fname, fbuf[MAXPATHLEN];
- char template[MAXPATHLEN];
+ char xname[MAXPATHLEN];
char fnametmp[MAXPATHLEN];
char *fnamecmp, *partialptr, numbuf[4];
char fnamecmpbuf[MAXPATHLEN];
+ uchar fnamecmp_type;
struct file_struct *file;
struct stats initial_stats;
int save_make_backups = make_backups;
int itemizing = am_daemon ? daemon_log_format_has_i
: !am_server && log_format_has_i;
- int i, recv_ok, phase = 0;
+ int max_phase = protocol_version >= 29 ? 2 : 1;
+ int i, recv_ok;
if (verbose > 2)
rprintf(FINFO,"recv_files(%d) starting\n",flist->count);
i = read_int(f_in);
if (i == -1) {
if (read_batch) {
- if (next_gen_i != flist->count) {
- do {
- if (f_in_name >= 0
- && next_gen_i >= 0)
- read_byte(f_in_name);
- } while (read_int(batch_gen_fd) != -1);
- }
+ get_next_gen_i(batch_gen_fd, next_gen_i,
+ flist->count);
next_gen_i = -1;
}
-
- if (phase)
+ if (++phase > max_phase)
break;
-
- phase = 1;
csum_length = SUM_LENGTH;
if (verbose > 2)
rprintf(FINFO, "recv_files phase=%d\n", phase);
+ if (phase == 2 && delay_updates)
+ handle_delayed_updates(flist, local_name);
send_msg(MSG_DONE, "", 0);
if (keep_partial && !partial_dir)
make_backups = 0; /* prevents double backup */
continue;
}
- if (i < 0 || i >= flist->count) {
- /* Handle the new keep-alive (no-op) packet. */
- if (i == flist->count && protocol_version >= 29
- && read_shortint(f_in) == ITEM_IS_NEW)
- continue;
- rprintf(FERROR,"Invalid file index %d in recv_files (count=%d)\n",
- i, flist->count);
- exit_cleanup(RERR_PROTOCOL);
- }
+ iflags = read_item_attrs(f_in, -1, i, &fnamecmp_type,
+ xname, &xlen);
+ if (iflags == ITEM_IS_NEW) /* no-op packet */
+ continue;
file = flist->files[i];
fname = local_name ? local_name : f_name_to(file, fbuf);
if (verbose > 2)
rprintf(FINFO, "recv_files(%s)\n", safe_fname(fname));
- if (protocol_version >= 29) {
- iflags = read_shortint(f_in);
- if (!(iflags & ITEM_UPDATING) || !S_ISREG(file->mode)) {
- int see_item = itemizing && (iflags || verbose > 1);
- if (am_server) {
- if (am_daemon && !dry_run && see_item)
- log_recv(file, &stats, iflags);
- } else if (see_item || iflags & ITEM_UPDATING
- || (S_ISDIR(file->mode)
- && iflags & ITEM_REPORT_TIME))
- log_recv(file, &stats, iflags);
- continue;
- }
- } else
- iflags = ITEM_UPDATING | ITEM_MISSING_DATA;
-
- if (!S_ISREG(file->mode)) {
- rprintf(FERROR, "[%s] got index of non-regular file: %d\n",
- who_am_i(), i);
+ if (!(iflags & ITEM_TRANSFER)) {
+ maybe_log_item(file, iflags, itemizing, xname);
+ continue;
+ }
+ if (phase == 2) {
+ rprintf(FERROR,
+ "got transfer request in phase 2 [%s]\n",
+ who_am_i());
exit_cleanup(RERR_PROTOCOL);
}
exit_cleanup(RERR_PROTOCOL);
}
- if (dry_run) { /* log the transfer */
+ if (!do_xfers) { /* log the transfer */
if (!am_server && log_format)
- log_recv(file, &stats, iflags);
+ log_item(file, &stats, iflags, NULL);
+ if (read_batch)
+ discard_receive_data(f_in, file->length);
+ continue;
+ }
+ if (write_batch < 0) {
+ log_item(file, &stats, iflags, NULL);
+ if (!am_server)
+ discard_receive_data(f_in, file->length);
continue;
}
if (read_batch) {
- while (i > next_gen_i) {
- if (f_in_name >= 0 && next_gen_i >= 0)
- read_byte(f_in_name);
- next_gen_i = read_int(batch_gen_fd);
- if (next_gen_i == -1)
- next_gen_i = flist->count;
- }
+ next_gen_i = get_next_gen_i(batch_gen_fd, next_gen_i, i);
if (i < next_gen_i) {
- rprintf(FINFO, "skipping update for \"%s\"\n",
+ rprintf(FINFO, "(Skipping batched update for \"%s\")\n",
safe_fname(fname));
discard_receive_data(f_in, file->length);
continue;
partialptr = partial_dir ? partial_dir_fname(fname) : fname;
- if (f_in_name >= 0) {
- uchar j;
- switch (j = read_byte(f_in_name)) {
+ if (protocol_version >= 29) {
+ switch (fnamecmp_type) {
case FNAMECMP_FNAME:
fnamecmp = fname;
break;
case FNAMECMP_PARTIAL_DIR:
- fnamecmp = partialptr ? partialptr : fname;
+ fnamecmp = partialptr;
break;
case FNAMECMP_BACKUP:
fnamecmp = get_backup_name(fname);
break;
case FNAMECMP_FUZZY:
- read_gen_name(f_in_name, file->dirname, fnamecmpbuf);
- fnamecmp = fnamecmpbuf;
+ if (file->dirname) {
+ pathjoin(fnamecmpbuf, MAXPATHLEN,
+ file->dirname, xname);
+ fnamecmp = fnamecmpbuf;
+ } else
+ fnamecmp = xname;
break;
default:
- if (j >= basis_dir_cnt) {
+ if (fnamecmp_type >= basis_dir_cnt) {
rprintf(FERROR,
"invalid basis_dir index: %d.\n",
- j);
+ fnamecmp_type);
exit_cleanup(RERR_PROTOCOL);
}
pathjoin(fnamecmpbuf, sizeof fnamecmpbuf,
- basis_dir[j], fname);
+ basis_dir[fnamecmp_type], fname);
fnamecmp = fnamecmpbuf;
break;
}
- } else
- fnamecmp = fname;
+ if (!fnamecmp || (server_filter_list.head
+ && check_filter(&server_filter_list, fname, 0) < 0))
+ fnamecmp = fname;
+ } else {
+ /* Reminder: --inplace && --partial-dir are never
+ * enabled at the same time. */
+ if (inplace && make_backups) {
+ if (!(fnamecmp = get_backup_name(fname)))
+ fnamecmp = fname;
+ } else if (partial_dir && partialptr)
+ fnamecmp = partialptr;
+ else
+ fnamecmp = fname;
+ }
initial_stats = stats;
/* open the file */
fd1 = do_open(fnamecmp, O_RDONLY, 0);
+ if (fd1 == -1 && protocol_version < 29) {
+ if (fnamecmp != fname) {
+ fnamecmp = fname;
+ fd1 = do_open(fnamecmp, O_RDONLY, 0);
+ }
+
+ if (fd1 == -1 && basis_dir[0]) {
+ /* pre-29 allowed only one alternate basis */
+ pathjoin(fnamecmpbuf, sizeof fnamecmpbuf,
+ basis_dir[0], fname);
+ fnamecmp = fnamecmpbuf;
+ fd1 = do_open(fnamecmp, O_RDONLY, 0);
+ }
+ }
+
if (fd1 != -1 && do_fstat(fd1,&st) != 0) {
rsyserr(FERROR, errno, "fstat %s failed",
full_fname(fnamecmp));
continue;
}
- strlcpy(template, fnametmp, sizeof template);
-
/* we initially set the perms without the
* setuid/setgid bits to ensure that there is no race
* condition. They are then correctly updated after
* transferred, but that may not be the case with -R */
if (fd2 == -1 && relative_paths && errno == ENOENT
&& create_directory_path(fnametmp, orig_umask) == 0) {
- strlcpy(fnametmp, template, sizeof fnametmp);
+ /* Get back to name with XXXXXX in it. */
+ get_tmpname(fnametmp, fname);
fd2 = do_mkstemp(fnametmp, file->mode & INITACCESSPERMS);
}
if (fd2 == -1) {
/* log the transfer */
if (log_before_transfer)
- log_recv(file, &initial_stats, iflags);
+ log_item(file, &initial_stats, iflags, NULL);
else if (!am_server && verbose && do_progress)
rprintf(FINFO, "%s\n", safe_fname(fname));
fname, fd2, file->length);
if (!log_before_transfer)
- log_recv(file, &initial_stats, iflags);
+ log_item(file, &initial_stats, iflags, NULL);
if (fd1 != -1)
close(fd1);
cleanup_disable();
- if (recv_ok) {
- if (remove_sent_files && recv_ok > 0) {
+ if (recv_ok > 0) {
+ if (remove_sent_files
+ || (preserve_hard_links && file->link_u.links)) {
SIVAL(numbuf, 0, i);
send_msg(MSG_SUCCESS, numbuf, 4);
}
- } else {
- int msgtype = csum_length == SUM_LENGTH || read_batch ?
- FERROR : FINFO;
+ } else if (!recv_ok) {
+ int msgtype = phase || read_batch ? FERROR : FINFO;
if (msgtype == FERROR || verbose) {
char *errstr, *redostr, *keptstr;
if (!(keep_partial && partialptr) && !inplace)
errstr, safe_fname(fname),
keptstr, redostr);
}
- if (csum_length != SUM_LENGTH) {
+ if (!phase) {
SIVAL(numbuf, 0, i);
send_msg(MSG_REDO, numbuf, 4);
}
}
make_backups = save_make_backups;
- if (delay_updates) {
- for (i = -1; (i = next_delayed_bit(i)) >= 0; ) {
- struct file_struct *file = flist->files[i];
- fname = local_name ? local_name : f_name(file);
- partialptr = partial_dir_fname(fname);
- if (partialptr) {
- if (make_backups && !make_backup(fname))
- continue;
- if (verbose > 2) {
- rprintf(FINFO, "renaming %s to %s\n",
- safe_fname(partialptr),
- safe_fname(fname));
- }
- if (do_rename(partialptr, fname) < 0) {
- rsyserr(FERROR, errno,
- "rename failed for %s (from %s)",
- full_fname(fname),
- safe_fname(partialptr));
- } else {
- if (remove_sent_files) {
- SIVAL(numbuf, 0, i);
- send_msg(MSG_SUCCESS,numbuf,4);
- }
- handle_partial_dir(partialptr,
- PDIR_DELETE);
- }
- }
- }
- }
-
- if (delete_after && !local_name && flist->count > 0)
- delete_files(flist);
+ if (phase == 2 && delay_updates) /* for protocol_version < 29 */
+ handle_delayed_updates(flist, local_name);
if (verbose > 2)
rprintf(FINFO,"recv_files finished\n");
git.samba.org / rsync.git / blobdiff