Use the new device defines: F_RDEV_P(), DEV_MAJOR(), and DEV_MINOR().
authorWayne Davison <wayned@samba.org>
Thu, 7 Dec 2006 03:31:31 +0000 (03:31 +0000)
committerWayne Davison <wayned@samba.org>
Thu, 7 Dec 2006 03:31:31 +0000 (03:31 +0000)
backup.c

index 1560255..e1d0ee7 100644 (file)
--- a/backup.c
+++ b/backup.c
@@ -192,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