The branch, master has been updated
via 359758d Fix path check when prior_dir_file is NULL.
from 1f83b51 Improve the top-level section on include/exclude traversal.
This is my edit of some suggestions by Karl O. Pinc.
https://git.samba.org/?p=rsync.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 359758d61134e3e5d99ca3cca442fb05ed96069d
Author: Wayne Davison <way...@samba.org>
Date: Sat Jun 4 11:53:33 2016 -0700
Fix path check when prior_dir_file is NULL.
-----------------------------------------------------------------------
Summary of changes:
generator.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Changeset truncated at 500 lines:
diff --git a/generator.c b/generator.c
index fd7c8f8..fe5fece 100644
--- a/generator.c
+++ b/generator.c
@@ -1266,7 +1266,7 @@ static void recv_generator(char *fname, struct
file_struct *file, int ndx,
* this function was asked to process in the file list.
*/
if (!inc_recurse
&& (*dn != '.' || dn[1]) /* Avoid an issue with
--relative and the "." dir. */
- && (prior_dir_file && strcmp(dn,
f_name(prior_dir_file, NULL)) != 0)
+ && (!prior_dir_file || strcmp(dn,
f_name(prior_dir_file, NULL)) != 0)
&& flist_find_name(cur_flist, dn, 1) < 0) {
rprintf(FERROR,
"ABORTING due to invalid path from
sender: %s/%s\n",
--
The rsync repository.
_______________________________________________
rsync-cvs mailing list
rsync-cvs@lists.samba.org
https://lists.samba.org/mailman/listinfo/rsync-cvs
