From 8c9e06d7b927c3fa47be36a46066572b7b3c149e Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Thu, 23 Feb 2006 19:43:54 +0000 Subject: [PATCH] Fixed the creation of symlinks and devices when both --relative and --no-implied-dirs are specified and the destination dir does not yet exist. --- generator.c | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/generator.c b/generator.c index c0e876a3..f8ec71b5 100644 --- a/generator.c +++ b/generator.c @@ -790,12 +790,12 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, if (fuzzy_dirlist) { flist_free(fuzzy_dirlist); fuzzy_dirlist = NULL; - parent_dirname = ""; } if (missing_below >= 0) { dry_run--; missing_below = -1; } + parent_dirname = ""; return; } @@ -830,19 +830,22 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, statret = -1; stat_errno = ENOENT; } else { - if (fuzzy_basis && S_ISREG(file->mode)) { - char *dn = file->dirname ? file->dirname : "."; - if (parent_dirname != dn - && strcmp(parent_dirname, dn) != 0) { - if (fuzzy_dirlist) - flist_free(fuzzy_dirlist); - if (implied_dirs || stat(dn, &st) == 0) - fuzzy_dirlist = get_dirlist(dn, -1, 1); - else - fuzzy_dirlist = NULL; + char *dn = file->dirname ? file->dirname : "."; + if (parent_dirname != dn && strcmp(parent_dirname, dn) != 0) { + if (relative_paths && !implied_dirs && stat(dn, &st) < 0 + && create_directory_path(fname, orig_umask) < 0) { + rsyserr(FERROR, errno, + "recv_generator: mkdir %s failed", + full_fname(dn)); + } + if (fuzzy_dirlist) { + flist_free(fuzzy_dirlist); + fuzzy_dirlist = NULL; } - parent_dirname = dn; + if (fuzzy_basis) + fuzzy_dirlist = get_dirlist(dn, -1, 1); } + parent_dirname = dn; statret = link_stat(fname, &st, keep_dirlinks && S_ISDIR(file->mode)); -- 2.34.1