-/* -*- c-file-style: "linux" -*-
-
- Copyright (C) 1996-2000 by Andrew Tridgell
- Copyright (C) Paul Mackerras 1996
-
- 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
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
+/*
+ * Routines only used by the receiving process.
+ *
+ * Copyright (C) 1996-2000 Andrew Tridgell
+ * Copyright (C) 1996 Paul Mackerras
+ * Copyright (C) 2003, 2004, 2005, 2006 Wayne Davison
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ */
#include "rsync.h"
extern int verbose;
-extern int recurse;
-extern int delete_mode;
-extern int delete_after;
-extern int max_delete;
-extern int csum_length;
-extern struct stats stats;
-extern int dry_run;
+extern int do_xfers;
extern int am_server;
+extern int do_progress;
+extern int log_before_transfer;
+extern int log_format_has_i;
+extern int logfile_format_has_i;
+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 int keep_dirlinks;
extern int preserve_hard_links;
extern int preserve_perms;
-extern int cvs_exclude;
-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;
extern int cleanup_got_literal;
-extern int module_id;
-extern int ignore_errors;
-extern int orig_umask;
+extern int remove_sent_files;
+extern int append_mode;
+extern int sparse_files;
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 file_list *the_file_list;
+extern struct filter_list_struct server_filter_list;
-static void delete_one(char *fn, int is_dir)
-{
- if (!is_dir) {
- if (robust_unlink(fn) != 0) {
- rsyserr(FERROR, errno, "delete_one: unlink %s failed",
- full_fname(fn));
- } else if (verbose) {
- rprintf(FINFO, "deleting %s\n", fn);
- }
- } else {
- if (do_rmdir(fn) != 0) {
- if (errno == ENOTDIR && keep_dirlinks) {
- delete_one(fn, 0);
- return;
- }
- if (errno != ENOTEMPTY && errno != EEXIST) {
- rsyserr(FERROR, errno,
- "delete_one: rmdir %s failed",
- full_fname(fn));
- }
- } else if (verbose) {
- rprintf(FINFO, "deleting directory %s\n", fn);
- }
- }
-}
-
-
-static int is_backup_file(char *fn)
-{
- int k = strlen(fn) - backup_suffix_len;
- return k > 0 && strcmp(fn+k, backup_suffix) == 0;
-}
-
-
-/* This deletes any files on the receiving side that are not present
- * on the sending side. */
-void delete_files(struct file_list *flist)
-{
- struct file_list *local_file_list;
- int i, j;
- char *argv[1], fbuf[MAXPATHLEN];
- 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 (!(flist->files[j]->flags & FLAG_TOP_DIR)
- || !S_ISDIR(flist->files[j]->mode))
- continue;
-
- argv[0] = f_name_to(flist->files[j], fbuf);
-
- if (!(local_file_list = send_file_list(-1, 1, argv)))
- continue;
-
- if (verbose > 1)
- rprintf(FINFO, "deleting in %s\n", fbuf);
-
- 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 (flist_find(flist,local_file_list->files[i]) < 0) {
- 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++;
- }
- }
- flist_free(local_file_list);
- }
-}
+static struct bitbag *delayed_bits = NULL;
+static int phase = 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];
+ int32 i;
char *map = NULL;
read_sum_head(f_in, &sum);
+ 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",
+ fname_r, (double)size_r);
+ }
+ } else
+ mapbuf = NULL;
+
sum_init(checksum_seed);
+ if (append_mode) {
+ OFF_T j;
+ sum.flength = (OFF_T)sum.count * sum.blength;
+ if (sum.remainder)
+ sum.flength -= sum.blength - sum.remainder;
+ for (j = CHUNK_SIZE; j < sum.flength; j += CHUNK_SIZE) {
+ if (do_progress)
+ show_progress(offset, total_size);
+ sum_update(map_ptr(mapbuf, offset, CHUNK_SIZE),
+ CHUNK_SIZE);
+ offset = j;
+ }
+ if (offset < sum.flength) {
+ int32 len = sum.flength - offset;
+ if (do_progress)
+ show_progress(offset, total_size);
+ sum_update(map_ptr(mapbuf, offset, len), len);
+ offset = sum.flength;
+ }
+ if (fd != -1 && do_lseek(fd, offset, SEEK_SET) != offset) {
+ rsyserr(FERROR, errno, "lseek failed on %s",
+ full_fname(fname));
+ exit_cleanup(RERR_FILEIO);
+ }
+ }
+
while ((i = recv_token(f_in, &data)) != 0) {
if (do_progress)
show_progress(offset, total_size);
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) {
- rsyserr(FERROR, errno, "write failed on %s",
- full_fname(fname));
- 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) {
- rsyserr(FERROR, errno, "write failed on %s",
- full_fname(fname));
- 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 && map && write_file(fd, map, len) != (int)len)
+ goto report_write_error;
offset += len;
}
- flush_write_file(fd);
+ 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) {
+ 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 discard_receive_data(int f_in, OFF_T length)
+{
+ receive_data(f_in, NULL, -1, 0, NULL, -1, length);
+}
+
+static void handle_delayed_updates(struct file_list *flist, char *local_name)
+{
+ char *fname, *partialptr, numbuf[4];
+ int i;
+
+ for (i = -1; (i = bitbag_next_bit(delayed_bits, i)) >= 0; ) {
+ struct file_struct *file = flist->files[i];
+ fname = local_name ? local_name : f_name(file, NULL);
+ if ((partialptr = partial_dir_fname(fname)) != NULL) {
+ if (make_backups && !make_backup(fname))
+ continue;
+ if (verbose > 2) {
+ rprintf(FINFO, "renaming %s to %s\n",
+ partialptr, fname);
+ }
+ /* We don't use robust_rename() here because the
+ * partial-dir must be on the same drive. */
+ if (do_rename(partialptr, fname) < 0) {
+ rsyserr(FERROR, errno,
+ "rename failed for %s (from %s)",
+ full_fname(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);
+ }
+ }
+ }
+}
+
+static int get_next_gen_i(int batch_gen_fd, int next_gen_i, int desired_i)
+{
+ while (next_gen_i < desired_i) {
+ if (next_gen_i >= 0) {
+ rprintf(FINFO,
+ "(No batched update for%s \"%s\")\n",
+ phase ? " resend of" : "",
+ f_name(the_file_list->files[next_gen_i], NULL));
+ }
+ 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 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, xlen;
char *fname, fbuf[MAXPATHLEN];
- char template[MAXPATHLEN];
+ char xname[MAXPATHLEN];
char fnametmp[MAXPATHLEN];
- char *fnamecmp;
+ char *fnamecmp, *partialptr, numbuf[4];
char fnamecmpbuf[MAXPATHLEN];
- struct map_struct *mapbuf;
+ uchar fnamecmp_type;
struct file_struct *file;
struct stats initial_stats;
int save_make_backups = make_backups;
- int i, recv_ok, phase = 0;
+ int itemizing = am_server ? logfile_format_has_i : log_format_has_i;
+ int max_phase = protocol_version >= 29 ? 2 : 1;
+ int i, recv_ok;
- 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)
+ delayed_bits = bitbag_create(flist->count);
+
while (1) {
cleanup_disable();
i = read_int(f_in);
if (i == -1) {
- if (phase)
+ if (read_batch) {
+ get_next_gen_i(batch_gen_fd, next_gen_i,
+ flist->count);
+ next_gen_i = -1;
+ }
+ 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)
+ if (keep_partial && !partial_dir)
make_backups = 0; /* prevents double backup */
+ if (append_mode) {
+ append_mode = 0;
+ sparse_files = 0;
+ }
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_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(file, fbuf);
+
+ if (verbose > 2)
+ rprintf(FINFO, "recv_files(%s)\n", fname);
+
+ 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);
+ }
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 transfer */
- rprintf(FINFO, "%s\n", fname);
- }
+ if (!do_xfers) { /* log the transfer */
+ if (!am_server && log_format)
+ 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;
}
- initial_stats = stats;
+ if (read_batch) {
+ next_gen_i = get_next_gen_i(batch_gen_fd, next_gen_i, i);
+ if (i < next_gen_i) {
+ rprintf(FINFO,
+ "(Skipping batched update for \"%s\")\n",
+ 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;
- fnamecmp = fname;
+ if (protocol_version >= 29) {
+ switch (fnamecmp_type) {
+ case FNAMECMP_FNAME:
+ fnamecmp = fname;
+ break;
+ case FNAMECMP_PARTIAL_DIR:
+ fnamecmp = partialptr;
+ break;
+ case FNAMECMP_BACKUP:
+ fnamecmp = get_backup_name(fname);
+ break;
+ case FNAMECMP_FUZZY:
+ if (file->dirname) {
+ pathjoin(fnamecmpbuf, MAXPATHLEN,
+ file->dirname, xname);
+ fnamecmp = fnamecmpbuf;
+ } else
+ fnamecmp = xname;
+ break;
+ default:
+ if (fnamecmp_type >= basis_dir_cnt) {
+ rprintf(FERROR,
+ "invalid basis_dir index: %d.\n",
+ fnamecmp_type);
+ exit_cleanup(RERR_PROTOCOL);
+ }
+ pathjoin(fnamecmpbuf, sizeof fnamecmpbuf,
+ basis_dir[fnamecmp_type], fname);
+ fnamecmp = fnamecmpbuf;
+ break;
+ }
+ 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 && compare_dest != NULL) {
- /* try the file at compare_dest instead */
- pathjoin(fnamecmpbuf, sizeof fnamecmpbuf,
- compare_dest, fname);
- fnamecmp = fnamecmpbuf;
- 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));
- receive_data(f_in,NULL,-1,NULL,file->length);
+ 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) {
- /* if the file exists already and we aren't preserving
- * permissions then act as though the remote end sent
- * us the file permissions we already have */
- file->mode = st.st_mode;
+ /* If we're not preserving permissions, change the file-list's
+ * mode based on the local permissions and some heuristics. */
+ if (!preserve_perms) {
+ int exists = fd1 != -1;
+ file->mode = dest_mode(file->mode, st.st_mode, exists);
}
- 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);
+ /* We now check to see if we are writing file "inplace" */
+ if (inplace) {
+ fd2 = do_open(fname, O_WRONLY|O_CREAT, 0600);
+ 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;
}
- } else
- mapbuf = NULL;
-
- if (!get_tmpname(fnametmp,fname)) {
- if (mapbuf) unmap_file(mapbuf);
- if (fd1 != -1) close(fd1);
- 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
- * 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) {
- rsyserr(FERROR, errno, "mkstemp %s failed",
- full_fname(fnametmp));
- 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) == 0) {
+ /* Get back to name with XXXXXX in it. */
+ get_tmpname(fnametmp, fname);
+ 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 (keep_partial)
+ 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", 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);
}
- if (recv_ok || keep_partial)
- finish_transfer(fname, fnametmp, file, recv_ok);
- else
+ if ((recv_ok && (!delay_updates || !partialptr)) || inplace) {
+ char *temp_copy_name;
+ if (partialptr == fname)
+ partialptr = temp_copy_name = NULL;
+ else if (*partial_dir == '/')
+ temp_copy_name = NULL;
+ else
+ temp_copy_name = partialptr;
+ finish_transfer(fname, fnametmp, temp_copy_name,
+ file, recv_ok, 1);
+ if (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, NULL,
+ file, recv_ok, !partial_dir);
+ if (delay_updates && recv_ok) {
+ bitbag_set_bit(delayed_bits, 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 {
- char buf[4];
- if (verbose > 1)
- rprintf(FINFO,"redoing %s(%d)\n",fname,i);
- SIVAL(buf, 0, i);
- send_msg(MSG_REDO, buf, 4);
+ 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, fname, keptstr, redostr);
+ }
+ if (!phase) {
+ SIVAL(numbuf, 0, i);
+ send_msg(MSG_REDO, numbuf, 4);
}
}
}
make_backups = save_make_backups;
- if (delete_after && recurse && delete_mode && !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");
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff