The improved --xattrs option is landing on the trunk.
[rsync/rsync.git] / backup.c
index 2c69acd..49985fa 100644 (file)
--- a/backup.c
+++ b/backup.c
@@ -1,61 +1,89 @@
 /*
-   Copyright (C) Andrew Tridgell 1999
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-/* backup handling code */
+ * Backup handling code.
+ *
+ * Copyright (C) 1999 Andrew Tridgell
+ * Copyright (C) 2003-2007 Wayne Davison
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ */
 
 #include "rsync.h"
 
 extern int verbose;
-extern int backup_suffix_len;
+extern int am_root;
+extern int preserve_acls;
+extern int preserve_xattrs;
+extern int preserve_devices;
+extern int preserve_specials;
+extern int preserve_links;
+extern int safe_symlinks;
 extern int backup_dir_len;
 extern unsigned int backup_dir_remainder;
 extern char backup_dir_buf[MAXPATHLEN];
 extern char *backup_suffix;
 extern char *backup_dir;
 
-extern int am_root;
-extern int preserve_devices;
-extern int preserve_links;
-extern int preserve_hard_links;
-extern int orig_umask;
-extern int safe_symlinks;
+/* make a complete pathname for backup file */
+char *get_backup_name(const char *fname)
+{
+       if (backup_dir) {
+               if (stringjoin(backup_dir_buf + backup_dir_len, backup_dir_remainder,
+                              fname, backup_suffix, NULL) < backup_dir_remainder)
+                       return backup_dir_buf;
+       } else {
+               if (stringjoin(backup_dir_buf, MAXPATHLEN,
+                              fname, backup_suffix, NULL) < MAXPATHLEN)
+                       return backup_dir_buf;
+       }
+
+       rprintf(FERROR, "backup filename too long\n");
+       return NULL;
+}
 
 /* simple backup creates a backup with a suffix in the same directory */
-static int make_simple_backup(char *fname)
+static int make_simple_backup(const char *fname)
 {
-       char fnamebak[MAXPATHLEN];
+       int rename_errno;
+       const char *fnamebak = get_backup_name(fname);
 
-       if (stringjoin(fnamebak, sizeof fnamebak, fname, backup_suffix, NULL)
-           >= sizeof fnamebak) {
-               rprintf(FERROR, "backup filename too long\n");
+       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",
+                                       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",
+                       fname, fnamebak);
+               errno = rename_errno;
+               return 0;
        }
+
        return 1;
 }
 
