Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't output a negative time-remaining value if the file has grown.
[rsync/rsync.git]
/
backup.c
diff --git
a/backup.c
b/backup.c
index
2ae30b4
..
05856aa
100644
(file)
--- a/
backup.c
+++ b/
backup.c
@@
-2,11
+2,11
@@
* Backup handling code.
*
* Copyright (C) 1999 Andrew Tridgell
* Backup handling code.
*
* Copyright (C) 1999 Andrew Tridgell
- * Copyright (C) 2003
, 2004, 2005, 2006
Wayne Davison
+ * 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 as published by
*
* 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
+ * the Free Software Foundation; either version
3
of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
@@
-15,21
+15,20
@@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* 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.
+ * with this program; if not, visit the http://fsf.org website.
*/
#include "rsync.h"
extern int verbose;
extern int am_root;
*/
#include "rsync.h"
extern int verbose;
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 int preserve_devices;
extern int preserve_specials;
extern int preserve_links;
extern int safe_symlinks;
extern int backup_dir_len;
-extern int flist_extra_ndx;
-extern int file_struct_len;
extern unsigned int backup_dir_remainder;
extern char backup_dir_buf[MAXPATHLEN];
extern char *backup_suffix;
extern unsigned int backup_dir_remainder;
extern char backup_dir_buf[MAXPATHLEN];
extern char *backup_suffix;
@@
-95,7
+94,8
@@
path
****************************************************************************/
static int make_bak_dir(char *fullpath)
{
****************************************************************************/
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;
char *rel = fullpath + backup_dir_len;
char *end = rel + strlen(rel);
char *p = end;
@@
-127,15
+127,35
@@
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 (p >= rel) {
/* Try to transfer the directory settings of the
* actual dir that the files are coming from. */
- if (
do_stat(rel, &st
) < 0) {
+ if (
x_stat(rel, &sx.st, NULL
) < 0) {
rsyserr(FERROR, errno,
"make_bak_dir stat %s failed",
full_fname(rel));
} else {
rsyserr(FERROR, errno,
"make_bak_dir stat %s failed",
full_fname(rel));
} else {
- do_lchown(fullpath, st.st_uid, st.st_gid);
-#ifdef HAVE_CHMOD
- 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
#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);
+ unmake_file(file);
}
}
*p = '/';
}
}
*p = '/';
@@
-173,15
+193,21
@@
static int robust_move(const char *src, char *dst)
* We will move the file to be deleted into a parallel directory tree. */
static int keep_backup(const char *fname)
{
* We will move the file to be deleted into a parallel directory tree. */
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 */
struct file_struct *file;
char *buf;
int kept = 0;
int ret_code;
/* return if no file to keep */
- if (
do_lstat(fname, &st
) < 0)
+ if (
x_lstat(fname, &sx.st, NULL
) < 0)
return 1;
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 (!(file = make_file(fname, NULL, NULL, 0, NO_FILTERS)))
return 1; /* the file could have disappeared */
@@
-191,10
+217,26
@@
static int keep_backup(const char *fname)
return 0;
}
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))) {
/* 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))) {
- dev_t rdev = MAKEDEV(F_DMAJOR(file), F_DMINOR(file));
+ 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_unlink(buf);
if (do_mknod(buf, file->mode, rdev) < 0
&& (errno != ENOENT || make_bak_dir(buf) < 0
@@
-261,13
+303,13
@@
static int keep_backup(const char *fname)
if (robust_move(fname, buf) != 0) {
rsyserr(FERROR, errno, "keep_backup failed: %s -> \"%s\"",
full_fname(fname), buf);
if (robust_move(fname, buf) != 0) {
rsyserr(FERROR, errno, "keep_backup failed: %s -> \"%s\"",
full_fname(fname), buf);
- } else if (st.st_nlink > 1) {
+ } else if (s
x.s
t.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... */
}
}
/* 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_file_attrs(buf, file, NULL, 0);
+ set_file_attrs(buf, file, NULL,
fname,
0);
unmake_file(file);
if (verbose > 1) {
unmake_file(file);
if (verbose > 1) {