#include "rsync.h"
extern int verbose;
-extern int delete_after;
-extern int csum_length;
-extern struct stats stats;
extern int dry_run;
+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 csum_length;
extern int read_batch;
extern int batch_gen_fd;
-extern int am_server;
extern int protocol_version;
extern int relative_paths;
extern int keep_dirlinks;
extern int preserve_hard_links;
extern int preserve_perms;
extern int io_error;
-extern char *tmpdir;
-extern char *partial_dir;
-extern char *basis_dir[];
extern int basis_dir_cnt;
extern int make_backups;
-extern int do_progress;
extern int cleanup_got_literal;
+extern int remove_sent_files;
extern int module_id;
extern int ignore_errors;
extern int orig_umask;
extern int checksum_seed;
extern int inplace;
extern int delay_updates;
+extern struct stats stats;
+extern char *log_format;
+extern char *tmpdir;
+extern char *partial_dir;
+extern char *basis_dir[];
extern struct filter_list_struct server_filter_list;
+#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;
-/* 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)
+static void init_delayed_bits(int max_ndx)
{
- struct file_list *dir_list;
- char *argv[1], fbuf[MAXPATHLEN];
- int j;
-
- if (io_error && !(lp_ignore_errors(module_id) || ignore_errors)) {
- rprintf(FINFO,
- "IO error encountered - skipping file deletion\n");
- return;
- }
+ delayed_slot_cnt = (max_ndx + PER_SLOT_BITS - 1) / PER_SLOT_BITS;
- for (j = 0; j < flist->count; j++) {
- if (!(flist->files[j]->flags & FLAG_DEL_START)
- || !S_ISDIR(flist->files[j]->mode))
- continue;
+ if (!(delayed_bits = (uint32**)calloc(delayed_slot_cnt, sizeof (uint32*))))
+ out_of_memory("set_delayed_bit");
+}
- argv[0] = f_name_to(flist->files[j], fbuf);
+static void set_delayed_bit(int ndx)
+{
+ int slot = ndx / PER_SLOT_BITS;
+ ndx %= PER_SLOT_BITS;
- if (!(dir_list = send_file_list(-1, 1, argv)))
- continue;
+ if (!delayed_bits[slot]) {
+ if (!(delayed_bits[slot] = (uint32*)calloc(PER_SLOT_INTS, 4)))
+ out_of_memory("set_delayed_bit");
+ }
- delete_missing(flist, dir_list, fbuf);
+ delayed_bits[slot][ndx/32] |= 1u << (ndx % 32);
+}
- flist_free(dir_list);
+/* Call this with -1 to start checking from 0. Returns -1 at the end. */
+static int next_delayed_bit(int after)
+{
+ uint32 bits, mask;
+ int i, ndx = after + 1;
+ int slot = ndx / PER_SLOT_BITS;
+ ndx %= PER_SLOT_BITS;
+
+ mask = (1u << (ndx % 32)) - 1;
+ for (i = ndx / 32; slot < delayed_slot_cnt; slot++, i = mask = 0) {
+ if (!delayed_bits[slot])
+ continue;
+ for ( ; i < PER_SLOT_INTS; i++, mask = 0) {
+ if (!(bits = delayed_bits[slot][i] & ~mask))
+ continue;
+ /* The xor magic figures out the lowest enabled bit in
+ * bits, and the switch quickly computes log2(bit). */
+ switch (bits ^ (bits & (bits-1))) {
+#define LOG2(n) case 1u << n: return slot*PER_SLOT_BITS + i*32 + n
+ LOG2(0); LOG2(1); LOG2(2); LOG2(3);
+ LOG2(4); LOG2(5); LOG2(6); LOG2(7);
+ LOG2(8); LOG2(9); LOG2(10); LOG2(11);
+ LOG2(12); LOG2(13); LOG2(14); LOG2(15);
+ LOG2(16); LOG2(17); LOG2(18); LOG2(19);
+ LOG2(20); LOG2(21); LOG2(22); LOG2(23);
+ LOG2(24); LOG2(25); LOG2(26); LOG2(27);
+ LOG2(28); LOG2(29); LOG2(30); LOG2(31);
+ }
+ return -1; /* impossible... */
+ }
}
+
+ return -1;
}
maxname = MIN(MAXPATHLEN - 7 - length, NAME_MAX - 8);
if (maxname < 1) {
- rprintf(FERROR, "temporary filename too long: %s\n", fname);
+ rprintf(FERROR, "temporary filename too long: %s\n",
+ safe_fname(fname));
fnametmp[0] = '\0';
return 0;
}
if (flush_write_file(fd) < 0)
goto report_write_error;
-#if HAVE_FTRUNCATE
+#ifdef HAVE_FTRUNCATE
if (inplace && fd != -1)
ftruncate(fd, offset);
#endif
}
+static void read_gen_name(int fd, char *dirname, char *buf)
+{
+ int dlen;
+
+ if (dirname) {
+ dlen = strlcpy(buf, dirname, MAXPATHLEN);
+ buf[dlen++] = '/';
+ } else
+ dlen = 0;
+
+ read_vstring(fd, buf + dlen, MAXPATHLEN - dlen);
+}
+
+
static void discard_receive_data(int f_in, OFF_T length)
{
receive_data(f_in, NULL, -1, 0, NULL, -1, length);
int next_gen_i = -1;
int fd1,fd2;
STRUCT_STAT st;
+ int iflags;
char *fname, fbuf[MAXPATHLEN];
char template[MAXPATHLEN];
char fnametmp[MAXPATHLEN];
- char *fnamecmp, *partialptr;
+ char *fnamecmp, *partialptr, numbuf[4];
char fnamecmpbuf[MAXPATHLEN];
- uchar *delayed_bits = NULL;
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;
if (verbose > 2)
flist->hlink_pool = NULL;
}
- if (delay_updates) {
- int sz = (flist->count + 7) / 8;
- if (!(delayed_bits = new_array(uchar, sz)))
- out_of_memory("recv_files");
- memset(delayed_bits, 0, sz);
- }
+ if (delay_updates)
+ init_delayed_bits(flist->count);
while (1) {
cleanup_disable();
continue;
}
- if (i < 0 || i >= flist->count) {
- rprintf(FERROR,"Invalid file index %d in recv_files (count=%d)\n",
- i, flist->count);
- exit_cleanup(RERR_PROTOCOL);
- }
+ iflags = read_iflags(f_in, -1, i, fnametmp);
+ 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 (!(iflags & ITEM_TRANSFER)) {
+ maybe_log_item(file, iflags, itemizing, fnametmp);
+ continue;
+ }
stats.current_file_index = i;
stats.num_transferred_files++;
stats.total_transferred_size += file->length;
cleanup_got_literal = 0;
- if (local_name)
- fname = local_name;
- else
- fname = f_name_to(file, fbuf);
+ if (server_filter_list.head
+ && check_filter(&server_filter_list, fname, 0) < 0) {
+ rprintf(FERROR, "attempt to hack rsync failed.\n");
+ exit_cleanup(RERR_PROTOCOL);
+ }
- if (dry_run) {
- if (!am_server && verbose) /* log the transfer */
- rprintf(FINFO, "%s\n", safe_fname(fname));
+ if (dry_run) { /* log the transfer */
+ if (!am_server && log_format)
+ log_item(file, &stats, iflags, NULL);
continue;
}
- initial_stats = stats;
-
- if (verbose > 2)
- rprintf(FINFO, "recv_files(%s)\n", safe_fname(fname));
-
if (read_batch) {
while (i > next_gen_i) {
if (f_in_name >= 0 && next_gen_i >= 0)
next_gen_i = -1;
}
- if (server_filter_list.head
- && check_filter(&server_filter_list, fname,
- S_ISDIR(file->mode)) < 0) {
- rprintf(FERROR, "attempt to hack rsync failed.\n");
- exit_cleanup(RERR_PROTOCOL);
- }
-
partialptr = partial_dir ? partial_dir_fname(fname) : fname;
if (f_in_name >= 0) {
case FNAMECMP_BACKUP:
fnamecmp = get_backup_name(fname);
break;
+ case FNAMECMP_FUZZY:
+ read_gen_name(f_in_name, file->dirname, fnamecmpbuf);
+ fnamecmp = fnamecmpbuf;
+ break;
default:
if (j >= basis_dir_cnt) {
rprintf(FERROR,
} else
fnamecmp = fname;
+ initial_stats = stats;
+
/* open the file */
fd1 = do_open(fnamecmp, O_RDONLY, 0);
cleanup_set(fnametmp, partialptr, file, fd1, fd2);
}
- if (!am_server && verbose) /* log the transfer */
+ /* log the transfer */
+ if (log_before_transfer)
+ log_item(file, &initial_stats, iflags, NULL);
+ else if (!am_server && verbose && do_progress)
rprintf(FINFO, "%s\n", safe_fname(fname));
/* recv file data */
recv_ok = receive_data(f_in, fnamecmp, fd1, st.st_size,
fname, fd2, file->length);
- log_recv(file, &initial_stats);
+ if (!log_before_transfer)
+ log_item(file, &initial_stats, iflags, NULL);
if (fd1 != -1)
close(fd1);
exit_cleanup(RERR_FILEIO);
}
- if ((recv_ok && !delay_updates) || inplace) {
+ if ((recv_ok && (!delay_updates || !partialptr)) || inplace) {
finish_transfer(fname, fnametmp, file, recv_ok, 1);
if (partialptr != fname && fnamecmp == partialptr) {
do_unlink(partialptr);
&& handle_partial_dir(partialptr, PDIR_CREATE)) {
finish_transfer(partialptr, fnametmp, file, recv_ok,
!partial_dir);
- if (delay_updates && recv_ok)
- delayed_bits[i/8] |= 1 << (i % 8);
+ if (delay_updates && recv_ok) {
+ set_delayed_bit(i);
+ recv_ok = -1;
+ }
} else {
partialptr = NULL;
do_unlink(fnametmp);
cleanup_disable();
- if (!recv_ok) {
- int msgtype = csum_length == SUM_LENGTH || read_batch ?
- FERROR : FINFO;
+ 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 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) {
- char buf[4];
- SIVAL(buf, 0, i);
- send_msg(MSG_REDO, buf, 4);
+ if (!phase) {
+ SIVAL(numbuf, 0, i);
+ send_msg(MSG_REDO, numbuf, 4);
}
}
}
make_backups = save_make_backups;
if (delay_updates) {
- for (i = 0; i < flist->count; i++) {
+ for (i = -1; (i = next_delayed_bit(i)) >= 0; ) {
struct file_struct *file = flist->files[i];
- if (!file->basename
- || !(delayed_bits[i/8] & (1 << (i % 8))))
- continue;
fname = local_name ? local_name : f_name(file);
partialptr = partial_dir_fname(fname);
if (partialptr) {
continue;
if (verbose > 2) {
rprintf(FINFO, "renaming %s to %s\n",
- partialptr, fname);
+ safe_fname(partialptr),
+ safe_fname(fname));
}
if (do_rename(partialptr, fname) < 0) {
rsyserr(FERROR, errno,
"rename failed for %s (from %s)",
- fname, partialptr);
+ 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);
}
}
}
- if (delete_after && !local_name && flist->count > 0)
- delete_files(flist);
-
if (verbose > 2)
rprintf(FINFO,"recv_files finished\n");
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff