From: Joerg Sonnenberger <joerg.sonnenberger@gmail.com>
Date: Mon, 19 May 2008 02:12:05 +0000 (-0400)
Subject: Add a mtree mode for the link resolver.  This does hardlink
X-Git-Tag: v2.6.0~227
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a8588bf6d393fd06cca417c5036113cf11492e0e;p=thirdparty%2Flibarchive.git

Add a mtree mode for the link resolver.  This does hardlink
resolving, but doesn't change the size of the entry.

SVN-Revision: 65
---

diff --git a/libarchive/archive_entry_link_resolver.c b/libarchive/archive_entry_link_resolver.c
index 7a34b272f..3ce1070c6 100644
--- a/libarchive/archive_entry_link_resolver.c
+++ b/libarchive/archive_entry_link_resolver.c
@@ -60,8 +60,9 @@ __FBSDID("$FreeBSD: src/lib/libarchive/archive_entry_link_resolver.c,v 1.1 2007/
 
 /* Users pass us a format code, we translate that into a strategy here. */
 #define ARCHIVE_ENTRY_LINKIFY_LIKE_TAR	0
-#define ARCHIVE_ENTRY_LINKIFY_LIKE_OLD_CPIO 1
-#define ARCHIVE_ENTRY_LINKIFY_LIKE_NEW_CPIO 2
+#define ARCHIVE_ENTRY_LINKIFY_LIKE_MTREE 1
+#define ARCHIVE_ENTRY_LINKIFY_LIKE_OLD_CPIO 2
+#define ARCHIVE_ENTRY_LINKIFY_LIKE_NEW_CPIO 3
 
 /* Initial size of link cache. */
 #define	links_cache_initial_size 1024
@@ -130,6 +131,9 @@ archive_entry_linkresolver_set_strategy(struct archive_entry_linkresolver *res,
 			break;
 		}
 		break;
+	case ARCHIVE_FORMAT_MTREE:
+		res->strategy = ARCHIVE_ENTRY_LINKIFY_LIKE_MTREE;
+		break;
 	case ARCHIVE_FORMAT_TAR:
 		res->strategy = ARCHIVE_ENTRY_LINKIFY_LIKE_TAR;
 		break;
@@ -187,6 +191,14 @@ archive_entry_linkify(struct archive_entry_linkresolver *res,
 		} else
 			insert_entry(res, *e);
 		return;
+	case ARCHIVE_ENTRY_LINKIFY_LIKE_MTREE:
+		le = find_entry(res, *e);
+		if (le != NULL) {
+			archive_entry_copy_hardlink(*e,
+			    archive_entry_pathname(le->canonical));
+		} else
+			insert_entry(res, *e);
+		return;
 	case ARCHIVE_ENTRY_LINKIFY_LIKE_OLD_CPIO:
 		/* This one is trivial. */
 		return;