extern int preserve_links;
extern int preserve_hard_links;
extern int orig_umask;
+extern int safe_symlinks;
/* simple backup creates a backup with a suffix in the same directory */
static int make_simple_backup(char *fname)
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);
+ rsyserr(FERROR, errno,
+ "rename %s to backup %s", fname, fnamebak);
return 0;
}
} else if (verbose > 1) {
if (do_mkdir(fullpath, 0777 & ~orig_umask) == 0)
break;
if (errno != ENOENT) {
- rprintf(FERROR,
- "make_bak_dir mkdir %s failed: %s\n",
- full_fname(fullpath), strerror(errno));
+ rsyserr(FERROR, errno,
+ "make_bak_dir mkdir %s failed",
+ full_fname(fullpath));
goto failure;
}
}
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) {
- rprintf(FERROR,
- "make_bak_dir stat %s failed: %s\n",
- full_fname(rel), strerror(errno));
+ if (do_stat(rel, &st) < 0) {
+ rsyserr(FERROR, errno,
+ "make_bak_dir stat %s failed",
+ full_fname(rel));
} else {
- set_modtime(fullpath, st.st_mtime);
do_lchown(fullpath, st.st_uid, st.st_gid);
do_chmod(fullpath, st.st_mode);
}
if (p == end)
break;
if (do_mkdir(fullpath, 0777 & ~orig_umask) < 0) {
- rprintf(FERROR,
- "make_bak_dir mkdir %s failed: %s\n",
- full_fname(fullpath), strerror(errno));
+ rsyserr(FERROR, errno, "make_bak_dir mkdir %s failed",
+ full_fname(fullpath));
goto failure;
}
}
/* robustly move a file, creating new directory structures if necessary */
static int robust_move(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, 0755) < 0 && (errno != ENOENT
+ || make_bak_dir(dst) < 0 || robust_rename(src, dst, 0755) < 0))
return -1;
return 0;
}
/* return if no file to keep */
#if SUPPORT_LINKS
- if (do_lstat(fname, &st)) return 1;
+ ret_code = do_lstat(fname, &st);
#else
- if (do_stat(fname, &st)) return 1;
+ ret_code = do_stat(fname, &st);
#endif
+ if (ret_code < 0)
+ return 1;
file = make_file(fname, NULL, NO_EXCLUDES);
/* Check to see if this is a device file, or link */
if (IS_DEVICE(file->mode)) {
if (am_root && preserve_devices) {
- make_bak_dir(backup_dir_buf);
- if (do_mknod(backup_dir_buf, file->mode, file->u.rdev) != 0) {
- rprintf(FERROR, "mknod %s failed: %s\n",
- full_fname(backup_dir_buf), strerror(errno));
+ 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",
if (!kept && S_ISDIR(file->mode)) {
/* make an empty directory */
- make_bak_dir(backup_dir_buf);
- do_mkdir(backup_dir_buf, file->mode);
- ret_code = do_rmdir(fname);
+ 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)) {
+ rsyserr(FINFO, errno, "mkdir %s failed",
+ full_fname(backup_dir_buf));
+ }
+ ret_code = do_rmdir(fname);
if (verbose > 2) {
rprintf(FINFO, "make_backup: RMDIR %s returns %i\n",
full_fname(fname), ret_code);
#if SUPPORT_LINKS
if (!kept && preserve_links && S_ISLNK(file->mode)) {
- extern int safe_symlinks;
if (safe_symlinks && unsafe_symlink(file->u.link, backup_dir_buf)) {
if (verbose) {
rprintf(FINFO, "ignoring unsafe symlink %s -> %s\n",
}
kept = 1;
}
- make_bak_dir(backup_dir_buf);
- if (do_symlink(file->u.link, backup_dir_buf) != 0) {
- rprintf(FERROR, "link %s -> %s : %s\n",
- full_fname(backup_dir_buf), file->u.link, strerror(errno));
+ 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;
/* move to keep tree if a file */
if (!kept) {
if (robust_move(fname, backup_dir_buf) != 0) {
- rprintf(FERROR, "keep_backup failed: %s -> \"%s\": %s\n",
- full_fname(fname), backup_dir_buf, strerror(errno));
+ rsyserr(FERROR, errno, "keep_backup failed: %s -> \"%s\"",
+ full_fname(fname), backup_dir_buf);
}
}
set_perms(backup_dir_buf, file, NULL, 0);