Got rid of calls to (the soon to vanish) safe_fname() function.

[rsync/rsync.git] / backup.c

diff --git a/backup.c b/backup.c
index a994e18..e34b7be 100644 (file)
--- a/backup.c
+++ b/backup.c
@@ -55,23 +55,36 @@ char *get_backup_name(char *fname)
 /* 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",
-                               safe_fname(fname), safe_fname(fnamebak));
-                       return 0;
+       while (1) {
+               if (do_rename(fname, fnamebak) == 0) {
+                       if (verbose > 1) {
+                               rprintf(FINFO, "backed up %s to %s\n",
+                                       fname, fnamebak);
+                       }
+                       break;
                }
-       } else if (verbose > 1) {
-               rprintf(FINFO, "backed up %s to %s\n",
-                       safe_fname(fname), safe_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",
+                       fname, fnamebak);
+               errno = rename_errno;
+               return 0;
        }
+
        return 1;
 }
 
@@ -135,7 +148,7 @@ static int make_bak_dir(char *fullpath)
        }
        return 0;
 
-failure:
+  failure:
        while (p != end) {
                *p = '/';
                p += strlen(p);
@@ -174,18 +187,16 @@ static int keep_backup(char *fname)
                return 0;
 
        /* Check to see if this is a device file, or link */
-       if (IS_DEVICE(file->mode)) {
-               if (am_root && preserve_devices) {
-                       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",
-                                       safe_fname(fname));
-                       }
+       if (IS_DEVICE(file->mode) && am_root && preserve_devices) {
+               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);
@@ -216,21 +227,24 @@ static int keep_backup(char *fname)
                                        full_fname(buf), file->u.link);
                        }
                        kept = 1;
+               } else {
+                       do_unlink(buf);
+                       if (do_symlink(file->u.link, buf) < 0
+                           && (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);
+                       }
+                       do_unlink(fname);
+                       kept = 1;
                }
-               if (do_symlink(file->u.link, buf) < 0
-                   && (errno != ENOENT || make_bak_dir(buf) < 0
-                    || do_symlink(file->u.link, buf) < 0)) {
-                       rsyserr(FERROR, errno, "link %s -> \"%s\"",
-                               full_fname(buf), safe_fname(file->u.link));
-               }
-               do_unlink(fname);
-               kept = 1;
        }
 #endif
 
        if (!kept && !S_ISREG(file->mode)) {
                rprintf(FINFO, "make_bak: skipping non-regular file %s\n",
-                       safe_fname(fname));
+                       fname);
                return 1;
        }
 
@@ -238,7 +252,7 @@ static int keep_backup(char *fname)
        if (!kept) {
                if (robust_move(fname, buf) != 0) {
                        rsyserr(FERROR, errno, "keep_backup failed: %s -> \"%s\"",
-                               full_fname(fname), safe_fname(buf));
+                               full_fname(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! */
@@ -250,7 +264,7 @@ static int keep_backup(char *fname)
 
        if (verbose > 1) {
                rprintf(FINFO, "backed up %s to %s\n",
-                       safe_fname(fname), safe_fname(buf));
+                       fname, buf);
        }
        return 1;
 }