mirror/rsync
1
0
Fork 0
mirror of https://github.com/RsyncProject/rsync.git synced 2026-02-02 11:12:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Make sure that the --fuzzy option's dir-scan doesn't generate an

Browse Source 
I/O error when --no-relative is used and the destination dir does
not exist yet.
This commit is contained in:
Wayne Davison
2006-02-23 18:58:30 +00:00
parent 1e44aeb92a
commit ccb16b467b
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
generator.c
View File

@@ -35,6 +35,7 @@ extern int am_daemon;
extern int do_progress;
extern int recurse;
extern int relative_paths;
extern int implied_dirs;
extern int keep_dirlinks;
extern int preserve_links;
extern int preserve_devices;
@@ -835,7 +836,10 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
&& strcmp(fuzzy_dirname, dn) != 0) {
if (fuzzy_dirlist)
flist_free(fuzzy_dirlist);
fuzzy_dirlist = get_dirlist(dn, -1, 1);
if (implied_dirs || stat(dn, &st) == 0)
fuzzy_dirlist = get_dirlist(dn, -1, 1);
else
fuzzy_dirlist = NULL;
}
fuzzy_dirname = dn;
}
@@ -1112,7 +1116,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
} else
partialptr = NULL;
if (statret != 0 && fuzzy_basis && dry_run <= 1) {
if (statret != 0 && fuzzy_dirlist && dry_run <= 1) {
int j = find_fuzzy(file, fuzzy_dirlist);
if (j >= 0) {
fuzzy_file = fuzzy_dirlist->files[j];
@@ -1173,7 +1177,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
if (!do_xfers || read_batch || whole_file)
goto notify_others;
if (fuzzy_basis) {
if (fuzzy_dirlist) {
int j = flist_find(fuzzy_dirlist, file);
if (j >= 0) /* don't use changing file as future fuzzy basis */
fuzzy_dirlist->files[j]->flags |= FLAG_NO_FUZZY;