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
New functions, variables, and file-list code to support the new
[rsync/rsync.git]
/
backup.c
diff --git
a/backup.c
b/backup.c
index
612130b
..
e1d0ee7
100644
(file)
--- a/
backup.c
+++ b/
backup.c
@@
-22,20
+22,19
@@
#include "rsync.h"
extern int verbose;
#include "rsync.h"
extern int verbose;
-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_specials;
extern int preserve_links;
extern int safe_symlinks;
extern int am_root;
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;
/* make a complete pathname for backup file */
/* make a complete pathname for backup file */
-char *get_backup_name(char *fname)
+char *get_backup_name(c
onst c
har *fname)
{
if (backup_dir) {
if (stringjoin(backup_dir_buf + backup_dir_len, backup_dir_remainder,
{
if (backup_dir) {
if (stringjoin(backup_dir_buf + backup_dir_len, backup_dir_remainder,
@@
-52,10
+51,10
@@
char *get_backup_name(char *fname)
}
/* simple backup creates a backup with a suffix in the same directory */
}
/* simple backup creates a backup with a suffix in the same directory */
-static int make_simple_backup(char *fname)
+static int make_simple_backup(c
onst c
har *fname)
{
int rename_errno;
{
int rename_errno;
- char *fnamebak = get_backup_name(fname);
+ c
onst c
har *fnamebak = get_backup_name(fname);
if (!fnamebak)
return 0;
if (!fnamebak)
return 0;
@@
-132,7
+131,9
@@
static int make_bak_dir(char *fullpath)
full_fname(rel));
} else {
do_lchown(fullpath, st.st_uid, st.st_gid);
full_fname(rel));
} else {
do_lchown(fullpath, st.st_uid, st.st_gid);
+#ifdef HAVE_CHMOD
do_chmod(fullpath, st.st_mode);
do_chmod(fullpath, st.st_mode);
+#endif
}
}
*p = '/';
}
}
*p = '/';
@@
-156,7
+157,7
@@
static int make_bak_dir(char *fullpath)
}
/* robustly move a file, creating new directory structures if necessary */
}
/* robustly move a file, creating new directory structures if necessary */
-static int robust_move(char *src, char *dst)
+static int robust_move(c
onst c
har *src, char *dst)
{
if (robust_rename(src, dst, NULL, 0755) < 0
&& (errno != ENOENT || make_bak_dir(dst) < 0
{
if (robust_rename(src, dst, NULL, 0755) < 0
&& (errno != ENOENT || make_bak_dir(dst) < 0
@@
-168,7
+169,7
@@
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. */
/* 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(c
onst c
har *fname)
{
STRUCT_STAT st;
struct file_struct *file;
{
STRUCT_STAT st;
struct file_struct *file;
@@
-183,16
+184,20
@@
static int keep_backup(char *fname)
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 */
- if (!(buf = get_backup_name(fname)))
+ if (!(buf = get_backup_name(fname))) {
+ unmake_file(file);
return 0;
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))) {
/* 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))) {
+ uint32 *devp = F_RDEV_P(file);
+ dev_t rdev = MAKEDEV(DEV_MAJOR(devp), DEV_MINOR(devp));
do_unlink(buf);
do_unlink(buf);
- if (do_mknod(buf, file->mode,
file->u.
rdev) < 0
+ if (do_mknod(buf, file->mode, rdev) < 0
&& (errno != ENOENT || make_bak_dir(buf) < 0
&& (errno != ENOENT || make_bak_dir(buf) < 0
- || do_mknod(buf, file->mode,
file->u.
rdev) < 0)) {
+ || do_mknod(buf, file->mode, rdev) < 0)) {
rsyserr(FERROR, errno, "mknod %s failed",
full_fname(buf));
} else if (verbose > 2) {
rsyserr(FERROR, errno, "mknod %s failed",
full_fname(buf));
} else if (verbose > 2) {
@@
-222,20
+227,20
@@
static int keep_backup(char *fname)
#ifdef SUPPORT_LINKS
if (!kept && preserve_links && S_ISLNK(file->mode)) {
#ifdef SUPPORT_LINKS
if (!kept && preserve_links && S_ISLNK(file->mode)) {
- if (safe_symlinks && unsafe_symlink(file->u.link, buf)) {
+ const char *sl = F_SYMLINK(file);
+ if (safe_symlinks && unsafe_symlink(sl, buf)) {
if (verbose) {
rprintf(FINFO, "ignoring unsafe symlink %s -> %s\n",
if (verbose) {
rprintf(FINFO, "ignoring unsafe symlink %s -> %s\n",
- full_fname(buf),
file->u.link
);
+ full_fname(buf),
sl
);
}
kept = 1;
} else {
do_unlink(buf);
}
kept = 1;
} else {
do_unlink(buf);
- if (do_symlink(
file->u.link
, buf) < 0
+ if (do_symlink(
sl
, buf) < 0
&& (errno != ENOENT || make_bak_dir(buf) < 0
&& (errno != ENOENT || make_bak_dir(buf) < 0
- || do_symlink(
file->u.link
, buf) < 0)) {
+ || do_symlink(
sl
, buf) < 0)) {
rsyserr(FERROR, errno, "link %s -> \"%s\"",
rsyserr(FERROR, errno, "link %s -> \"%s\"",
- full_fname(buf),
- file->u.link);
+ full_fname(buf), sl);
}
do_unlink(fname);
kept = 1;
}
do_unlink(fname);
kept = 1;
@@
-246,6
+251,7
@@
static int keep_backup(char *fname)
if (!kept && !S_ISREG(file->mode)) {
rprintf(FINFO, "make_bak: skipping non-regular file %s\n",
fname);
if (!kept && !S_ISREG(file->mode)) {
rprintf(FINFO, "make_bak: skipping non-regular file %s\n",
fname);
+ unmake_file(file);
return 1;
}
return 1;
}
@@
-261,7
+267,7
@@
static int keep_backup(char *fname)
}
}
set_file_attrs(buf, file, NULL, 0);
}
}
set_file_attrs(buf, file, NULL, 0);
-
fre
e(file);
+
unmake_fil
e(file);
if (verbose > 1) {
rprintf(FINFO, "backed up %s to %s\n",
if (verbose > 1) {
rprintf(FINFO, "backed up %s to %s\n",
@@
-272,7
+278,7
@@
static int keep_backup(char *fname)
/* main backup switch routine */
/* main backup switch routine */
-int make_backup(char *fname)
+int make_backup(c
onst c
har *fname)
{
if (backup_dir)
return keep_backup(fname);
{
if (backup_dir)
return keep_backup(fname);