Use portable archive_entry services instead of S_ISBLK() and S_ISCHR() macros.

SVN-Revision: 1347

diff --git a/cpio/cpio.c b/cpio/cpio.c
index 5b2a9afa5ae774c899f5f109a8b1387e27040d41..6b6bb696579e560d8e347b261f2e63a73c438af6 100644 (file)
--- a/cpio/cpio.c
+++ b/cpio/cpio.c
@@ -973,7 +973,8 @@ list_item_verbose(struct cpio *cpio, struct archive_entry *entry)
        }
 
        /* Print device number or file size. */
-       if (S_ISCHR(st->st_mode) || S_ISBLK(st->st_mode)) {
+       if (archive_entry_filetype(entry) == AE_IFCHR
+           || archive_entry_filetype(entry) == AE_IFBLK) {
                snprintf(size, sizeof(size), "%lu,%lu",
                    (unsigned long)archive_entry_rdevmajor(entry),
                    (unsigned long)archive_entry_rdevminor(entry));