From: Tim Kientzle <kientzle@gmail.com>
Date: Thu, 6 Aug 2009 05:03:38 +0000 (-0400)
Subject: Use portable archive_entry services instead of S_ISBLK() and S_ISCHR() macros.
X-Git-Tag: v2.8.0~441
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=004eb4350f8f1be4b169c1f562c8f786b4792035;p=thirdparty%2Flibarchive.git

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 5b2a9afa5..6b6bb6965 100644
--- 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));