The ndx arg passed to increment_active_files() is now the unique,

[rsync/rsync.git] / backup.c

diff --git a/backup.c b/backup.c
index 328c065..e1d0ee7 100644 (file)
--- a/backup.c
+++ b/backup.c
@@ -27,8 +27,6 @@ extern int preserve_devices;
 extern int preserve_specials;
 extern int preserve_links;
 extern int safe_symlinks;
-extern int flist_extra_ndx;
-extern int file_struct_len;
 extern int backup_dir_len;
 extern unsigned int backup_dir_remainder;
 extern char backup_dir_buf[MAXPATHLEN];
@@ -194,7 +192,8 @@ static int keep_backup(const char *fname)
        /* Check to see if this is a device file, or link */
        if ((am_root && preserve_devices && IS_DEVICE(file->mode))
         || (preserve_specials && IS_SPECIAL(file->mode))) {
-               dev_t rdev = MAKEDEV(F_DMAJOR(file), F_DMINOR(file));
+               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