[pkgsrc/trunk]: pkgsrc/archivers/libarchive/files/libarchive Merge changes fr...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/250c5f1d7078
branches:  trunk
changeset: 544424:250c5f1d7078
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Mon Jul 14 14:54:31 2008 +0000

description:
Merge changes from libarchive-2.5.5.

diffstat:

 archivers/libarchive/files/libarchive/archive_entry_link_resolver.c |  5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diffs (22 lines):

diff -r 5f969901add2 -r 250c5f1d7078 archivers/libarchive/files/libarchive/archive_entry_link_resolver.c
--- a/archivers/libarchive/files/libarchive/archive_entry_link_resolver.c       Mon Jul 14 14:52:33 2008 +0000
+++ b/archivers/libarchive/files/libarchive/archive_entry_link_resolver.c       Mon Jul 14 14:54:31 2008 +0000
@@ -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 <sys/stat.h>
@@ -183,6 +183,9 @@
        /* 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: