From e066c90bb27792ec5eb50cc9fe3e80a49ee970af Mon Sep 17 00:00:00 2001 From: Tim Kientzle Date: Sat, 23 Jan 2010 07:57:17 +0000 Subject: [PATCH] Don't try to hardlink block or character device nodes that come out of cpio archives. --- lib/libarchive/archive_entry_link_resolver.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/libarchive/archive_entry_link_resolver.c b/lib/libarchive/archive_entry_link_resolver.c index c190108cd26..a5eb624b610 100644 --- a/lib/libarchive/archive_entry_link_resolver.c +++ b/lib/libarchive/archive_entry_link_resolver.c @@ -181,8 +181,10 @@ archive_entry_linkify(struct archive_entry_linkresolver *res, /* If it has only one link, then we're done. */ if (archive_entry_nlink(*e) == 1) return; - /* Directories never have hardlinks. */ - if (archive_entry_filetype(*e) == AE_IFDIR) + /* Directories, devices never have hardlinks. */ + if (archive_entry_filetype(*e) == AE_IFDIR + || archive_entry_filetype(*e) == AE_IFBLK + || archive_entry_filetype(*e) == AE_IFCHR) return; switch (res->strategy) {