X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/3de73827d7034a8c47d06620ebda0136b2c7fbe2..c3ef136d41a9981433c1234c55f1ea76cd35d2f1:/backup.c diff --git a/backup.c b/backup.c index d36524a8..e5b83848 100644 --- a/backup.c +++ b/backup.c @@ -30,6 +30,7 @@ extern char *backup_dir; 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; @@ -187,7 +188,8 @@ static int keep_backup(char *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 @@ -259,7 +261,7 @@ static int keep_backup(char *fname) robust_unlink(fname); /* Just in case... */ } } - set_perms(buf, file, NULL, 0); + set_file_attrs(buf, file, NULL, 0); free(file); if (verbose > 1) {