diff --git a/Makefile.am b/Makefile.am

index 288668819..96542c8c8 100644

--- a/Makefile.am

+++ b/Makefile.am

@@ -185,7 +185,7 @@ bin_PROGRAMS +=		rpmgraph

 rpmgraph_SOURCES =	tools/rpmgraph.c

 rpmgraph_LDADD =	lib/librpm.la rpmio/librpmio.la @WITH_POPT_LIB@

-dist_bin_SCRIPTS =	scripts/gendiff

+dist_bin_SCRIPTS =	scripts/gendiff scripts/rpm2extents_dump

 rpmconfig_DATA = rpmrc

 rpmrc: $(top_srcdir)/rpmrc.in

diff --git a/lib/Makefile.am b/lib/Makefile.am

index 5a1b6ca9b..2f1b3597f 100644

--- a/lib/Makefile.am

+++ b/lib/Makefile.am

@@ -40,7 +40,8 @@ librpm_la_SOURCES = \

 	rpmscript.h rpmscript.c \

 	rpmchroot.c rpmchroot.h \

 	rpmplugins.c rpmplugins.h rpmplugin.h rpmug.c rpmug.h \

-	rpmtriggers.h rpmtriggers.c rpmvs.c rpmvs.h

+	rpmtriggers.h rpmtriggers.c rpmvs.c rpmvs.h \

+	rpmextents.c rpmextents_internal.h

 librpm_la_LDFLAGS = -version-info $(rpm_version_info)

diff --git a/lib/depends.c b/lib/depends.c

index 8998afcd3..30234df3d 100644

--- a/lib/depends.c

+++ b/lib/depends.c

