X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/b78296cb0b14777a318635d0608a9bb55ac6ff0d..32cbfe7b17ba8ec661fc27fd773909709d100e8a:/receiver.c diff --git a/receiver.c b/receiver.c index c1e4232e..b71d5996 100644 --- a/receiver.c +++ b/receiver.c @@ -21,27 +21,26 @@ #include "rsync.h" extern int verbose; -extern int itemize_changes; -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; @@ -49,29 +48,75 @@ extern int keep_partial; 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 */ -/* 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 uint32 **delayed_bits = NULL; +static int delayed_slot_cnt = 0; + +static void init_delayed_bits(int max_ndx) { - char fbuf[MAXPATHLEN]; - int j; + delayed_slot_cnt = (max_ndx + PER_SLOT_BITS - 1) / PER_SLOT_BITS; - for (j = 0; j < flist->count; j++) { - struct file_struct *file = flist->files[j]; + if (!(delayed_bits = (uint32**)calloc(delayed_slot_cnt, sizeof (uint32*)))) + out_of_memory("set_delayed_bit"); +} - if (!(file->flags & FLAG_DEL_HERE)) - continue; +static void set_delayed_bit(int ndx) +{ + int slot = ndx / PER_SLOT_BITS; + ndx %= PER_SLOT_BITS; - f_name_to(file, fbuf); - if (verbose > 1 && file->flags & FLAG_TOP_DIR) - rprintf(FINFO, "deleting in %s\n", safe_fname(fbuf)); + if (!delayed_bits[slot]) { + if (!(delayed_bits[slot] = (uint32*)calloc(PER_SLOT_INTS, 4))) + out_of_memory("set_delayed_bit"); + } + + delayed_bits[slot][ndx/32] |= 1u << (ndx % 32); +} - delete_in_dir(flist, fbuf, file); +/* 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; } @@ -304,15 +349,17 @@ 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; 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) @@ -323,12 +370,8 @@ int recv_files(int f_in, struct file_list *flist, char *local_name, 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(); @@ -360,14 +403,39 @@ int recv_files(int f_in, struct file_list *flist, char *local_name, } 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); } file = flist->files[i]; - if (S_ISDIR(file->mode)) { - rprintf(FERROR, "[%s] got index of directory: %d\n", + 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); exit_cleanup(RERR_PROTOCOL); } @@ -377,25 +445,18 @@ int recv_files(int f_in, struct file_list *flist, char *local_name, stats.total_transferred_size += file->length; cleanup_got_literal = 0; - fname = local_name ? local_name : 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 (verbose > 2) - rprintf(FINFO, "recv_files(%s)\n", safe_fname(fname)); - if (dry_run) { /* log the transfer */ - if (!am_server && verbose && !itemize_changes) - rprintf(FINFO, "%s\n", safe_fname(fname)); + if (!am_server && log_format) + log_recv(file, &stats, iflags); continue; } - initial_stats = stats; - if (read_batch) { while (i > next_gen_i) { if (f_in_name >= 0 && next_gen_i >= 0) @@ -446,6 +507,8 @@ int recv_files(int f_in, struct file_list *flist, char *local_name, } else fnamecmp = fname; + initial_stats = stats; + /* open the file */ fd1 = do_open(fnamecmp, O_RDONLY, 0); @@ -533,14 +596,17 @@ int recv_files(int f_in, struct file_list *flist, char *local_name, } /* log the transfer */ - if (!am_server && verbose && !itemize_changes) + if (log_before_transfer) + log_recv(file, &initial_stats, iflags); + 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_recv(file, &initial_stats, iflags); if (fd1 != -1) close(fd1); @@ -560,8 +626,10 @@ int recv_files(int f_in, struct file_list *flist, char *local_name, && 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); @@ -569,7 +637,12 @@ int recv_files(int f_in, struct file_list *flist, char *local_name, cleanup_disable(); - if (!recv_ok) { + if (recv_ok) { + if (remove_sent_files && recv_ok > 0) { + SIVAL(numbuf, 0, i); + send_msg(MSG_SUCCESS, numbuf, 4); + } + } else { int msgtype = csum_length == SUM_LENGTH || read_batch ? FERROR : FINFO; if (msgtype == FERROR || verbose) { @@ -593,20 +666,16 @@ int recv_files(int f_in, struct file_list *flist, char *local_name, keptstr, redostr); } if (csum_length != SUM_LENGTH) { - char buf[4]; - SIVAL(buf, 0, i); - send_msg(MSG_REDO, buf, 4); + 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) { @@ -623,6 +692,10 @@ int recv_files(int f_in, struct file_list *flist, char *local_name, 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); } @@ -630,9 +703,6 @@ int recv_files(int f_in, struct file_list *flist, char *local_name, } } - if (delete_after && !local_name && flist->count > 0) - delete_files(flist); - if (verbose > 2) rprintf(FINFO,"recv_files finished\n");