*
* Copyright (C) 1996 Andrew Tridgell
* Copyright (C) 1996 Paul Mackerras
- * Copyright (C) 2003, 2004, 2005, 2006 Wayne Davison
+ * Copyright (C) 2003-2007 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
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* 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.
+ * with this program; if not, visit the http://fsf.org website.
*/
#include "rsync.h"
extern int verbose;
+extern int dry_run;
extern int do_xfers;
extern int am_server;
extern int am_daemon;
+extern int inc_recurse;
extern int log_before_transfer;
extern int stdout_format_has_i;
extern int logfile_format_has_i;
extern int append_mode;
extern int io_error;
extern int allowed_lull;
+extern int preserve_xattrs;
extern int protocol_version;
-extern int remove_sender_files;
+extern int remove_source_files;
extern int updating_basis_file;
extern int make_backups;
extern int do_progress;
extern int batch_fd;
extern int write_batch;
extern struct stats stats;
-extern struct file_list *the_file_list;
-extern char *stdout_format;
-
+extern struct file_list *cur_flist, *first_flist, *dir_flist;
/**
* @file
(double)s->count, (long)s->blength, (long)s->remainder);
}
- if (append_mode) {
+ if (append_mode > 0) {
s->flength = (OFF_T)s->count * s->blength;
if (s->remainder)
s->flength -= s->blength - s->remainder;
{
char fname[MAXPATHLEN];
struct file_struct *file;
- unsigned int offset;
+ struct file_list *flist;
- if (ndx < 0 || ndx >= the_file_list->count)
+ if (!remove_source_files)
return;
- file = the_file_list->files[ndx];
- if (file->dir.root) {
- offset = stringjoin(fname, sizeof fname,
- file->dir.root, "/", NULL);
+ if (!(flist = flist_for_ndx(ndx))) {
+ rprintf(FERROR,
+ "INTERNAL ERROR: unable to find flist for item %d\n",
+ ndx);
+ return;
+ }
+
+ file = flist->files[ndx - flist->ndx_start];
+ if (!push_pathname(F_PATHNAME(file), -1))
+ return;
+ f_name(file, fname);
+
+ if (do_unlink(fname) == 0) {
+ if (verbose > 1)
+ rprintf(FINFO, "sender removed %s\n", fname);
} else
- offset = 0;
- f_name(file, fname + offset);
- if (remove_sender_files && do_unlink(fname) == 0 && verbose > 1)
- rprintf(FINFO, "sender removed %s\n", fname + offset);
+ rsyserr(FERROR, errno, "sender failed to remove %s", fname);
}
static void write_ndx_and_attrs(int f_out, int ndx, int iflags,
+ const char *fname, struct file_struct *file,
uchar fnamecmp_type, char *buf, int len)
{
- write_int(f_out, ndx);
+ write_ndx(f_out, ndx);
if (protocol_version < 29)
return;
write_shortint(f_out, iflags);
write_byte(f_out, fnamecmp_type);
if (iflags & ITEM_XNAME_FOLLOWS)
write_vstring(f_out, buf, len);
+#ifdef SUPPORT_XATTRS
+ if (preserve_xattrs && iflags & ITEM_REPORT_XATTR && !dry_run)
+ send_xattr_request(fname, file, f_out);
+#endif
}
-/* This is also used by receive.c with f_out = -1. */
-int read_item_attrs(int f_in, int f_out, int ndx, uchar *type_ptr,
- char *buf, int *len_ptr)
-{
- int len;
- uchar fnamecmp_type = FNAMECMP_FNAME;
- int iflags = protocol_version >= 29 ? read_shortint(f_in)
- : ITEM_TRANSFER | ITEM_MISSING_DATA;
-
- /* Handle the new keep-alive (no-op) packet. */
- if (ndx == the_file_list->count && iflags == ITEM_IS_NEW)
- ;
- else if (ndx < 0 || ndx >= the_file_list->count) {
- rprintf(FERROR, "Invalid file index: %d (count=%d) [%s]\n",
- ndx, the_file_list->count, who_am_i());
- exit_cleanup(RERR_PROTOCOL);
- } else if (iflags == ITEM_IS_NEW) {
- rprintf(FERROR, "Invalid itemized flag word: %x [%s]\n",
- iflags, who_am_i());
- exit_cleanup(RERR_PROTOCOL);
- }
-
- if (iflags & ITEM_BASIS_TYPE_FOLLOWS)
- fnamecmp_type = read_byte(f_in);
- *type_ptr = fnamecmp_type;
-
- if (iflags & ITEM_XNAME_FOLLOWS) {
- if ((len = read_vstring(f_in, buf, MAXPATHLEN)) < 0)
- exit_cleanup(RERR_PROTOCOL);
- } else {
- *buf = '\0';
- len = -1;
- }
- *len_ptr = len;
-
- if (iflags & ITEM_TRANSFER) {
- if (!S_ISREG(the_file_list->files[ndx]->mode)) {
- rprintf(FERROR,
- "received request to transfer non-regular file: %d [%s]\n",
- ndx, who_am_i());
- exit_cleanup(RERR_PROTOCOL);
- }
- } else if (f_out >= 0) {
- write_ndx_and_attrs(f_out, ndx, iflags,
- fnamecmp_type, buf, len);
- }
-
- return iflags;
-}
-
-void send_files(struct file_list *flist, int f_out, int f_in)
+void send_files(int f_in, int f_out)
{
int fd = -1;
struct sum_struct *s;
struct map_struct *mbuf = NULL;
STRUCT_STAT st;
- char *fname2, fname[MAXPATHLEN];
- char xname[MAXPATHLEN];
+ char fname[MAXPATHLEN], xname[MAXPATHLEN];
+ const char *path, *slash;
uchar fnamecmp_type;
int iflags, xlen;
struct file_struct *file;
int phase = 0, max_phase = protocol_version >= 29 ? 2 : 1;
struct stats initial_stats;
- int save_make_backups = make_backups;
int itemizing = am_server ? logfile_format_has_i : stdout_format_has_i;
enum logcode log_code = log_before_transfer ? FLOG : FINFO;
int f_xfer = write_batch < 0 ? batch_fd : f_out;
- int i, j;
+ int ndx, j;
if (verbose > 2)
rprintf(FINFO, "send_files starting\n");
while (1) {
- unsigned int offset;
+ if (inc_recurse)
+ send_extra_file_list(f_out, FILECNT_LOOKAHEAD);
- i = read_int(f_in);
- if (i == -1) {
+ /* This call also sets cur_flist. */
+ ndx = read_ndx_and_attrs(f_in, &iflags, &fnamecmp_type,
+ xname, &xlen);
+ if (ndx == NDX_DONE) {
+ if (inc_recurse && first_flist) {
+ flist_free(first_flist);
+ if (first_flist) {
+ write_ndx(f_out, NDX_DONE);
+ continue;
+ }
+ }
if (++phase > max_phase)
break;
- csum_length = SUM_LENGTH;
if (verbose > 2)
rprintf(FINFO, "send_files phase=%d\n", phase);
- write_int(f_out, -1);
- /* For inplace: redo phase turns off the backup
- * flag so that we do a regular inplace send. */
- make_backups = 0;
- append_mode = 0;
+ write_ndx(f_out, NDX_DONE);
continue;
}
- iflags = read_item_attrs(f_in, f_out, i, &fnamecmp_type,
- xname, &xlen);
- if (iflags == ITEM_IS_NEW) /* no-op packet */
- continue;
+ if (inc_recurse)
+ send_extra_file_list(f_out, FILECNT_LOOKAHEAD);
- file = flist->files[i];
- if (file->dir.root) {
- /* N.B. We're sure that this fits, so offset is OK. */
- offset = strlcpy(fname, file->dir.root, sizeof fname);
- if (!offset || fname[offset-1] != '/')
- fname[offset++] = '/';
- } else
- offset = 0;
- fname2 = f_name(file, fname + offset);
+ if (ndx - cur_flist->ndx_start >= 0)
+ file = cur_flist->files[ndx - cur_flist->ndx_start];
+ else
+ file = dir_flist->files[cur_flist->parent_ndx];
+ if (F_PATHNAME(file)) {
+ path = F_PATHNAME(file);
+ slash = "/";
+ } else {
+ path = slash = "";
+ }
+ if (!push_pathname(F_PATHNAME(file), -1))
+ continue;
+ f_name(file, fname);
if (verbose > 2)
- rprintf(FINFO, "send_files(%d, %s)\n", i, fname);
+ rprintf(FINFO, "send_files(%d, %s%s%s)\n", ndx, path,slash,fname);
+
+#ifdef SUPPORT_XATTRS
+ if (preserve_xattrs && iflags & ITEM_REPORT_XATTR)
+ recv_xattr_request(file, f_in);
+#endif
if (!(iflags & ITEM_TRANSFER)) {
maybe_log_item(file, iflags, itemizing, xname);
+ write_ndx_and_attrs(f_out, ndx, iflags, fname, file,
+ fnamecmp_type, xname, xlen);
continue;
}
if (phase == 2) {
exit_cleanup(RERR_PROTOCOL);
}
+ if (file->flags & FLAG_FILE_SENT) {
+ if (csum_length == SHORT_SUM_LENGTH) {
+ /* For inplace: redo phase turns off the backup
+ * flag so that we do a regular inplace send. */
+ make_backups = -make_backups;
+ append_mode = -append_mode;
+ csum_length = SUM_LENGTH;
+ }
+ } else {
+ if (csum_length != SHORT_SUM_LENGTH) {
+ make_backups = -make_backups;
+ append_mode = -append_mode;
+ csum_length = SHORT_SUM_LENGTH;
+ }
+ }
+
updating_basis_file = inplace && (protocol_version >= 29
- ? fnamecmp_type == FNAMECMP_FNAME : !make_backups);
+ ? fnamecmp_type == FNAMECMP_FNAME : make_backups <= 0);
- stats.current_file_index = i;
+ stats.current_file_index = ndx;
stats.num_transferred_files++;
- stats.total_transferred_size += file->length;
+ stats.total_transferred_size += F_LENGTH(file);
if (!do_xfers) { /* log the transfer */
log_item(FCLIENT, file, &stats, iflags, NULL);
- write_ndx_and_attrs(f_out, i, iflags, fnamecmp_type,
- xname, xlen);
+ write_ndx_and_attrs(f_out, ndx, iflags, fname, file,
+ fnamecmp_type, xname, xlen);
continue;
}
if (!(s = receive_sums(f_in))) {
io_error |= IOERR_GENERAL;
rprintf(FERROR, "receive_sums failed\n");
- return;
+ exit_cleanup(RERR_PROTOCOL);
}
fd = do_open(fname, O_RDONLY, 0);
full_fname(fname));
}
free_sums(s);
+ if (protocol_version >= 30)
+ send_msg_int(MSG_NO_SEND, ndx);
continue;
}
rsyserr(FERROR, errno, "fstat failed");
free_sums(s);
close(fd);
- return;
+ exit_cleanup(RERR_PROTOCOL);
}
if (st.st_size) {
mbuf = NULL;
if (verbose > 2) {
- rprintf(FINFO, "send_files mapped %s of size %.0f\n",
- fname, (double)st.st_size);
+ rprintf(FINFO, "send_files mapped %s%s%s of size %.0f\n",
+ path,slash,fname, (double)st.st_size);
}
- write_ndx_and_attrs(f_out, i, iflags, fnamecmp_type,
- xname, xlen);
+ write_ndx_and_attrs(f_out, ndx, iflags, fname, file,
+ fnamecmp_type, xname, xlen);
write_sum_head(f_xfer, s);
if (verbose > 2)
- rprintf(FINFO, "calling match_sums %s\n", fname);
+ rprintf(FINFO, "calling match_sums %s%s%s\n", path,slash,fname);
if (log_before_transfer)
log_item(FCLIENT, file, &initial_stats, iflags, NULL);
else if (!am_server && verbose && do_progress)
- rprintf(FCLIENT, "%s\n", fname2);
+ rprintf(FCLIENT, "%s\n", fname);
set_compression(fname);
free_sums(s);
if (verbose > 2)
- rprintf(FINFO, "sender finished %s\n", fname);
+ rprintf(FINFO, "sender finished %s%s%s\n", path,slash,fname);
/* Flag that we actually sent this entry. */
- file->flags |= FLAG_SENT;
+ file->flags |= FLAG_FILE_SENT;
}
- make_backups = save_make_backups;
+ if (make_backups < 0)
+ make_backups = -make_backups;
if (verbose > 2)
rprintf(FINFO, "send files finished\n");
match_report();
- write_int(f_out, -1);
+ write_ndx(f_out, NDX_DONE);
}
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff