Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Call log_item() instead of log_recv().
[rsync/rsync.git]
/
sender.c
diff --git
a/sender.c
b/sender.c
index
db42856
..
b08437d
100644
(file)
--- a/
sender.c
+++ b/
sender.c
@@
-35,6
+35,7
@@
extern int make_backups;
extern int do_progress;
extern int inplace;
extern struct stats stats;
extern int do_progress;
extern int inplace;
extern struct stats stats;
+extern struct file_list *the_file_list;
extern char *log_format;
extern char *log_format;
@@
-99,18
+100,16
@@
static struct sum_struct *receive_sums(int f)
return s;
}
return s;
}
-static struct file_list *the_flist;
-
-void successful_send(int i)
+void successful_send(int ndx)
{
char fname[MAXPATHLEN];
struct file_struct *file;
unsigned int offset;
{
char fname[MAXPATHLEN];
struct file_struct *file;
unsigned int offset;
- if (
!the_flist || i < 0 || i >= the_f
list->count)
+ if (
ndx < 0 || ndx >= the_file_
list->count)
return;
return;
- file = the_f
list->files[i
];
+ file = the_f
ile_list->files[ndx
];
/* The generator might tell us about symlinks we didn't send. */
if (!(file->flags & FLAG_SENT) && !S_ISLNK(file->mode))
return;
/* The generator might tell us about symlinks we didn't send. */
if (!(file->flags & FLAG_SENT) && !S_ISLNK(file->mode))
return;
@@
-145,8
+144,6
@@
void send_files(struct file_list *flist, int f_out, int f_in)
if (verbose > 2)
rprintf(FINFO, "send_files starting\n");
if (verbose > 2)
rprintf(FINFO, "send_files starting\n");
- the_flist = flist;
-
while (1) {
unsigned int offset;
while (1) {
unsigned int offset;
@@
-167,6
+164,13
@@
void send_files(struct file_list *flist, int f_out, int f_in)
}
if (i < 0 || i >= flist->count) {
}
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) {
+ write_int(f_out, i);
+ write_shortint(f_out, ITEM_IS_NEW);
+ continue;
+ }
rprintf(FERROR, "Invalid file index %d (count=%d)\n",
i, flist->count);
exit_cleanup(RERR_PROTOCOL);
rprintf(FERROR, "Invalid file index %d (count=%d)\n",
i, flist->count);
exit_cleanup(RERR_PROTOCOL);
@@
-193,19
+197,18
@@
void send_files(struct file_list *flist, int f_out, int f_in)
write_shortint(f_out, iflags);
if (am_server) {
if (am_daemon && !dry_run && see_item)
write_shortint(f_out, iflags);
if (am_server) {
if (am_daemon && !dry_run && see_item)
- log_
send(file, &stats, iflags
);
+ log_
item(file, &stats, iflags, NULL
);
} else if (see_item || iflags & ITEM_UPDATING
|| (S_ISDIR(file->mode)
&& iflags & ITEM_REPORT_TIME))
} else if (see_item || iflags & ITEM_UPDATING
|| (S_ISDIR(file->mode)
&& iflags & ITEM_REPORT_TIME))
- log_
send(file, &stats, iflags
);
+ log_
item(file, &stats, iflags, NULL
);
continue;
}
} else
iflags = ITEM_UPDATING | ITEM_MISSING_DATA;
if (inplace && protocol_version >= 29) {
continue;
}
} else
iflags = ITEM_UPDATING | ITEM_MISSING_DATA;
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;
} else
updating_basis_file = inplace && !make_backups;
@@
-221,7
+224,7
@@
void send_files(struct file_list *flist, int f_out, int f_in)
if (dry_run) { /* log the transfer */
if (!am_server && log_format)
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_shortint(f_out, iflags);
write_int(f_out, i);
if (protocol_version >= 29)
write_shortint(f_out, iflags);
@@
-286,7
+289,7
@@
void send_files(struct file_list *flist, int f_out, int f_in)
}
if (log_before_transfer)
}
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));
else if (!am_server && verbose && do_progress)
rprintf(FINFO, "%s\n", safe_fname(fname2));
@@
-294,7
+297,7
@@
void send_files(struct file_list *flist, int f_out, int f_in)
match_sums(f_out, s, mbuf, st.st_size);
if (!log_before_transfer)
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);
if (mbuf) {
j = unmap_file(mbuf);