Skip to content

L
liblongpath-rsync
Commit a9cc1283 authored by Wayne Davison's avatar Wayne Davison
Browse files
Options

Renamed fuzzy_dirname -> parent_dirname.

parent ccb16b46
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
generator.c
View file @ a9cc1283
...@@ -771,7 +771,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, ...@@ -771,7 +771,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
enum logcode code, int f_out) enum logcode code, int f_out)
{ {
static int missing_below = -1, excluded_below = -1; static int missing_below = -1, excluded_below = -1;
static char *fuzzy_dirname = ""; static char *parent_dirname = "";
static struct file_list *fuzzy_dirlist = NULL; static struct file_list *fuzzy_dirlist = NULL;
struct file_struct *fuzzy_file = NULL; struct file_struct *fuzzy_file = NULL;
int fd = -1, f_copy = -1; int fd = -1, f_copy = -1;
...@@ -790,7 +790,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, ...@@ -790,7 +790,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
if (fuzzy_dirlist) { if (fuzzy_dirlist) {
flist_free(fuzzy_dirlist); flist_free(fuzzy_dirlist);
fuzzy_dirlist = NULL; fuzzy_dirlist = NULL;
fuzzy_dirname = ""; parent_dirname = "";
} }
if (missing_below >= 0) { if (missing_below >= 0) {
dry_run--; dry_run--;
...@@ -832,8 +832,8 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, ...@@ -832,8 +832,8 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
} else { } else {
if (fuzzy_basis && S_ISREG(file->mode)) { if (fuzzy_basis && S_ISREG(file->mode)) {
char *dn = file->dirname ? file->dirname : "."; char *dn = file->dirname ? file->dirname : ".";
if (fuzzy_dirname != dn if (parent_dirname != dn
&& strcmp(fuzzy_dirname, dn) != 0) { && strcmp(parent_dirname, dn) != 0) {
if (fuzzy_dirlist) if (fuzzy_dirlist)
flist_free(fuzzy_dirlist); flist_free(fuzzy_dirlist);
if (implied_dirs || stat(dn, &st) == 0) if (implied_dirs || stat(dn, &st) == 0)
...@@ -841,7 +841,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, ...@@ -841,7 +841,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
else else
fuzzy_dirlist = NULL; fuzzy_dirlist = NULL;
} }
fuzzy_dirname = dn; parent_dirname = dn;
} }
statret = link_stat(fname, &st, statret = link_stat(fname, &st,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment