extern int am_root;
extern int preserve_devices;
+extern int preserve_specials;
extern int preserve_links;
extern int preserve_hard_links;
extern int orig_umask;
if (do_rename(fname, fnamebak) == 0) {
if (verbose > 1) {
rprintf(FINFO, "backed up %s to %s\n",
- safe_fname(fname),
- safe_fname(fnamebak));
+ fname, fnamebak);
}
break;
}
continue;
rsyserr(FERROR, rename_errno, "rename %s to backup %s",
- safe_fname(fname), safe_fname(fnamebak));
+ fname, fnamebak);
errno = rename_errno;
return 0;
}
}
return 0;
-failure:
+ failure:
while (p != end) {
*p = '/';
p += strlen(p);
/* 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, NULL, 0755) < 0
+ && (errno != ENOENT || make_bak_dir(dst) < 0
+ || robust_rename(src, dst, NULL, 0755) < 0))
return -1;
return 0;
}
if (do_lstat(fname, &st) < 0)
return 1;
- if (!(file = make_file(fname, NULL, NO_FILTERS)))
+ if (!(file = make_file(fname, NULL, NULL, 0, NO_FILTERS)))
return 1; /* the file could have disappeared */
if (!(buf = get_backup_name(fname)))
return 0;
/* Check to see if this is a device file, or link */
- if (IS_DEVICE(file->mode) && am_root && preserve_devices) {
+ if ((am_root && preserve_devices && IS_DEVICE(file->mode))
+ || (preserve_specials && IS_SPECIAL(file->mode))) {
do_unlink(buf);
if (do_mknod(buf, file->mode, file->u.rdev) < 0
&& (errno != ENOENT || make_bak_dir(buf) < 0
full_fname(buf));
} else if (verbose > 2) {
rprintf(FINFO, "make_backup: DEVICE %s successful.\n",
- safe_fname(fname));
+ fname);
}
kept = 1;
do_unlink(fname);
|| do_symlink(file->u.link, buf) < 0)) {
rsyserr(FERROR, errno, "link %s -> \"%s\"",
full_fname(buf),
- safe_fname(file->u.link));
+ file->u.link);
}
do_unlink(fname);
kept = 1;
if (!kept && !S_ISREG(file->mode)) {
rprintf(FINFO, "make_bak: skipping non-regular file %s\n",
- safe_fname(fname));
+ fname);
return 1;
}
if (!kept) {
if (robust_move(fname, buf) != 0) {
rsyserr(FERROR, errno, "keep_backup failed: %s -> \"%s\"",
- full_fname(fname), safe_fname(buf));
+ full_fname(fname), buf);
} else if (st.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... */
}
}
- set_perms(buf, file, NULL, 0);
+ set_file_attrs(buf, file, NULL, 0);
free(file);
if (verbose > 1) {
rprintf(FINFO, "backed up %s to %s\n",
- safe_fname(fname), safe_fname(buf));
+ fname, buf);
}
return 1;
}