#include "rsync.h"
extern int verbose;
-extern int log_before_transfer;
-extern int itemize_changes;
-extern int csum_length;
-extern struct stats stats;
-extern int io_error;
extern int dry_run;
extern int am_server;
extern int am_daemon;
+extern int log_before_transfer;
+extern int log_format_has_i;
+extern int daemon_log_format_has_i;
+extern int csum_length;
+extern int io_error;
extern int protocol_version;
+extern int remove_sent_files;
extern int updating_basis_file;
extern int make_backups;
extern int do_progress;
extern int inplace;
-extern char *log_format;
extern struct stats stats;
+extern struct file_list *the_file_list;
+extern char *log_format;
/**
return s;
}
+void successful_send(int ndx)
+{
+ char fname[MAXPATHLEN];
+ struct file_struct *file;
+ unsigned int offset;
+
+ if (ndx < 0 || ndx >= the_file_list->count)
+ return;
+
+ file = the_file_list->files[ndx];
+ /* The generator might tell us about symlinks we didn't send. */
+ if (!(file->flags & FLAG_SENT) && !S_ISLNK(file->mode))
+ return;
+ if (file->dir.root) {
+ offset = stringjoin(fname, sizeof fname,
+ file->dir.root, "/", NULL);
+ } else
+ offset = 0;
+ f_name_to(file, fname + offset);
+ if (remove_sent_files && do_unlink(fname) == 0 && verbose > 1) {
+ rprintf(FINFO, "sender removed %s\n",
+ safe_fname(fname + offset));
+ }
+}
+
+/* This is also used by receive.c with f_out = -1. */
+int read_iflags(int f_in, int f_out, int ndx, char *buf)
+{
+ int iflags = protocol_version >= 29 ? read_shortint(f_in)
+ : ITEM_UPDATING | 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 [%s]\n",
+ who_am_i());
+ exit_cleanup(RERR_PROTOCOL);
+ }
+ if ((!(iflags & ITEM_UPDATING) || !S_ISREG(the_file_list->files[ndx]->mode)) && f_out >= 0) {
+ write_int(f_out, ndx);
+ write_shortint(f_out, iflags);
+ }
+
+ return iflags;
+}
void send_files(struct file_list *flist, int f_out, int f_in)
{
struct map_struct *mbuf = NULL;
STRUCT_STAT st;
char *fname2, fname[MAXPATHLEN];
+ char fnametmp[MAXPATHLEN];
int iflags;
struct file_struct *file;
int phase = 0;
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, j;
if (verbose > 2)
break;
}
- if (i < 0 || i >= flist->count) {
- rprintf(FERROR, "Invalid file index %d (count=%d)\n",
- i, flist->count);
- exit_cleanup(RERR_PROTOCOL);
- }
+ iflags = read_iflags(f_in, f_out, i, fnametmp);
+ if (iflags == ITEM_IS_NEW) /* no-op packet */
+ continue;
file = flist->files[i];
-
- if (protocol_version >= 29) {
- iflags = read_short(f_in);
- if (!(iflags & ITEM_UPDATING) || !S_ISREG(file->mode)) {
- if (am_server) {
- write_int(f_out, i);
- write_short(f_out, iflags);
- } else if (itemize_changes
- || iflags & ITEM_UPDATING
- || (S_ISDIR(file->mode)
- && iflags & ITEM_REPORT_TIME))
- log_send(file, &stats, iflags);
- continue;
- }
+ 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
- iflags = ITEM_UPDATING | ITEM_MISSING_DATA;
+ offset = 0;
+ fname2 = f_name_to(file, fname + offset);
+
+ if (verbose > 2)
+ rprintf(FINFO, "send_files(%d, %s)\n", i, fname);
+
+ if (!(iflags & ITEM_UPDATING) || !S_ISREG(file->mode)) {
+ maybe_log_item(file, iflags, itemizing, fnametmp);
+ continue;
+ }
if (inplace && protocol_version >= 29) {
- uchar fnamecmp_type = read_byte(f_in);
- updating_basis_file = fnamecmp_type == FNAMECMP_FNAME;
+ updating_basis_file = !(iflags & ITEM_USING_ALT_BASIS);
} else
updating_basis_file = inplace && !make_backups;
stats.num_transferred_files++;
stats.total_transferred_size += file->length;
- 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_to(file, fname + offset);
-
- if (verbose > 2)
- rprintf(FINFO, "send_files(%d, %s)\n", i, fname);
-
if (dry_run) { /* log the transfer */
if (!am_server && log_format)
- log_send(file, &stats, iflags);
+ log_item(file, &stats, iflags, NULL);
write_int(f_out, i);
if (protocol_version >= 29)
- write_short(f_out, iflags);
+ write_shortint(f_out, iflags);
continue;
}
write_int(f_out, i);
if (protocol_version >= 29)
- write_short(f_out, iflags);
+ write_shortint(f_out, iflags);
write_sum_head(f_out, s);
if (verbose > 2) {
}
if (log_before_transfer)
- log_send(file, &initial_stats, iflags);
+ log_item(file, &initial_stats, iflags, NULL);
else if (!am_server && verbose && do_progress)
rprintf(FINFO, "%s\n", safe_fname(fname2));
match_sums(f_out, s, mbuf, st.st_size);
if (!log_before_transfer)
- log_send(file, &initial_stats, iflags);
+ log_item(file, &initial_stats, iflags, NULL);
if (mbuf) {
j = unmap_file(mbuf);
rprintf(FINFO, "sender finished %s\n",
safe_fname(fname));
}
+
+ /* Flag that we actually sent this entry. */
+ file->flags |= FLAG_SENT;
}
make_backups = save_make_backups;
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff