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)
/* 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;
}
/* 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) {
+ 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)) {
rprintf(FERROR, "mknod %s failed: %s\n",
full_fname(backup_dir_buf), strerror(errno));
} else if (verbose > 2) {
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)) {
+ rprintf(FINFO, "mkdir %s failed: %s\n",
+ full_fname(backup_dir_buf), strerror(errno));
+ }
+ 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) {
+ 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)) {
rprintf(FERROR, "link %s -> %s : %s\n",
full_fname(backup_dir_buf), file->u.link, strerror(errno));
}