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
Decided that I like remove-source-files better than remove-sender-files.
[rsync/rsync.git]
/
receiver.c
diff --git
a/receiver.c
b/receiver.c
index
2ae4620
..
683a716
100644
(file)
--- a/
receiver.c
+++ b/
receiver.c
@@
-40,7
+40,7
@@
extern int preserve_perms;
extern int basis_dir_cnt;
extern int make_backups;
extern int cleanup_got_literal;
extern int basis_dir_cnt;
extern int make_backups;
extern int cleanup_got_literal;
-extern int remove_s
ent
_files;
+extern int remove_s
ource
_files;
extern int append_mode;
extern int sparse_files;
extern int keep_partial;
extern int append_mode;
extern int sparse_files;
extern int keep_partial;
@@
-296,7
+296,7
@@
static void handle_delayed_updates(struct file_list *flist, char *local_name)
"rename failed for %s (from %s)",
full_fname(fname), partialptr);
} else {
"rename failed for %s (from %s)",
full_fname(fname), partialptr);
} else {
- if (remove_s
ent
_files
+ if (remove_s
ource
_files
|| (preserve_hard_links
&& file->link_u.links)) {
SIVAL(numbuf, 0, i);
|| (preserve_hard_links
&& file->link_u.links)) {
SIVAL(numbuf, 0, i);
@@
-421,7
+421,7
@@
int recv_files(int f_in, struct file_list *flist, char *local_name)
}
if (!do_xfers) { /* log the transfer */
}
if (!do_xfers) { /* log the transfer */
- log_item(F
NAME
, file, &stats, iflags, NULL);
+ log_item(F
CLIENT
, file, &stats, iflags, NULL);
if (read_batch)
discard_receive_data(f_in, file->length);
continue;
if (read_batch)
discard_receive_data(f_in, file->length);
continue;
@@
-596,7
+596,7
@@
int recv_files(int f_in, struct file_list *flist, char *local_name)
/* log the transfer */
if (log_before_transfer)
/* log the transfer */
if (log_before_transfer)
- log_item(F
NAME
, file, &initial_stats, iflags, NULL);
+ log_item(F
CLIENT
, file, &initial_stats, iflags, NULL);
else if (!am_server && verbose && do_progress)
rprintf(FINFO, "%s\n", fname);
else if (!am_server && verbose && do_progress)
rprintf(FINFO, "%s\n", fname);
@@
-644,7
+644,7
@@
int recv_files(int f_in, struct file_list *flist, char *local_name)
cleanup_disable();
if (recv_ok > 0) {
cleanup_disable();
if (recv_ok > 0) {
- if (remove_s
ent
_files
+ if (remove_s
ource
_files
|| (preserve_hard_links && file->link_u.links)) {
SIVAL(numbuf, 0, i);
send_msg(MSG_SUCCESS, numbuf, 4);
|| (preserve_hard_links && file->link_u.links)) {
SIVAL(numbuf, 0, i);
send_msg(MSG_SUCCESS, numbuf, 4);