Commit 3b7bcaaf authored by Wayne Davison's avatar Wayne Davison

Got rid of duplicate error when push_pathname() fails.

parent 4abe379c
...@@ -1791,16 +1791,11 @@ struct file_list *send_file_list(int f, int argc, char *argv[]) ...@@ -1791,16 +1791,11 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
dirlen = dir ? strlen(dir) : 0; dirlen = dir ? strlen(dir) : 0;
if (dirlen != lastdir_len || memcmp(lastdir, dir, dirlen) != 0) { if (dirlen != lastdir_len || memcmp(lastdir, dir, dirlen) != 0) {
if (!push_pathname(dir ? strdup(dir) : NULL, dirlen)) if (!push_pathname(dir ? strdup(dir) : NULL, dirlen))
goto push_error; continue;
lastdir = pathname; lastdir = pathname;
lastdir_len = pathname_len; lastdir_len = pathname_len;
} else if (!push_pathname(lastdir, lastdir_len)) { } else if (!push_pathname(lastdir, lastdir_len))
push_error:
io_error |= IOERR_GENERAL;
rsyserr(FERROR, errno, "push_dir %s failed in %s",
full_fname(dir), curr_dir);
continue; continue;
}
if (fn != fbuf) if (fn != fbuf)
memmove(fbuf, fn, len + 1); memmove(fbuf, fn, len + 1);
......
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