From 08a30d270d3733b64839639e53a724f42016a989 Mon Sep 17 00:00:00 2001
From: Moinak Ghosh <moinakg@gmail.com>
Date: Thu, 11 Sep 2014 19:17:02 +0530
Subject: [PATCH] Add caller-defined xattr handling features to private
 libarchive.

---
 .../libarchive/archive_entry.h                |  9 ++++
 .../libarchive/archive_entry_xattr.c          | 52 +++++++++++++++++++
 2 files changed, 61 insertions(+)

diff --git a/archive/libarchive-3.1.2/libarchive/archive_entry.h b/archive/libarchive-3.1.2/libarchive/archive_entry.h
index a905065..6d2e9f9 100644
--- a/archive/libarchive-3.1.2/libarchive/archive_entry.h
+++ b/archive/libarchive-3.1.2/libarchive/archive_entry.h
@@ -498,6 +498,15 @@ __LA_DECL void	 archive_entry_xattr_add_entry(struct archive_entry *,
 	    const char * /* name */, const void * /* value */,
 	    size_t /* size */);
 
+/*
+ * Interfaces to support tagging archive entries with caller-defined xattrs.
+ */
+__LA_DECL void   archive_entry_xattr_delete_entry(struct archive_entry *,
+            const char * /* name */);
+__LA_DECL  int   archive_entry_has_xattr(struct archive_entry *entry,
+            const char * /* name */, const void ** /* value */,
+	    size_t * /* size */)
+
 /*
  * To retrieve the xattr list, first "reset", then repeatedly ask for the
  * "next" entry.
diff --git a/archive/libarchive-3.1.2/libarchive/archive_entry_xattr.c b/archive/libarchive-3.1.2/libarchive/archive_entry_xattr.c
index a3efe7c..83f52f7 100644
--- a/archive/libarchive-3.1.2/libarchive/archive_entry_xattr.c
+++ b/archive/libarchive-3.1.2/libarchive/archive_entry_xattr.c
@@ -109,6 +109,58 @@ archive_entry_xattr_add_entry(struct archive_entry *entry,
 	entry->xattr_head = xp;
 }
 
+/*
+ * Delete the named extended attribute, if present.
+ */
+void
+archive_entry_xattr_delete_entry(struct archive_entry *entry,
+	const char *name)
+{
+	struct ae_xattr *xp, *pxp;
+
+	pxp = NULL;
+	for (xp = entry->xattr_head; xp != NULL; xp = xp->next)
+	{
+		if (strcmp(name, xp->name) == 0) {
+			free(xp->name);
+			if (xp->size > 0)
+				free(xp->value);
+			if (pxp == NULL) {
+				/*
+				 * Free at head.
+				 */
+				entry->xattr_head = xp->next;
+				free(xp);
+			} else {
+				pxp->next = xp->next;
+				free(xp);
+			}
+			break;
+		}
+		pxp = xp;
+	}
+}
+
+/*
+ * Search for the named extended attribute. Return it's value and size
+ * if present.
+ */
+int
+archive_entry_has_xattr(struct archive_entry *entry,
+	const char *name, const void **value, size_t *size)
+{
+	struct ae_xattr *xp;
+
+	for (xp = entry->xattr_head; xp != NULL; xp = xp->next)
+	{
+		if (strcmp(name, xp->name) == 0) {
+			*value = xp->value;
+			*size = xp->size;
+			return (1);
+		}
+	}
+	return (0);
+}
 
 /*
  * returns number of the extended attribute entries