/* simple backup creates a backup with a suffix in the same directory */
static int make_simple_backup(char *fname)
{
+ int rename_errno;
char *fnamebak = get_backup_name(fname);
if (!fnamebak)
return 0;
- if (do_rename(fname, fnamebak) != 0) {
- /* cygwin (at least version b19) reports EINVAL */
- if (errno != ENOENT && errno != EINVAL) {
- rsyserr(FERROR, errno,
- "rename %s to backup %s", fname, fnamebak);
- return 0;
+ while (1) {
+ if (do_rename(fname, fnamebak) == 0) {
+ if (verbose > 1) {
+ rprintf(FINFO, "backed up %s to %s\n",
+ safe_fname(fname),
+ safe_fname(fnamebak));
+ }
+ break;
}
- } else if (verbose > 1) {
- rprintf(FINFO, "backed up %s to %s\n", fname, fnamebak);
+ /* cygwin (at least version b19) reports EINVAL */
+ 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",
+ safe_fname(fname), safe_fname(fnamebak));
+ errno = rename_errno;
+ return 0;
}
+
return 1;
}
if (do_lstat(fname, &st) < 0)
return 1;
- if (!(file = make_file(fname, NULL, NO_EXCLUDES)))
+ if (!(file = make_file(fname, NULL, NO_FILTERS)))
return 1; /* the file could have disappeared */
if (!(buf = get_backup_name(fname)))
} else if (verbose > 2) {
rprintf(FINFO,
"make_backup: DEVICE %s successful.\n",
- fname);
+ safe_fname(fname));
}
}
kept = 1;
kept = 1;
}
-#if SUPPORT_LINKS
+#ifdef SUPPORT_LINKS
if (!kept && preserve_links && S_ISLNK(file->mode)) {
if (safe_symlinks && unsafe_symlink(file->u.link, buf)) {
if (verbose) {
&& (errno != ENOENT || make_bak_dir(buf) < 0
|| do_symlink(file->u.link, buf) < 0)) {
rsyserr(FERROR, errno, "link %s -> \"%s\"",
- full_fname(buf), file->u.link);
+ full_fname(buf), safe_fname(file->u.link));
}
do_unlink(fname);
kept = 1;
if (!kept && !S_ISREG(file->mode)) {
rprintf(FINFO, "make_bak: skipping non-regular file %s\n",
- fname);
+ safe_fname(fname));
return 1;
}
if (!kept) {
if (robust_move(fname, buf) != 0) {
rsyserr(FERROR, errno, "keep_backup failed: %s -> \"%s\"",
- full_fname(fname), buf);
+ full_fname(fname), safe_fname(buf));
} else if (st.st_nlink > 1) {
/* If someone has hard-linked the file into the backup
* dir, rename() might return success but do nothing! */
set_perms(buf, file, NULL, 0);
free(file);
- if (verbose > 1)
- rprintf(FINFO, "backed up %s to %s\n", fname, buf);
+ if (verbose > 1) {
+ rprintf(FINFO, "backed up %s to %s\n",
+ safe_fname(fname), safe_fname(buf));
+ }
return 1;
}