* Backup handling code.
*
* Copyright (C) 1999 Andrew Tridgell
- * Copyright (C) 2003-2007 Wayne Davison
+ * Copyright (C) 2003-2008 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.
+ * it under the terms of the GNU General Public License as published by
+ * 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,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* 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"
Create a directory given an absolute path, perms based upon another directory
path
****************************************************************************/
-static int make_bak_dir(char *fullpath)
+int make_bak_dir(const char *fullpath)
{
- statx sx;
+ char fbuf[MAXPATHLEN], *rel, *end, *p;
struct file_struct *file;
- char *rel = fullpath + backup_dir_len;
- char *end = rel + strlen(rel);
- char *p = end;
+ int len = backup_dir_len;
+ stat_x sx;
- while (strncmp(fullpath, "./", 2) == 0)
+ while (*fullpath == '.' && fullpath[1] == '/') {
fullpath += 2;
+ len -= 2;
+ }
+
+ if (strlcpy(fbuf, fullpath, sizeof fbuf) >= sizeof fbuf)
+ return -1;
+
+ rel = fbuf + len;
+ end = p = rel + strlen(rel);
/* Try to find an existing dir, starting from the deepest dir. */
while (1) {
- if (--p == fullpath) {
- p += strlen(p);
- goto failure;
- }
+ if (--p == fbuf)
+ return -1;
if (*p == '/') {
*p = '\0';
- if (mkdir_defmode(fullpath) == 0)
+ if (mkdir_defmode(fbuf) == 0)
break;
if (errno != ENOENT) {
rsyserr(FERROR, errno,
"make_bak_dir mkdir %s failed",
- full_fname(fullpath));
- goto failure;
+ full_fname(fbuf));
+ return -1;
}
}
}
if (p >= rel) {
/* Try to transfer the directory settings of the
* actual dir that the files are coming from. */
- if (do_stat(rel, &sx.st) < 0) {
+ if (x_stat(rel, &sx.st, NULL) < 0) {
rsyserr(FERROR, errno,
"make_bak_dir stat %s failed",
full_fname(rel));
free_xattr(&sx);
}
#endif
- set_file_attrs(fullpath, file, NULL, NULL, 0);
- free(file);
+ set_file_attrs(fbuf, file, NULL, NULL, 0);
+ unmake_file(file);
}
}
*p = '/';
p += strlen(p);
if (p == end)
break;
- if (mkdir_defmode(fullpath) < 0) {
+ if (mkdir_defmode(fbuf) < 0) {
rsyserr(FERROR, errno, "make_bak_dir mkdir %s failed",
- full_fname(fullpath));
- goto failure;
+ full_fname(fbuf));
+ return -1;
}
}
- return 0;
- failure:
- while (p != end) {
- *p = '/';
- p += strlen(p);
- }
- return -1;
+ return 0;
}
/* robustly move a file, creating new directory structures if necessary */
static int robust_move(const char *src, char *dst)
{
- if (robust_rename(src, dst, NULL, 0755) < 0
- && (errno != ENOENT || make_bak_dir(dst) < 0
- || robust_rename(src, dst, NULL, 0755) < 0))
- return -1;
+ if (robust_rename(src, dst, NULL, 0755) < 0) {
+ int save_errno = errno ? errno : EINVAL; /* 0 paranoia */
+ if (errno == ENOENT && make_bak_dir(dst) == 0) {
+ if (robust_rename(src, dst, NULL, 0755) < 0)
+ save_errno = errno ? errno : save_errno;
+ else
+ save_errno = 0;
+ }
+ if (save_errno) {
+ errno = save_errno;
+ return -1;
+ }
+ }
return 0;
}
* We will move the file to be deleted into a parallel directory tree. */
static int keep_backup(const char *fname)
{
- statx sx;
+ stat_x sx;
struct file_struct *file;
char *buf;
+ int save_preserve_xattrs = preserve_xattrs;
int kept = 0;
int ret_code;
/* return if no file to keep */
- if (do_lstat(fname, &sx.st) < 0)
+ if (x_lstat(fname, &sx.st, NULL) < 0)
return 1;
#ifdef SUPPORT_ACLS
sx.acc_acl = sx.def_acl = NULL;
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));
+ if (do_mknod(buf, file->mode, rdev) < 0) {
+ int save_errno = errno ? errno : EINVAL; /* 0 paranoia */
+ if (errno == ENOENT && make_bak_dir(buf) == 0) {
+ if (do_mknod(buf, file->mode, rdev) < 0)
+ save_errno = errno ? errno : save_errno;
+ else
+ save_errno = 0;
+ }
+ if (save_errno) {
+ rsyserr(FERROR, save_errno, "mknod %s failed",
+ full_fname(buf));
+ }
} else if (verbose > 2) {
rprintf(FINFO, "make_backup: DEVICE %s successful.\n",
fname);
if (!kept && S_ISDIR(file->mode)) {
/* make an empty directory */
- 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(buf));
+ if (do_mkdir(buf, file->mode) < 0) {
+ int save_errno = errno ? errno : EINVAL; /* 0 paranoia */
+ if (errno == ENOENT && make_bak_dir(buf) == 0) {
+ if (do_mkdir(buf, file->mode) < 0)
+ save_errno = errno ? errno : save_errno;
+ else
+ save_errno = 0;
+ }
+ if (save_errno) {
+ rsyserr(FINFO, save_errno, "mkdir %s failed",
+ full_fname(buf));
+ }
}
ret_code = do_rmdir(fname);
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);
+ if (do_symlink(sl, buf) < 0) {
+ int save_errno = errno ? errno : EINVAL; /* 0 paranoia */
+ if (errno == ENOENT && make_bak_dir(buf) == 0) {
+ if (do_symlink(sl, buf) < 0)
+ save_errno = errno ? errno : save_errno;
+ else
+ save_errno = 0;
+ }
+ if (save_errno) {
+ rsyserr(FERROR, save_errno, "link %s -> \"%s\"",
+ full_fname(buf), sl);
+ }
}
do_unlink(fname);
kept = 1;
robust_unlink(fname); /* Just in case... */
}
}
+ preserve_xattrs = 0;
set_file_attrs(buf, file, NULL, fname, 0);
+ preserve_xattrs = save_preserve_xattrs;
unmake_file(file);
if (verbose > 1) {
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff