From 7527c57d09ede008eecba6f1c0e90ae1f60d9630 Mon Sep 17 00:00:00 2001 From: joerg Date: Mon, 14 Jul 2008 14:54:31 +0000 Subject: Merge changes from libarchive-2.5.5. --- archivers/libarchive/files/libarchive/archive_entry_link_resolver.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'archivers') diff --git a/archivers/libarchive/files/libarchive/archive_entry_link_resolver.c b/archivers/libarchive/files/libarchive/archive_entry_link_resolver.c index 6ee5939c5c2..5ea2fa4ca94 100644 --- a/archivers/libarchive/files/libarchive/archive_entry_link_resolver.c +++ b/archivers/libarchive/files/libarchive/archive_entry_link_resolver.c @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry_link_resolver.c,v 1.1 2007/12/30 04:58:21 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry_link_resolver.c,v 1.3 2008/06/15 04:31:43 kientzle Exp $"); #ifdef HAVE_SYS_STAT_H #include @@ -183,6 +183,9 @@ 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) + return; switch (res->strategy) { case ARCHIVE_ENTRY_LINKIFY_LIKE_TAR: -- cgit v1.2.3