@@ -81,8 +81,6 @@ static rpmRC headerCheckPayloadFormat(Header h) {

      */

     if (!payloadfmt) return rc;

-    if (rstreq(payloadfmt, "clon")) return rc;

-

     if (!rstreq(payloadfmt, "cpio")) {

         char *nevra = headerGetAsString(h, RPMTAG_NEVRA);

         if (payloadfmt && rstreq(payloadfmt, "drpm")) {

diff --git a/lib/fsm.c b/lib/fsm.c

index feda3750c..6972602e0 100644

--- a/lib/fsm.c

+++ b/lib/fsm.c

@@ -19,7 +19,6 @@

 #include "rpmio/rpmio_internal.h"	/* fdInit/FiniDigest */

 #include "lib/fsm.h"

-#include "lib/rpmlib.h"

 #include "lib/rpmte_internal.h"	/* XXX rpmfs */

 #include "lib/rpmplugins.h"	/* rpm plugins hooks */

 #include "lib/rpmug.h"

@@ -53,7 +52,6 @@ struct filedata_s {

     int stage;

     int setmeta;

     int skip;

-    int plugin_contents;

     rpmFileAction action;

     const char *suffix;

     char *fpath;

@@ -893,14 +891,6 @@ int rpmPackageFilesInstall(rpmts ts, rpmte te, rpmfiles files,

     struct filedata_s *fdata = xcalloc(fc, sizeof(*fdata));

     struct filedata_s *firstlink = NULL;

-    Header h = rpmteHeader(te);

-    const char *payloadfmt = headerGetString(h, RPMTAG_PAYLOADFORMAT);

-    int cpio = 1;

-

-    if (payloadfmt && rstreq(payloadfmt, "clon")) {

-	cpio = 0;

-    }

-

     /* transaction id used for temporary path suffix while installing */

     rasprintf(&tid, ";%08x", (unsigned)rpmtsGetTid(ts));

@@ -921,23 +911,12 @@ int rpmPackageFilesInstall(rpmts ts, rpmte te, rpmfiles files,

 	/* Remap file perms, owner, and group. */

 	rc = rpmfiStat(fi, 1, &fp->sb);

+	setFileState(fs, fx);

 	fsmDebug(fp->fpath, fp->action, &fp->sb);

 	/* Run fsm file pre hook for all plugins */

 	rc = rpmpluginsCallFsmFilePre(plugins, fi, fp->fpath,

 				      fp->sb.st_mode, fp->action);

-	fp->plugin_contents = 0;

-	switch (rc) {

-	case RPMRC_OK:

-	    setFileState(fs, fx);

-	    break;

-	case RPMRC_PLUGIN_CONTENTS:

-	    fp->plugin_contents = 1;

-	    // reduce reads on cpio to this value. Could be zero if

-	    // this is from a hard link.

-	    rc = RPMRC_OK;

-	    break;

-	}

 	fp->stage = FILE_PRE;

     }

     fi = rpmfiFree(fi);

@@ -945,14 +924,24 @@ int rpmPackageFilesInstall(rpmts ts, rpmte te, rpmfiles files,

     if (rc)

 	goto exit;

-    if (cpio) {

-	fi = rpmfiNewArchiveReader(payload, files, RPMFI_ITER_READ_ARCHIVE);

-	if (fi == NULL) {

-	    rc = RPMERR_BAD_MAGIC;

-	    goto exit;

-	}

-    } else {

-	fi = rpmfilesIter(files, RPMFI_ITER_FWD);

+    rpmRC plugin_rc = rpmpluginsCallFsmFileArchiveReader(plugins, payload, files, &fi);

+    switch(plugin_rc) {

+	case RPMRC_PLUGIN_CONTENTS:

+	    if(fi == NULL) {

+		rc = RPMERR_BAD_MAGIC;

+		goto exit;

+	    }

+	    rc = RPMRC_OK;

+	    break;

+	case RPMRC_OK:

+	    fi = rpmfiNewArchiveReader(payload, files, RPMFI_ITER_READ_ARCHIVE);

+	    if (fi == NULL) {

+		rc = RPMERR_BAD_MAGIC;

+		goto exit;

+	    }

+	    break;

+	default:

+	    rc = RPMRC_FAIL;

     }

     /* Detect and create directories not explicitly in package. */

@@ -992,14 +981,15 @@ int rpmPackageFilesInstall(rpmts ts, rpmte te, rpmfiles files,

 	    if (fp->action == FA_TOUCH)

 		continue;

-            if (S_ISREG(fp->sb.st_mode)) {

+	    rpmRC plugin_rc = rpmpluginsCallFsmFileInstall(plugins, fi, fp->fpath, fp->sb.st_mode, fp->action);

+	    if(!(plugin_rc == RPMRC_PLUGIN_CONTENTS || plugin_rc == RPMRC_OK)){

+		rc = plugin_rc;

+	    } else if(plugin_rc == RPMRC_PLUGIN_CONTENTS){

+		rc = RPMRC_OK;

+	    } else if (S_ISREG(fp->sb.st_mode)) {

 		if (rc == RPMERR_ENOENT) {

-		    if(fp->plugin_contents) {

-			rc = RPMRC_OK;

-		    }else {

-			rc = fsmMkfile(fi, fp, files, psm, nodigest,

-			    &firstlink, &firstlinkfile);

-		    }

+		    rc = fsmMkfile(fi, fp, files, psm, nodigest,

+				   &firstlink, &firstlinkfile);

 		}

             } else if (S_ISDIR(fp->sb.st_mode)) {

                 if (rc == RPMERR_ENOENT) {

@@ -1107,7 +1097,6 @@ int rpmPackageFilesInstall(rpmts ts, rpmte te, rpmfiles files,

     rpmswAdd(rpmtsOp(ts, RPMTS_OP_DIGEST), fdOp(payload, FDSTAT_DIGEST));

 exit:

-    h = headerFree(h);

     fi = rpmfiFree(fi);

     Fclose(payload);

     free(tid);

diff --git a/lib/rpmchecksig.c b/lib/rpmchecksig.c

index 40a3ab83f..dc1726a18 100644

--- a/lib/rpmchecksig.c

+++ b/lib/rpmchecksig.c

@@ -20,6 +20,7 @@

 #include "rpmio/rpmio_internal.h" 	/* fdSetBundle() */

 #include "lib/rpmlead.h"

 #include "lib/header_internal.h"

+#include "lib/rpmextents_internal.h"

 #include "lib/rpmvs.h"

 #include "debug.h"

@@ -220,6 +221,71 @@ rpmRC rpmpkgRead(struct rpmvs_s *vs, FD_t fd,

     return rc;

 }

+static int rpmpkgVerifySigsTranscoded(FD_t fd){

+    rpm_loff_t current;

+    uint64_t magic;

+    rpm_loff_t offset;

+    int32_t rc;

+    size_t len;

+    uint64_t content_len;

+    char *content = NULL;

+

+    current = Ftell(fd);

+

+    if(Fseek(fd, -(sizeof(magic) + 3 * sizeof(offset) ), SEEK_END) < 0) {

+	rpmlog(RPMLOG_ERR, _("rpmpkgVerifySigsTranscoded: failed to seek for offset\n"));

+	rc = -1;

+	goto exit;

+    }

+

+    len = sizeof(offset);

+    if (Fread(&offset, len, 1, fd) != len) {

+	rpmlog(RPMLOG_ERR, _("rpmpkgVerifySigsTranscoded: Failed to read Signature Verification offset\n"));

+	rc = -1;

+	goto exit;

+    }

+

+    if(Fseek(fd,  offset, SEEK_SET) < 0) {

+	rpmlog(RPMLOG_ERR, _("rpmpkgVerifySigsTranscoded: Failed to seek signature verification offset\n"));

+	rc = -1;

+	goto exit;

+    }

+    len = sizeof(rc);

+    if (Fread(&rc, len, 1, fd) != len) {

+	rpmlog(RPMLOG_ERR, _("rpmpkgVerifySigsTranscoded: Failed to read Signature Verification RC\n"));

+	rc = -1;

+	goto exit;

+    }

+

+    len = sizeof(content_len);

+    if (Fread(&content_len, len, 1, fd) != len) {

+	rpmlog(RPMLOG_ERR, _("rpmpkgVerifySigsTranscoded: Failed to read signature content length\n"));

+	goto exit;

+    }

+

+    content = malloc(content_len + 1);

+    if(content == NULL) {

+	rpmlog(RPMLOG_ERR, _("rpmpkgVerifySigsTranscoded: Failed to allocate memory to read signature content\n"));

+	goto exit;

+    }

+    content[content_len] = 0;

+    if (Fread(content, content_len, 1, fd) != content_len) {

+	rpmlog(RPMLOG_ERR, _("rpmpkgVerifySigsTranscoded: Failed to read signature content\n"));

+	goto exit;

+    }

+

+    rpmlog(RPMLOG_NOTICE, "%s", content);

+exit:

+    if(content){

+	free(content);

+    }

+    if (Fseek(fd, current, SEEK_SET) < 0) {

+	rpmlog(RPMLOG_ERR, _("rpmpkgVerifySigsTranscoded: unable to seek back to original location\n"));

+    }

+    return rc;

+

+}

+

 static int rpmpkgVerifySigs(rpmKeyring keyring, int vfylevel, rpmVSFlags flags,

 			   FD_t fd, const char *fn)

 {

@@ -229,10 +295,14 @@ static int rpmpkgVerifySigs(rpmKeyring keyring, int vfylevel, rpmVSFlags flags,

 			    .verbose = rpmIsVerbose(),

     };

     int rc;

-    struct rpmvs_s *vs = rpmvsCreate(vfylevel, flags, keyring);

     rpmlog(RPMLOG_NOTICE, "%s:%s", fn, vd.verbose ? "\n" : "");

+    if(isTranscodedRpm(fd) == RPMRC_OK){

+	return rpmpkgVerifySigsTranscoded(fd);

+    }

+    struct rpmvs_s *vs = rpmvsCreate(vfylevel, flags, keyring);

+

     rc = rpmpkgRead(vs, fd, NULL, NULL, &msg;;

     if (rc)

@@ -260,6 +330,29 @@ static int rpmpkgVerifySigs(rpmKeyring keyring, int vfylevel, rpmVSFlags flags,

     return rc;

 }

+static int rpmpkgVerifySigsFD(rpmKeyring keyring, int vfylevel, rpmVSFlags flags,

+			   FD_t fd, rpmsinfoCb cb, void *cbdata)

+{

+    char *msg = NULL;

+    int rc;

+    struct rpmvs_s *vs = rpmvsCreate(vfylevel, flags, keyring);

+

+    rc = rpmpkgRead(vs, fd, NULL, NULL, &msg;;

+

+    if (rc)

+	goto exit;

+

+    rc = rpmvsVerify(vs, RPMSIG_VERIFIABLE_TYPE, cb, cbdata);

+

+exit:

+    if (rc && msg)

+	rpmlog(RPMLOG_ERR, "%s\n", msg);

+    rpmvsFree(vs);

+    free(msg);

+    return rc;

+}

+

+

 /* Wrapper around rpmkVerifySigs to preserve API */

 int rpmVerifySignatures(QVA_t qva, rpmts ts, FD_t fd, const char * fn)

 {

@@ -304,3 +397,53 @@ int rpmcliVerifySignatures(rpmts ts, ARGV_const_t argv)

     rpmKeyringFree(keyring);

     return res;

 }

+

+struct vfydatafd_s {

+    size_t len;

+    char msg[BUFSIZ];

+};

+

+

+static int vfyFDCb(struct rpmsinfo_s *sinfo, void *cbdata)

+{

+    struct vfydatafd_s *vd = cbdata;

+    char *vmsg, *msg;

+    size_t n;

+    size_t remainder = BUFSIZ - vd->len;

+

+    vmsg = rpmsinfoMsg(sinfo);

+    rasprintf(&msg, "    %s\n", vmsg);

+    n = rstrlcpy(vd->msg + vd->len, msg, remainder);

+    free(vmsg);

+    free(msg);

+    if(n <= remainder){

+	vd->len += n;

+    }

+    return 1;

+}

+

+

+int rpmcliVerifySignaturesFD(rpmts ts, FD_t fdi, char **msg)

+{

+    rpmRC rc = RPMRC_FAIL;

+    rpmKeyring keyring = rpmtsGetKeyring(ts, 1);

+    rpmVSFlags vsflags = rpmtsVfyFlags(ts);

+    int vfylevel = rpmtsVfyLevel(ts);

+    struct vfydatafd_s vd = {.len = 0};

+

+    vsflags |= rpmcliVSFlags;

+    if (rpmcliVfyLevelMask) {

+	vfylevel &= ~rpmcliVfyLevelMask;

+	rpmtsSetVfyLevel(ts, vfylevel);

+    }

+

+    if (!rpmpkgVerifySigsFD(keyring, vfylevel, vsflags, fdi, vfyFDCb, &vd)) {

+	rc = RPMRC_OK;

+    }

+    *msg = strdup(vd.msg);

+    rpmsqPoll();

+

+    rpmKeyringFree(keyring);

+    return rc;

+}

+

diff --git a/lib/rpmcli.h b/lib/rpmcli.h

index 906fe9951..7ff48b37a 100644

--- a/lib/rpmcli.h

+++ b/lib/rpmcli.h

@@ -411,6 +411,16 @@ int rpmcliImportPubkeys(rpmts ts, ARGV_const_t argv);

  */

 int rpmcliVerifySignatures(rpmts ts, ARGV_const_t argv);

+

+/** \ingroup rpmcli

+ * Verify package signatures.

+ * @param ts		transaction set

+ * @param fd		a file descriptor to verify

+ * @param msg		a string containing textual information about the verification, similar to rpmcliVerifySignatures output.

+ * @return		0 on success

+ */

+int rpmcliVerifySignaturesFD(rpmts ts, FD_t fd, char **msg);

+

 #ifdef __cplusplus

 }

 #endif

diff --git a/lib/rpmextents.c b/lib/rpmextents.c

new file mode 100644

index 000000000..015277751

--- /dev/null

+++ b/lib/rpmextents.c

@@ -0,0 +1,46 @@

+

+#include "system.h"

+

+#include <rpm/rpmlog.h>

+#include <rpm/rpmio.h>

+

+#include "lib/rpmextents_internal.h"

+

+rpmRC isTranscodedRpm(FD_t fd) {

+    rpmRC rc = RPMRC_NOTFOUND;

+    rpm_loff_t current;

+    extents_magic_t magic;

+    size_t len;

+

+    // If the file is not seekable, we cannot detect whether or not it is transcoded.

+    if(Fseek(fd, 0, SEEK_CUR) < 0) {

+        return RPMRC_FAIL;

+    }

+    current = Ftell(fd);

+

+    if(Fseek(fd, -(sizeof(magic)), SEEK_END) < 0) {

+	rpmlog(RPMLOG_ERR, _("isTranscodedRpm: failed to seek for magic\n"));

+	rc = RPMRC_FAIL;

+	goto exit;

+    }

+    len = sizeof(magic);

+    if (Fread(&magic, len, 1, fd) != len) {

+	rpmlog(RPMLOG_ERR, _("isTranscodedRpm: unable to read magic\n"));

+	rc = RPMRC_FAIL;

+	goto exit;

+    }

+    if (magic != EXTENTS_MAGIC) {

+	rpmlog(RPMLOG_DEBUG, _("isTranscodedRpm: not transcoded\n"));

+	rc = RPMRC_NOTFOUND;

+	goto exit;

+    }

+    rc = RPMRC_OK;

+exit:

+    if (Fseek(fd, current, SEEK_SET) < 0) {

+	rpmlog(RPMLOG_ERR, _("isTranscodedRpm: unable to seek back to original location\n"));

+	rc = RPMRC_FAIL;

+    }

+    return rc;

+}

+

+

diff --git a/lib/rpmextents_internal.h b/lib/rpmextents_internal.h

new file mode 100644

index 000000000..57cecfc31

--- /dev/null

+++ b/lib/rpmextents_internal.h

@@ -0,0 +1,22 @@

+#ifndef _RPMEXTENTS_INTERNAL_H

+#define _RPMEXTENTS_INTERNAL_H

+

+#ifdef __cplusplus

+extern "C" {

+#endif

+

+#include <stdint.h>

+

+/* magic value at end of file (64 bits) that indicates this is a transcoded

+ * rpm.

+ */

+#define EXTENTS_MAGIC 3472329499408095051

+

+typedef uint64_t extents_magic_t;

+

+rpmRC isTranscodedRpm(FD_t fd);

+

+#ifdef __cplusplus

+}

+#endif

+#endif

diff --git a/lib/rpmplugin.h b/lib/rpmplugin.h

index fd81aec8d..6dbbcff35 100644

--- a/lib/rpmplugin.h

+++ b/lib/rpmplugin.h

@@ -60,6 +60,13 @@ typedef rpmRC (*plugin_fsm_file_prepare_func)(rpmPlugin plugin, rpmfi fi,

 					      const char* path,

 					      const char *dest,

 					      mode_t file_mode, rpmFsmOp op);

+typedef rpmRC (*plugin_fsm_file_install_func)(rpmPlugin plugin, rpmfi fi,

+					      const char* path,

+					      mode_t file_mode, rpmFsmOp op);

+typedef rpmRC (*plugin_fsm_file_archive_reader_func)(rpmPlugin plugin,

+						     FD_t payload,

+						     rpmfiles files, rpmfi *fi);

+

 typedef struct rpmPluginHooks_s * rpmPluginHooks;

 struct rpmPluginHooks_s {

@@ -80,6 +87,8 @@ struct rpmPluginHooks_s {

     plugin_fsm_file_pre_func		fsm_file_pre;

     plugin_fsm_file_post_func		fsm_file_post;

     plugin_fsm_file_prepare_func	fsm_file_prepare;

+    plugin_fsm_file_install_func	fsm_file_install;

+    plugin_fsm_file_archive_reader_func	fsm_file_archive_reader;

 };

 #ifdef __cplusplus

diff --git a/lib/rpmplugins.c b/lib/rpmplugins.c

index 3da3097af..901af1ac5 100644

--- a/lib/rpmplugins.c

+++ b/lib/rpmplugins.c

@@ -421,3 +421,74 @@ rpmRC rpmpluginsCallFsmFilePrepare(rpmPlugins plugins, rpmfi fi,

     return rc;

 }

+

+rpmRC rpmpluginsCallFsmFileInstall(rpmPlugins plugins, rpmfi fi,

+				   const char *path, mode_t file_mode,

+				   rpmFsmOp op)

+{

+    plugin_fsm_file_install_func hookFunc;

+    int i;

+    rpmRC rc = RPMRC_OK;

+    rpmRC hook_rc;

+

+    for (i = 0; i < plugins->count; i++) {

+	rpmPlugin plugin = plugins->plugins[i];

+	RPMPLUGINS_SET_HOOK_FUNC(fsm_file_install);

+	if (hookFunc) {

+	    hook_rc = hookFunc(plugin, fi, path, file_mode, op);

+	    if (hook_rc == RPMRC_FAIL) {

+		rpmlog(RPMLOG_ERR, "Plugin %s: hook fsm_file_install failed\n", plugin->name);

+		rc = RPMRC_FAIL;

+	    } else if (hook_rc == RPMRC_PLUGIN_CONTENTS && rc != RPMRC_FAIL) {

+		if (rc == RPMRC_PLUGIN_CONTENTS) {

+		    /* Another plugin already said it'd handle contents. It's

+		     * undefined how these would combine, so treat this as a

+		     * failure condition.

+		    */

+		    rc = RPMRC_FAIL;

+		} else {

+		    /* Plugin will handle content */

+		    rc = RPMRC_PLUGIN_CONTENTS;

+		}

+	    }

+	}

+    }

+

+    return rc;

+}

+

+rpmRC rpmpluginsCallFsmFileArchiveReader(rpmPlugins plugins, FD_t payload,

+				   rpmfiles files, rpmfi *fi)

+{

+    plugin_fsm_file_archive_reader_func hookFunc;

+    int i;

+    rpmRC rc = RPMRC_OK;

+    rpmRC hook_rc;

+

+    for (i = 0; i < plugins->count; i++) {

+	rpmPlugin plugin = plugins->plugins[i];

+	RPMPLUGINS_SET_HOOK_FUNC(fsm_file_archive_reader);

+	if (hookFunc) {

+	    hook_rc = hookFunc(plugin, payload, files, fi);

+	    if (hook_rc == RPMRC_FAIL) {

+		rpmlog(RPMLOG_ERR, "Plugin %s: hook fsm_file_archive_reader failed\n", plugin->name);

+		rc = RPMRC_FAIL;

+	    } else if (hook_rc == RPMRC_PLUGIN_CONTENTS && rc != RPMRC_FAIL) {

+		if (rc == RPMRC_PLUGIN_CONTENTS) {

+		    /* Another plugin already said it'd handle contents. It's

+		     * undefined how these would combine, so treat this as a

+		     * failure condition.

+		    */

+		    rc = RPMRC_FAIL;

+		} else {

+		    /* Plugin will handle content */

+		    rc = RPMRC_PLUGIN_CONTENTS;

+		}

+	    }

+	}

+    }

+

+    return rc;

+}

+

+

diff --git a/lib/rpmplugins.h b/lib/rpmplugins.h

index 39762c376..88807c53c 100644

--- a/lib/rpmplugins.h

+++ b/lib/rpmplugins.h

@@ -167,6 +167,23 @@ rpmRC rpmpluginsCallFsmFilePrepare(rpmPlugins plugins, rpmfi fi,

                                    const char *path, const char *dest,

                                    mode_t mode, rpmFsmOp op);

+/** \ingroup rpmplugins

+ * Call the fsm file install plugin hook

+ * @param plugins	plugins structure

+ * @param fi		file info iterator (or NULL)

+ * @param path		file object path

+ * @param file_mode	file object mode

+ * @param op		file operation + associated flags

+ * @return		RPMRC_OK on success, RPMRC_FAIL otherwise

+ */

+RPM_GNUC_INTERNAL

+rpmRC rpmpluginsCallFsmFileInstall(rpmPlugins plugins, rpmfi fi,

+				   const char* path, mode_t file_mode,

+				   rpmFsmOp op);

+

+RPM_GNUC_INTERNAL

+rpmRC rpmpluginsCallFsmFileArchiveReader(rpmPlugins plugins, FD_t payload,

+					 rpmfiles files, rpmfi *fi);

 #ifdef __cplusplus

 }

 #endif

diff --git a/plugins/reflink.c b/plugins/reflink.c

index 513887604..d5e6db27a 100644

--- a/plugins/reflink.c

+++ b/plugins/reflink.c

@@ -13,6 +13,7 @@

 #include <rpm/rpmlog.h>

 #include "lib/rpmlib.h"

 #include "lib/rpmplugin.h"

+#include "lib/rpmextents_internal.h"

 #include "lib/rpmte_internal.h"

 #include <rpm/rpmfileutil.h>

 #include "rpmio/rpmio_internal.h"

@@ -40,11 +41,6 @@

 #define BUFFER_SIZE (1024 * 128)

-/* magic value at end of file (64 bits) that indicates this is a transcoded

- * rpm.

- */

-#define MAGIC 3472329499408095051

-

 struct reflink_state_s {

     /* Stuff that's used across rpms */

     long fundamental_block_size;

@@ -58,6 +54,7 @@ struct reflink_state_s {

     FD_t fd;

     rpmfiles files;

     inodeIndexHash inodeIndexes;

+    int transcoded;

 };

 typedef struct reflink_state_s * reflink_state;

@@ -96,51 +93,35 @@ static void reflink_cleanup(rpmPlugin plugin) {

 }

 static rpmRC reflink_psm_pre(rpmPlugin plugin, rpmte te) {

+    rpmRC rc;

+    size_t len;

+

     reflink_state state = rpmPluginGetData(plugin);

     state->fd = rpmteFd(te);

     if (state->fd == 0) {

 	rpmlog(RPMLOG_DEBUG, _("reflink: fd = 0, no install\n"));

 	return RPMRC_OK;

     }

+

     rpm_loff_t current = Ftell(state->fd);

-    uint64_t magic;

-    if (Fseek(state->fd, -(sizeof(magic)), SEEK_END) < 0) {

-	rpmlog(RPMLOG_ERR, _("reflink: failed to seek for magic\n"));

-	if (Fseek(state->fd, current, SEEK_SET) < 0) {

-	    /* yes this gets a bit repetitive */

-	    rpmlog(RPMLOG_ERR,

-		 _("reflink: unable to seek back to original location\n"));

-	}

-	return RPMRC_FAIL;

-    }

-    size_t len = sizeof(magic);

-    if (Fread(&magic, len, 1, state->fd) != len) {

-	rpmlog(RPMLOG_ERR, _("reflink: unable to read magic\n"));

-	if (Fseek(state->fd, current, SEEK_SET) < 0) {

-	    rpmlog(RPMLOG_ERR,

-		   _("reflink: unable to seek back to original location\n"));

-	}

-	return RPMRC_FAIL;

-    }

-    if (magic != MAGIC) {

-	rpmlog(RPMLOG_DEBUG, _("reflink: not transcoded\n"));

-	if (Fseek(state->fd, current, SEEK_SET) < 0) {

-	    rpmlog(RPMLOG_ERR,

-		   _("reflink: unable to seek back to original location\n"));

+    rc = isTranscodedRpm(state->fd);

+

+    switch(rc){

+	// Fail to parse the file, fail the plugin.

+	case RPMRC_FAIL:

 	    return RPMRC_FAIL;

-	}

-	return RPMRC_OK;

+	// This is not a transcoded file, do nothing.

+	case RPMRC_NOTFOUND:

+	    return RPMRC_OK;

+	default:

+	    break;

     }

     rpmlog(RPMLOG_DEBUG, _("reflink: *is* transcoded\n"));

-    Header h = rpmteHeader(te);

+    state->transcoded = 1;

-    /* replace/add header that main fsm.c can read */

-    headerDel(h, RPMTAG_PAYLOADFORMAT);

-    headerPutString(h, RPMTAG_PAYLOADFORMAT, "clon");

-    headerFree(h);

     state->files = rpmteFiles(te);

     /* tail of file contains offset_table, offset_checksums then magic */

-    if (Fseek(state->fd, -(sizeof(rpm_loff_t) * 2 + sizeof(magic)), SEEK_END) < 0) {

+    if (Fseek(state->fd, -(sizeof(rpm_loff_t) * 2 + sizeof(extents_magic_t)), SEEK_END) < 0) {

 	rpmlog(RPMLOG_ERR, _("reflink: failed to seek for tail %p\n"),

 	       state->fd);

 	return RPMRC_FAIL;

@@ -239,7 +220,7 @@ rpm_loff_t find(const unsigned char *digest, reflink_state state) {

     return offset;

 }

-static rpmRC reflink_fsm_file_pre(rpmPlugin plugin, rpmfi fi, const char* path,

+static rpmRC reflink_fsm_file_install(rpmPlugin plugin, rpmfi fi, const char* path,

                                   mode_t file_mode, rpmFsmOp op)

 {

     struct file_clone_range fcr;

@@ -366,10 +347,21 @@ static rpmRC reflink_fsm_file_pre(rpmPlugin plugin, rpmfi fi, const char* path,

     return RPMRC_OK;

 }

+static rpmRC reflink_fsm_file_archive_reader(rpmPlugin plugin, FD_t payload,

+					     rpmfiles files, rpmfi *fi) {

+    reflink_state state = rpmPluginGetData(plugin);

+    if(state->transcoded) {

+	*fi = rpmfilesIter(files, RPMFI_ITER_FWD);

+	return RPMRC_PLUGIN_CONTENTS;

+    }

+    return RPMRC_OK;

+}

+

 struct rpmPluginHooks_s reflink_hooks = {

     .init = reflink_init,

     .cleanup = reflink_cleanup,

     .psm_pre = reflink_psm_pre,

     .psm_post = reflink_psm_post,

-    .fsm_file_pre = reflink_fsm_file_pre,

+    .fsm_file_install = reflink_fsm_file_install,

+    .fsm_file_archive_reader = reflink_fsm_file_archive_reader,

 };

diff --git a/rpm2extents.c b/rpm2extents.c

index c111be0a2..a326e3857 100644

--- a/rpm2extents.c

+++ b/rpm2extents.c

@@ -2,7 +2,9 @@