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
Got rid of an ancient (and no longer relevant) comment.
[rsync/rsync.git]
/
receiver.c
diff --git
a/receiver.c
b/receiver.c
index
ca6bf23
..
da383be
100644
(file)
--- a/
receiver.c
+++ b/
receiver.c
@@
-69,9
+69,8
@@
static int is_backup_file(char *fn)
}
}
-/* this deletes any files on the receiving side that are not present
- * on the sending side. For version 1.6.4 I have changed the behaviour
- * to match more closely what most people seem to expect of this option */
+/* 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;
void delete_files(struct file_list *flist)
{
struct file_list *local_file_list;
@@
-90,7
+89,7
@@
void delete_files(struct file_list *flist)
return;
}
return;
}
- for (j = 0;j < flist->count; j++) {
+ for (j = 0;
j < flist->count; j++) {
if (!(flist->files[j]->flags & FLAG_TOP_DIR)
|| !S_ISDIR(flist->files[j]->mode))
continue;
if (!(flist->files[j]->flags & FLAG_TOP_DIR)
|| !S_ISDIR(flist->files[j]->mode))
continue;
@@
-305,8
+304,7
@@
int recv_files(int f_in,struct file_list *flist,char *local_name)
rprintf(FINFO,"recv_files(%d) starting\n",flist->count);
}
rprintf(FINFO,"recv_files(%d) starting\n",flist->count);
}
- if (flist->hlink_pool)
- {
+ if (flist->hlink_pool) {
pool_destroy(flist->hlink_pool);
flist->hlink_pool = NULL;
}
pool_destroy(flist->hlink_pool);
flist->hlink_pool = NULL;
}
@@
-362,7
+360,7
@@
int recv_files(int f_in,struct file_list *flist,char *local_name)
/* open the file */
fd1 = do_open(fnamecmp, O_RDONLY, 0);
/* open the file */
fd1 = do_open(fnamecmp, O_RDONLY, 0);
- if (
(fd1 == -1) && (compare_dest != NULL)
) {
+ if (
fd1 == -1 && compare_dest != NULL
) {
/* try the file at compare_dest instead */
pathjoin(fnamecmpbuf, sizeof fnamecmpbuf,
compare_dest, fname);
/* try the file at compare_dest instead */
pathjoin(fnamecmpbuf, sizeof fnamecmpbuf,
compare_dest, fname);