diff options
| author | joerg <joerg> | 2008-07-14 14:54:31 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2008-07-14 14:54:31 +0000 |
| commit | 95c87eb40a9639466316e866391f46f619bbae97 (patch) | |
| tree | 2d93aea69f9a9b8f9353ee810a3a768a2b115359 | |
| parent | 83148a3ff9ed24d60973db4272b4118b4c2a4580 (diff) | |
| download | pkgsrc-95c87eb40a9639466316e866391f46f619bbae97.tar.gz | |
Merge changes from libarchive-2.5.5.
| -rw-r--r-- | archivers/libarchive/files/libarchive/archive_entry_link_resolver.c | 5 |
1 files changed, 4 insertions, 1 deletions
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 <sys/stat.h> @@ -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: |