@@ -66,7 +94,8 @@ path
 ****************************************************************************/
 static int make_bak_dir(char *fullpath)
 {
-       STRUCT_STAT st;
+       statx sx;
+       struct file_struct *file;
        char *rel = fullpath + backup_dir_len;
        char *end = rel + strlen(rel);
        char *p = end;
@@ -82,7 +111,7 @@ static int make_bak_dir(char *fullpath)
                }
                if (*p == '/') {
                        *p = '\0';
-                       if (do_mkdir(fullpath, 0777 & ~orig_umask) == 0)
+                       if (mkdir_defmode(fullpath) == 0)
                                break;
                        if (errno != ENOENT) {
                                rsyserr(FERROR, errno,
@@ -98,20 +127,42 @@ static int make_bak_dir(char *fullpath)
                if (p >= rel) {
                        /* Try to transfer the directory settings of the
                         * actual dir that the files are coming from. */
-                       if (do_lstat(rel, &st) != 0) {
+                       if (do_stat(rel, &sx.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);
+#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(fullpath, file, NULL, NULL, 0);
+                               free(file);
                        }
                }
                *p = '/';
                p += strlen(p);
                if (p == end)
                        break;
-               if (do_mkdir(fullpath, 0777 & ~orig_umask) < 0) {
+               if (mkdir_defmode(fullpath) < 0) {
                        rsyserr(FERROR, errno, "make_bak_dir mkdir %s failed",
                                full_fname(fullpath));
                        goto failure;
@@ -119,7 +170,7 @@ static int make_bak_dir(char *fullpath)
        }
        return 0;
 
-failure:
+  failure:
        while (p != end) {
                *p = '/';
                p += strlen(p);
@@ -128,10 +179,11 @@ failure:
 }
 
 /* robustly move a file, creating new directory structures if necessary */
-static int robust_move(char *src, char *dst)
+static int robust_move(const char *src, char *dst)
 {
-       if (robust_rename(src, dst, 0755) < 0 && (errno != ENOENT
-           || make_bak_dir(dst) < 0 || robust_rename(src, dst, 0755) < 0))
+       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;
 }
@@ -139,59 +191,73 @@ static int robust_move(char *src, char *dst)
 
 /* 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)
+static int keep_backup(const char *fname)
 {
-       STRUCT_STAT st;
+       statx sx;
        struct file_struct *file;
+       char *buf;
        int kept = 0;
        int ret_code;
 
        /* return if no file to keep */
-#if SUPPORT_LINKS
-       if (do_lstat(fname, &st)) return 1;
-#else
-       if (do_stat(fname, &st)) return 1;
+       if (do_lstat(fname, &sx.st) < 0)
+               return 1;
+#ifdef SUPPORT_ACLS
+       sx.acc_acl = sx.def_acl = NULL;
+#endif
+#ifdef SUPPORT_XATTRS
+       sx.xattr = NULL;
 #endif
 
-       file = make_file(fname, NULL, NO_EXCLUDES);
-
-       /* the file could have disappeared */
-       if (!file) return 1;
+       if (!(file = make_file(fname, NULL, NULL, 0, NO_FILTERS)))
+               return 1; /* the file could have disappeared */
 
-       /* make a complete pathname for backup file */
-       if (stringjoin(backup_dir_buf + backup_dir_len, backup_dir_remainder,
-           fname, backup_suffix, NULL) >= backup_dir_remainder) {
-               rprintf(FERROR, "keep_backup filename too long\n");
+       if (!(buf = get_backup_name(fname))) {
+               unmake_file(file);
                return 0;
        }
 
-#ifdef HAVE_MKNOD
+#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 (IS_DEVICE(file->mode)) {
-               if (am_root && preserve_devices) {
-                       if (do_mknod(backup_dir_buf, file->mode, file->u.rdev) < 0
-                           && (errno != ENOENT || make_bak_dir(backup_dir_buf) < 0
-                            || do_mknod(backup_dir_buf, file->mode, file->u.rdev) < 0)) {
-                               rsyserr(FERROR, errno, "mknod %s failed",
-                                       full_fname(backup_dir_buf));
-                       } else if (verbose > 2) {
-                               rprintf(FINFO,
-                                       "make_backup: DEVICE %s successful.\n",
-                                       fname);
-                       }
+       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);
        }
-#endif
 
        if (!kept && S_ISDIR(file->mode)) {
                /* make an empty directory */
-               if (do_mkdir(backup_dir_buf, file->mode) < 0
-                   && (errno != ENOENT || make_bak_dir(backup_dir_buf) < 0
-                    || do_mkdir(backup_dir_buf, file->mode) < 0)) {
+               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(backup_dir_buf));
+                               full_fname(buf));
                }
 
                ret_code = do_rmdir(fname);
@@ -202,49 +268,60 @@ static int keep_backup(char *fname)
                kept = 1;
        }
 
-#if SUPPORT_LINKS
+#ifdef SUPPORT_LINKS
        if (!kept && preserve_links && S_ISLNK(file->mode)) {
-               if (safe_symlinks && unsafe_symlink(file->u.link, backup_dir_buf)) {
+               const char *sl = F_SYMLINK(file);
+               if (safe_symlinks && unsafe_symlink(sl, buf)) {
                        if (verbose) {
                                rprintf(FINFO, "ignoring unsafe symlink %s -> %s\n",
-                                       full_fname(backup_dir_buf), file->u.link);
+                                       full_fname(buf), sl);
                        }
                        kept = 1;
+               } else {
+                       do_unlink(buf);
+                       if (do_symlink(sl, buf) < 0
+                           && (errno != ENOENT || make_bak_dir(buf) < 0
+                            || do_symlink(sl, buf) < 0)) {
+                               rsyserr(FERROR, errno, "link %s -> \"%s\"",
+                                       full_fname(buf), sl);
+                       }
+                       do_unlink(fname);
+                       kept = 1;
                }
-               if (do_symlink(file->u.link, backup_dir_buf) < 0
-                   && (errno != ENOENT || make_bak_dir(backup_dir_buf) < 0
-                    || do_symlink(file->u.link, backup_dir_buf) < 0)) {
-                       rsyserr(FERROR, errno, "link %s -> \"%s\"",
-                               full_fname(backup_dir_buf), 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",
                        fname);
+               unmake_file(file);
+               return 1;
        }
 
        /* move to keep tree if a file */
        if (!kept) {
-               if (robust_move(fname, backup_dir_buf) != 0) {
+               if (robust_move(fname, buf) != 0) {
                        rsyserr(FERROR, errno, "keep_backup failed: %s -> \"%s\"",
-                               full_fname(fname), backup_dir_buf);
+                               full_fname(fname), buf);
+               } else if (sx.st.st_nlink > 1) {
+                       /* If someone has hard-linked the file into the backup
+                        * dir, rename() might return success but do nothing! */
+                       robust_unlink(fname); /* Just in case... */
                }
        }
-       set_perms(backup_dir_buf, file, NULL, 0);
-       free(file);
+       set_file_attrs(buf, file, NULL, fname, 0);
+       unmake_file(file);
 
-       if (verbose > 1)
-               rprintf(FINFO, "keep_backup %s -> %s\n", fname, backup_dir_buf);
+       if (verbose > 1) {
+               rprintf(FINFO, "backed up %s to %s\n",
+                       fname, buf);
+       }
        return 1;
 }
 
 
 /* main backup switch routine */
-int make_backup(char *fname)
+int make_backup(const char *fname)
 {
        if (backup_dir)
                return keep_backup(fname);