+ 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
+****************************************************************************/
+static int make_bak_dir(char *fullpath)
+{
+ STRUCT_STAT st;
+ char *rel = fullpath + backup_dir_len;
+ char *end = rel + strlen(rel);
+ char *p = end;
+
+ while (strncmp(fullpath, "./", 2) == 0)
+ fullpath += 2;
+
+ /* Try to find an existing dir, starting from the deepest dir. */
+ while (1) {
+ if (--p == fullpath) {
+ p += strlen(p);
+ goto failure;
+ }
+ if (*p == '/') {
+ *p = '\0';
+ if (mkdir_defmode(fullpath) == 0)
+ break;
+ if (errno != ENOENT) {
+ rsyserr(FERROR, errno,
+ "make_bak_dir mkdir %s failed",
+ full_fname(fullpath));
+ goto failure;
+ }
+ }
+ }
+
+ /* 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 (do_stat(rel, &st) < 0) {
+ rsyserr(FERROR, errno,
+ "make_bak_dir stat %s failed",
+ full_fname(rel));
+ } else {
+ do_lchown(fullpath, st.st_uid, st.st_gid);
+ do_chmod(fullpath, st.st_mode);
+ }
+ }
+ *p = '/';
+ p += strlen(p);
+ if (p == end)
+ break;
+ if (mkdir_defmode(fullpath) < 0) {
+ rsyserr(FERROR, errno, "make_bak_dir mkdir %s failed",
+ full_fname(fullpath));
+ goto failure;
+ }
+ }
+ return 0;
+
+ failure:
+ while (p != end) {
+ *p = '/';
+ p += strlen(p);
+ }
+ return -1;
+}
+
+/* robustly move a file, creating new directory structures if necessary */
+static int robust_move(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(char *fname)
+{
+ STRUCT_STAT st;
+ struct file_struct *file;
+ char *buf;
+ int kept = 0;
+ int ret_code;
+
+ /* return if no file to keep */
+ if (do_lstat(fname, &st) < 0)
+ return 1;
+
+ if (!(file = make_file(fname, NULL, NULL, 0, NO_FILTERS)))
+ return 1; /* the file could have disappeared */
+
+ if (!(buf = get_backup_name(fname)))
+ return 0;
+
+ /* 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))) {
+ do_unlink(buf);
+ if (do_mknod(buf, file->mode, file->u.rdev) < 0
+ && (errno != ENOENT || make_bak_dir(buf) < 0
+ || do_mknod(buf, file->mode, file->u.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));
+ }
+
+ ret_code = do_rmdir(fname);
+ if (verbose > 2) {
+ rprintf(FINFO, "make_backup: RMDIR %s returns %i\n",
+ full_fname(fname), ret_code);