+ if (errno == ENOENT || errno == EINVAL)
+ break;
+
+ rename_errno = errno;
+ if (errno == EISDIR && do_rmdir(fnamebak) == 0)
+ continue;
+ if (errno == ENOTDIR && do_unlink(fnamebak) == 0)
+ continue;
+
+ rsyserr(FERROR, rename_errno, "rename %s to backup %s",
+ fname, fnamebak);
+ errno = rename_errno;
+ return 0;
+ }
+
+ return 1;
+}
+
+
+/****************************************************************************
+Create a directory given an absolute path, perms based upon another directory
+path
+****************************************************************************/
+int make_bak_dir(const char *fullpath)
+{
+ char fbuf[MAXPATHLEN], *rel, *end, *p;
+ struct file_struct *file;
+ int len = backup_dir_len;
+ stat_x sx;
+
+ while (*fullpath == '.' && fullpath[1] == '/') {
+ fullpath += 2;
+ len -= 2;
+ }
+
+ if (strlcpy(fbuf, fullpath, sizeof fbuf) >= sizeof fbuf)
+ return -1;
+
+ rel = fbuf + len;
+ end = p = rel + strlen(rel);
+
+ /* Try to find an existing dir, starting from the deepest dir. */
+ while (1) {
+ if (--p == fbuf)
+ return -1;
+ if (*p == '/') {
+ *p = '\0';
+ if (mkdir_defmode(fbuf) == 0)
+ break;
+ if (errno != ENOENT) {
+ rsyserr(FERROR, errno,
+ "make_bak_dir mkdir %s failed",
+ full_fname(fbuf));
+ return -1;
+ }
+ }
+ }
+
+ /* Make all the dirs that we didn't find on the way here. */
+ while (1) {
+ if (p >= rel) {
+ /* Try to transfer the directory settings of the
+ * actual dir that the files are coming from. */
+ if (x_stat(rel, &sx.st, NULL) < 0) {
+ rsyserr(FERROR, errno,
+ "make_bak_dir stat %s failed",
+ full_fname(rel));
+ } else {
+#ifdef SUPPORT_ACLS
+ sx.acc_acl = sx.def_acl = NULL;
+#endif
+#ifdef SUPPORT_XATTRS
+ sx.xattr = NULL;
+#endif
+ if (!(file = make_file(rel, NULL, NULL, 0, NO_FILTERS)))
+ continue;
+#ifdef SUPPORT_ACLS
+ if (preserve_acls && !S_ISLNK(file->mode)) {
+ get_acl(rel, &sx);
+ cache_acl(file, &sx);
+ free_acl(&sx);
+ }
+#endif
+#ifdef SUPPORT_XATTRS
+ if (preserve_xattrs) {
+ get_xattr(rel, &sx);
+ cache_xattr(file, &sx);
+ free_xattr(&sx);
+ }
+#endif
+ set_file_attrs(fbuf, file, NULL, NULL, 0);
+ unmake_file(file);
+ }
+ }
+ *p = '/';
+ p += strlen(p);
+ if (p == end)
+ break;
+ if (mkdir_defmode(fbuf) < 0) {
+ rsyserr(FERROR, errno, "make_bak_dir mkdir %s failed",
+ full_fname(fbuf));
+ return -1;
+ }
+ }
+
+ return 0;
+}
+
+/* robustly move a file, creating new directory structures if necessary */
+static int robust_move(const char *src, char *dst)
+{
+ if (robust_rename(src, dst, NULL, 0755) < 0
+ && (errno != ENOENT || make_bak_dir(dst) < 0
+ || robust_rename(src, dst, NULL, 0755) < 0))
+ return -1;
+ return 0;
+}
+
+
+/* If we have a --backup-dir, then we get here from make_backup().
+ * We will move the file to be deleted into a parallel directory tree. */
+static int keep_backup(const char *fname)
+{
+ stat_x sx;
+ struct file_struct *file;
+ char *buf;
+ int kept = 0;
+ int ret_code;
+
+ /* return if no file to keep */
+ if (x_lstat(fname, &sx.st, NULL) < 0)
+ return 1;
+#ifdef SUPPORT_ACLS
+ sx.acc_acl = sx.def_acl = NULL;
+#endif
+#ifdef SUPPORT_XATTRS
+ sx.xattr = NULL;
+#endif
+
+ if (!(file = make_file(fname, NULL, NULL, 0, NO_FILTERS)))
+ return 1; /* the file could have disappeared */
+
+ if (!(buf = get_backup_name(fname))) {
+ unmake_file(file);
+ return 0;
+ }
+
+#ifdef SUPPORT_ACLS
+ if (preserve_acls && !S_ISLNK(file->mode)) {
+ get_acl(fname, &sx);
+ cache_acl(file, &sx);
+ free_acl(&sx);
+ }
+#endif
+#ifdef SUPPORT_XATTRS
+ if (preserve_xattrs) {
+ get_xattr(fname, &sx);
+ cache_xattr(file, &sx);
+ free_xattr(&sx);
+ }
+#endif
+
+ /* Check to see if this is a device file, or link */
+ if ((am_root && preserve_devices && IS_DEVICE(file->mode))
+ || (preserve_specials && IS_SPECIAL(file->mode))) {
+ uint32 *devp = F_RDEV_P(file);
+ dev_t rdev = MAKEDEV(DEV_MAJOR(devp), DEV_MINOR(devp));
+ do_unlink(buf);
+ if (do_mknod(buf, file->mode, rdev) < 0
+ && (errno != ENOENT || make_bak_dir(buf) < 0
+ || do_mknod(buf, file->mode, rdev) < 0)) {
+ rsyserr(FERROR, errno, "mknod %s failed",
+ full_fname(buf));
+ } else if (verbose > 2) {
+ rprintf(FINFO, "make_backup: DEVICE %s successful.\n",
+ fname);
+ }
+ kept = 1;
+ do_unlink(fname);
+ }
+
+ if (!kept && S_ISDIR(file->mode)) {
+ /* make an empty directory */
+ if (do_mkdir(buf, file->mode) < 0
+ && (errno != ENOENT || make_bak_dir(buf) < 0
+ || do_mkdir(buf, file->mode) < 0)) {
+ rsyserr(FINFO, errno, "mkdir %s failed",
+ full_fname(buf));