#include "rsync.h"
extern int verbose;
-extern int recurse;
-extern int delete_mode;
-extern int protocol_version;
-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 protocol_version;
extern int relative_paths;
+extern int keep_dirlinks;
extern int preserve_hard_links;
-extern int cvs_exclude;
+extern int preserve_perms;
extern int io_error;
-extern char *tmpdir;
-extern char *compare_dest;
+extern int basis_dir_cnt;
extern int make_backups;
-extern int do_progress;
-extern char *backup_dir;
-extern char *backup_suffix;
-extern int backup_suffix_len;
-
-static struct delete_list {
- DEV64_T dev;
- INO64_T inode;
-} *delete_list;
-static int dlist_len, dlist_alloc_len;
-
-/* yuck! This function wouldn't have been necessary if I had the sorting
- * algorithm right. Unfortunately fixing the sorting algorithm would introduce
- * a backward incompatibility as file list indexes are sent over the link.
- */
-static int delete_already_done(struct file_list *flist,int j)
-{
- int i;
- STRUCT_STAT st;
+extern int cleanup_got_literal;
+extern int remove_sent_files;
+extern int module_id;
+extern int ignore_errors;
+extern int orig_umask;
+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[];
- if (link_stat(f_name(flist->files[j]), &st)) return 1;
+extern struct filter_list_struct server_filter_list;
- for (i = 0; i < dlist_len; i++) {
- if (st.st_ino == delete_list[i].inode &&
- (DEV64_T)st.st_dev == delete_list[i].dev)
- return 1;
- }
+#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 */
- return 0;
-}
+static uint32 **delayed_bits = NULL;
+static int delayed_slot_cnt = 0;
-static void add_delete_entry(struct file_struct *file)
+static void init_delayed_bits(int max_ndx)
{
- if (dlist_len == dlist_alloc_len) {
- dlist_alloc_len += 1024;
- delete_list = realloc_array(delete_list, struct delete_list,
- dlist_alloc_len);
- if (!delete_list) out_of_memory("add_delete_entry");
- }
-
- delete_list[dlist_len].dev = file->dev;
- delete_list[dlist_len].inode = file->inode;
- dlist_len++;
+ delayed_slot_cnt = (max_ndx + PER_SLOT_BITS - 1) / PER_SLOT_BITS;
- if (verbose > 3)
- rprintf(FINFO,"added %s to delete list\n", f_name(file));
+ if (!(delayed_bits = (uint32**)calloc(delayed_slot_cnt, sizeof (uint32*))))
+ out_of_memory("set_delayed_bit");
}
-static void delete_one(char *fn, int is_dir)
+static void set_delayed_bit(int ndx)
{
- if (!is_dir) {
- if (robust_unlink(fn) != 0) {
- rprintf(FERROR, "delete_one: unlink %s failed: %s\n",
- full_fname(fn), strerror(errno));
- } else if (verbose) {
- rprintf(FINFO, "deleting %s\n", fn);
- }
- } else {
- if (do_rmdir(fn) != 0) {
- if (errno != ENOTEMPTY && errno != EEXIST) {
- rprintf(FERROR, "delete_one: rmdir %s failed: %s\n",
- full_fname(fn), strerror(errno));
- }
- } else if (verbose) {
- rprintf(FINFO, "deleting directory %s\n", fn);
- }
- }
-}
+ int slot = ndx / PER_SLOT_BITS;
+ ndx %= PER_SLOT_BITS;
+ if (!delayed_bits[slot]) {
+ if (!(delayed_bits[slot] = (uint32*)calloc(PER_SLOT_INTS, 4)))
+ out_of_memory("set_delayed_bit");
+ }
-static int is_backup_file(char *fn)
-{
- int k = strlen(fn) - backup_suffix_len;
- return k > 0 && strcmp(fn+k, backup_suffix) == 0;
+ delayed_bits[slot][ndx/32] |= 1u << (ndx % 32);
}
-
-/* this deletes any files on the receiving side that are not present
- * on the sending side. For version 1.6.4 I have changed the behaviour
- * to match more closely what most people seem to expect of this option */
-void delete_files(struct file_list *flist)
+/* Call this with -1 to start checking from 0. Returns -1 at the end. */
+static int next_delayed_bit(int after)
{
- struct file_list *local_file_list;
- int i, j;
- char *name, fbuf[MAXPATHLEN];
- extern int module_id;
- extern int ignore_errors;
- extern int max_delete;
- static int deletion_count;
-
- if (cvs_exclude)
- add_cvs_excludes();
-
- if (io_error && !(lp_ignore_errors(module_id) || ignore_errors)) {
- rprintf(FINFO,"IO error encountered - skipping file deletion\n");
- return;
- }
-
- for (j = 0;j < flist->count; j++) {
- if (!S_ISDIR(flist->files[j]->mode) ||
- !(flist->files[j]->flags & FLAG_DELETE)) continue;
-
- if (protocol_version < 19 &&
- delete_already_done(flist, j)) continue;
-
- name = f_name_to(flist->files[j], fbuf, sizeof fbuf);
-
- if (!(local_file_list = send_file_list(-1,1,&name)))
+ 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;
-
- if (verbose > 1)
- rprintf(FINFO,"deleting in %s\n", name);
-
- for (i = local_file_list->count-1; i >= 0; i--) {
- if (max_delete && deletion_count > max_delete) break;
- if (!local_file_list->files[i]->basename) continue;
- if (protocol_version < 19 &&
- S_ISDIR(local_file_list->files[i]->mode))
- add_delete_entry(local_file_list->files[i]);
- if (-1 == flist_find(flist,local_file_list->files[i])) {
- char *f = f_name(local_file_list->files[i]);
- if (make_backups && (backup_dir || !is_backup_file(f))) {
- (void) make_backup(f);
- if (verbose)
- rprintf(FINFO, "deleting %s\n", f);
- } else {
- int mode = local_file_list->files[i]->mode;
- delete_one(f, S_ISDIR(mode) != 0);
- }
- deletion_count++;
+ 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... */
}
- flist_free(local_file_list);
}
+
+ return -1;
}
int maxname;
if (tmpdir) {
- strlcpy(fnametmp, tmpdir, MAXPATHLEN - 2);
- length = strlen(fnametmp);
+ /* Note: this can't overflow, so the return value is safe */
+ length = strlcpy(fnametmp, tmpdir, MAXPATHLEN - 2);
fnametmp[length++] = '/';
fnametmp[length] = '\0'; /* always NULL terminated */
}
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;
}
}
-static int receive_data(int f_in,struct map_struct *mapbuf,int fd,char *fname,
- OFF_T total_size)
+static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
+ char *fname, int fd, OFF_T total_size)
{
- int i;
+ static char file_sum1[MD4_SUM_LENGTH];
+ static char file_sum2[MD4_SUM_LENGTH];
+ struct map_struct *mapbuf;
struct sum_struct sum;
- unsigned int len;
+ int32 len;
OFF_T offset = 0;
OFF_T offset2;
char *data;
- static char file_sum1[MD4_SUM_LENGTH];
- static char file_sum2[MD4_SUM_LENGTH];
- char *map=NULL;
+ int32 i;
+ char *map = NULL;
read_sum_head(f_in, &sum);
- sum_init();
+ if (fd_r >= 0 && size_r > 0) {
+ int32 read_size = MAX(sum.blength * 2, 16*1024);
+ mapbuf = map_file(fd_r, size_r, read_size, sum.blength);
+ if (verbose > 2) {
+ rprintf(FINFO, "recv mapped %s of size %.0f\n",
+ safe_fname(fname_r), (double)size_r);
+ }
+ } else
+ mapbuf = NULL;
+
+ sum_init(checksum_seed);
- for (i=recv_token(f_in,&data); i != 0; i=recv_token(f_in,&data)) {
+ while ((i = recv_token(f_in, &data)) != 0) {
if (do_progress)
show_progress(offset, total_size);
if (i > 0) {
- extern int cleanup_got_literal;
-
if (verbose > 3) {
rprintf(FINFO,"data recv %d at %.0f\n",
i,(double)offset);
stats.literal_data += i;
cleanup_got_literal = 1;
- sum_update(data,i);
+ sum_update(data, i);
- if (fd != -1 && write_file(fd,data,i) != i) {
- rprintf(FERROR, "write failed on %s: %s\n",
- full_fname(fname), strerror(errno));
- exit_cleanup(RERR_FILEIO);
- }
+ if (fd != -1 && write_file(fd,data,i) != i)
+ goto report_write_error;
offset += i;
continue;
}
i = -(i+1);
- offset2 = i*(OFF_T)sum.blength;
+ offset2 = i * (OFF_T)sum.blength;
len = sum.blength;
- if (i == (int) sum.count-1 && sum.remainder != 0)
+ if (i == (int)sum.count-1 && sum.remainder != 0)
len = sum.remainder;
stats.matched_data += len;
- if (verbose > 3)
- rprintf(FINFO,"chunk[%d] of size %d at %.0f offset=%.0f\n",
- i,len,(double)offset2,(double)offset);
+ if (verbose > 3) {
+ rprintf(FINFO,
+ "chunk[%d] of size %ld at %.0f offset=%.0f\n",
+ i, (long)len, (double)offset2, (double)offset);
+ }
if (mapbuf) {
map = map_ptr(mapbuf,offset2,len);
see_token(map, len);
- sum_update(map,len);
+ sum_update(map, len);
}
- if (fd != -1 && write_file(fd,map,len) != (int) len) {
- rprintf(FERROR, "write failed on %s: %s\n",
- full_fname(fname), strerror(errno));
- exit_cleanup(RERR_FILEIO);
+ if (inplace) {
+ if (offset == offset2 && fd != -1) {
+ if (flush_write_file(fd) < 0)
+ goto report_write_error;
+ offset += len;
+ if (do_lseek(fd, len, SEEK_CUR) != offset) {
+ rsyserr(FERROR, errno,
+ "lseek failed on %s",
+ full_fname(fname));
+ exit_cleanup(RERR_FILEIO);
+ }
+ continue;
+ }
}
+ if (fd != -1 && write_file(fd, map, len) != (int)len)
+ goto report_write_error;
offset += len;
}
+ if (flush_write_file(fd) < 0)
+ goto report_write_error;
+
+#ifdef HAVE_FTRUNCATE
+ if (inplace && fd != -1)
+ ftruncate(fd, offset);
+#endif
+
if (do_progress)
end_progress(total_size);
if (fd != -1 && offset > 0 && sparse_end(fd) != 0) {
- rprintf(FERROR, "write failed on %s: %s\n",
- full_fname(fname), strerror(errno));
+ report_write_error:
+ rsyserr(FERROR, errno, "write failed on %s",
+ full_fname(fname));
exit_cleanup(RERR_FILEIO);
}
sum_end(file_sum1);
+ if (mapbuf)
+ unmap_file(mapbuf);
+
read_buf(f_in,file_sum2,MD4_SUM_LENGTH);
- if (verbose > 2) {
+ if (verbose > 2)
rprintf(FINFO,"got file_sum\n");
- }
- if (fd != -1 && memcmp(file_sum1,file_sum2,MD4_SUM_LENGTH) != 0) {
+ if (fd != -1 && memcmp(file_sum1, file_sum2, MD4_SUM_LENGTH) != 0)
return 0;
- }
return 1;
}
+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);
+}
+
+
/**
* 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_gen)
+int recv_files(int f_in, struct file_list *flist, char *local_name,
+ int f_in_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;
+ char *fnamecmp, *partialptr, numbuf[4];
char fnamecmpbuf[MAXPATHLEN];
- struct map_struct *mapbuf;
- int i;
struct file_struct *file;
- int phase=0;
- int recv_ok;
- extern struct stats stats;
- extern int preserve_perms;
- extern int delete_after;
- extern int orig_umask;
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) {
+ if (verbose > 2)
rprintf(FINFO,"recv_files(%d) starting\n",flist->count);
+
+ if (flist->hlink_pool) {
+ pool_destroy(flist->hlink_pool);
+ flist->hlink_pool = NULL;
}
+ if (delay_updates)
+ init_delayed_bits(flist->count);
+
while (1) {
cleanup_disable();
i = read_int(f_in);
if (i == -1) {
- if (phase==0) {
- phase++;
- csum_length = SUM_LENGTH;
- if (verbose > 2)
- rprintf(FINFO,"recv_files phase=%d\n",phase);
- write_int(f_gen,-1);
- continue;
+ 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);
+ }
+ next_gen_i = -1;
}
- break;
- }
- 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);
+ if (phase)
+ break;
+
+ phase = 1;
+ csum_length = SUM_LENGTH;
+ if (verbose > 2)
+ rprintf(FINFO, "recv_files phase=%d\n", phase);
+ send_msg(MSG_DONE, "", 0);
+ if (keep_partial && !partial_dir)
+ make_backups = 0; /* prevents double backup */
+ continue;
}
+ 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, sizeof 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 transfer */
- rprintf(FINFO, "%s\n", fname);
- }
+ if (dry_run) { /* log the transfer */
+ if (!am_server && log_format)
+ log_item(file, &stats, iflags, NULL);
continue;
}
- initial_stats = stats;
+ 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;
+ }
+ if (i < next_gen_i) {
+ rprintf(FINFO, "skipping update for \"%s\"\n",
+ safe_fname(fname));
+ discard_receive_data(f_in, file->length);
+ continue;
+ }
+ next_gen_i = -1;
+ }
- if (verbose > 2)
- rprintf(FINFO,"recv_files(%s)\n",fname);
+ partialptr = partial_dir ? partial_dir_fname(fname) : fname;
+
+ if (f_in_name >= 0) {
+ uchar j;
+ switch (j = read_byte(f_in_name)) {
+ case FNAMECMP_FNAME:
+ fnamecmp = fname;
+ break;
+ case FNAMECMP_PARTIAL_DIR:
+ fnamecmp = partialptr ? partialptr : fname;
+ break;
+ 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,
+ "invalid basis_dir index: %d.\n",
+ j);
+ exit_cleanup(RERR_PROTOCOL);
+ }
+ pathjoin(fnamecmpbuf, sizeof fnamecmpbuf,
+ basis_dir[j], fname);
+ fnamecmp = fnamecmpbuf;
+ break;
+ }
+ } else
+ fnamecmp = fname;
- fnamecmp = fname;
+ initial_stats = stats;
/* open the file */
fd1 = do_open(fnamecmp, O_RDONLY, 0);
- if ((fd1 == -1) && (compare_dest != NULL)) {
- /* try the file at compare_dest instead */
- snprintf(fnamecmpbuf,MAXPATHLEN,"%s/%s",
- compare_dest,fname);
- fnamecmp = fnamecmpbuf;
- fd1 = do_open(fnamecmp, O_RDONLY, 0);
- }
-
if (fd1 != -1 && do_fstat(fd1,&st) != 0) {
- rprintf(FERROR, "fstat %s failed: %s\n",
- full_fname(fnamecmp), strerror(errno));
- receive_data(f_in,NULL,-1,NULL,file->length);
+ rsyserr(FERROR, errno, "fstat %s failed",
+ full_fname(fnamecmp));
+ discard_receive_data(f_in, file->length);
close(fd1);
continue;
}
*/
rprintf(FERROR,"recv_files: %s is a directory\n",
full_fname(fnamecmp));
- receive_data(f_in, NULL, -1, NULL, file->length);
+ discard_receive_data(f_in, file->length);
close(fd1);
continue;
}
if (fd1 != -1 && !S_ISREG(st.st_mode)) {
close(fd1);
fd1 = -1;
- mapbuf = NULL;
}
if (fd1 != -1 && !preserve_perms) {
file->mode = st.st_mode;
}
- if (fd1 != -1 && st.st_size > 0) {
- mapbuf = map_file(fd1,st.st_size);
- if (verbose > 2)
- rprintf(FINFO,"recv mapped %s of size %.0f\n",fnamecmp,(double)st.st_size);
- } else
- mapbuf = NULL;
+ /* We now check to see if we are writing file "inplace" */
+ if (inplace) {
+ fd2 = do_open(fname, O_WRONLY|O_CREAT, 0);
+ if (fd2 == -1) {
+ rsyserr(FERROR, errno, "open %s failed",
+ full_fname(fname));
+ discard_receive_data(f_in, file->length);
+ if (fd1 != -1)
+ close(fd1);
+ continue;
+ }
+ } else {
+ if (!get_tmpname(fnametmp,fname)) {
+ discard_receive_data(f_in, file->length);
+ if (fd1 != -1)
+ close(fd1);
+ continue;
+ }
- if (!get_tmpname(fnametmp,fname)) {
- if (mapbuf) unmap_file(mapbuf);
- if (fd1 != -1) close(fd1);
- continue;
- }
+ strlcpy(template, fnametmp, sizeof template);
- 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
- * the lchown. Thanks to snabb@epipe.fi for pointing
- * this out. We also set it initially without group
- * access because of a similar race condition. */
- fd2 = do_mkstemp(fnametmp, file->mode & INITACCESSPERMS);
-
- /* in most cases parent directories will already exist
- * because their information should have been previously
- * 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));
+ /* we initially set the perms without the
+ * setuid/setgid bits to ensure that there is no race
+ * condition. They are then correctly updated after
+ * the lchown. Thanks to snabb@epipe.fi for pointing
+ * this out. We also set it initially without group
+ * access because of a similar race condition. */
fd2 = do_mkstemp(fnametmp, file->mode & INITACCESSPERMS);
- }
- if (fd2 == -1) {
- rprintf(FERROR, "mkstemp %s failed: %s\n",
- full_fname(fnametmp), strerror(errno));
- receive_data(f_in,mapbuf,-1,NULL,file->length);
- if (mapbuf) unmap_file(mapbuf);
- if (fd1 != -1) close(fd1);
- continue;
- }
- cleanup_set(fnametmp, fname, file, mapbuf, fd1, fd2);
+ /* in most cases parent directories will already exist
+ * because their information should have been previously
+ * 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);
+ fd2 = do_mkstemp(fnametmp, file->mode & INITACCESSPERMS);
+ }
+ if (fd2 == -1) {
+ rsyserr(FERROR, errno, "mkstemp %s failed",
+ full_fname(fnametmp));
+ discard_receive_data(f_in, file->length);
+ if (fd1 != -1)
+ close(fd1);
+ continue;
+ }
- if (!am_server && verbose) { /* log transfer */
- rprintf(FINFO, "%s\n", fname);
+ if (partialptr)
+ cleanup_set(fnametmp, partialptr, file, fd1, fd2);
}
+ /* 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,mapbuf,fd2,fname,file->length);
+ 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 (mapbuf) unmap_file(mapbuf);
- if (fd1 != -1) {
+ if (fd1 != -1)
close(fd1);
+ if (close(fd2) < 0) {
+ rsyserr(FERROR, errno, "close failed on %s",
+ full_fname(fnametmp));
+ exit_cleanup(RERR_FILEIO);
}
- close(fd2);
-
- if (verbose > 2)
- rprintf(FINFO,"renaming %s to %s\n",fnametmp,fname);
- finish_transfer(fname, fnametmp, file);
+ 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_DELETE);
+ }
+ } else if (keep_partial && partialptr
+ && handle_partial_dir(partialptr, PDIR_CREATE)) {
+ finish_transfer(partialptr, fnametmp, file, recv_ok,
+ !partial_dir);
+ if (delay_updates && recv_ok) {
+ set_delayed_bit(i);
+ recv_ok = -1;
+ }
+ } else {
+ partialptr = NULL;
+ do_unlink(fnametmp);
+ }
cleanup_disable();
- if (!recv_ok) {
- if (csum_length == SUM_LENGTH) {
- rprintf(FERROR,"ERROR: file corruption in %s. File changed during transfer?\n",
- full_fname(fname));
- } else {
- if (verbose > 1)
- rprintf(FINFO,"redoing %s(%d)\n",fname,i);
- write_int(f_gen,i);
+ 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)
+ keptstr = "discarded";
+ else if (partial_dir)
+ keptstr = "put into partial-dir";
+ else
+ keptstr = "retained";
+ if (msgtype == FERROR) {
+ errstr = "ERROR";
+ redostr = "";
+ } else {
+ errstr = "WARNING";
+ redostr = " (will try again)";
+ }
+ rprintf(msgtype,
+ "%s: %s failed verification -- update %s%s.\n",
+ errstr, safe_fname(fname),
+ keptstr, redostr);
+ }
+ if (!phase) {
+ SIVAL(numbuf, 0, i);
+ send_msg(MSG_REDO, numbuf, 4);
}
}
}
-
- if (delete_after) {
- if (recurse && delete_mode && !local_name && flist->count>0) {
- delete_files(flist);
+ 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
+ || (preserve_hard_links
+ && file->link_u.links)) {
+ SIVAL(numbuf, 0, i);
+ send_msg(MSG_SUCCESS,numbuf,4);
+ }
+ handle_partial_dir(partialptr,
+ PDIR_DELETE);
+ }
+ }
}
}
- if (preserve_hard_links)
- do_hard_links();
-
- /* now we need to fix any directory permissions that were
- * modified during the transfer */
- for (i = 0; i < flist->count; i++) {
- file = flist->files[i];
- if (!file->basename || !S_ISDIR(file->mode)) continue;
- recv_generator(local_name? local_name
- : f_name_to(file,fbuf,sizeof fbuf), flist, i, -1);
- }
-
if (verbose > 2)
rprintf(FINFO,"recv_files finished\n");
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff