]> git.ipfire.org Git - thirdparty/libarchive.git/commitdiff
add support for reading and writing PWB and V7 cpio archives
authorTom Ivar Helbekkmo <tih@hamartun.priv.no>
Fri, 5 Mar 2021 22:18:21 +0000 (23:18 +0100)
committerTom Ivar Helbekkmo <tih@hamartun.priv.no>
Fri, 5 Mar 2021 22:18:21 +0000 (23:18 +0100)
Makefile.am
cpio/cmdline.c
cpio/cpio.c
cpio/cpio.h
libarchive/archive.h
libarchive/archive_read_support_format_cpio.c
libarchive/archive_write_set_format.c
libarchive/archive_write_set_format_by_name.c
libarchive/archive_write_set_format_cpio_binary.c [new file with mode: 0644]

index 3d30b6e16a2ca099f072d33e713026711c59e0c4..1ead2813dffd7cfe79bafe2e17e56e96a4385d65 100644 (file)
@@ -224,6 +224,7 @@ libarchive_la_SOURCES= \
        libarchive/archive_write_set_format_ar.c \
        libarchive/archive_write_set_format_by_name.c \
        libarchive/archive_write_set_format_cpio.c \
+       libarchive/archive_write_set_format_cpio_binary.c \
        libarchive/archive_write_set_format_cpio_newc.c \
        libarchive/archive_write_set_format_cpio_odc.c \
        libarchive/archive_write_set_format_filter_by_ext.c \
index c8fc30ea773a9b6b868859b530f5155ddd373921..0ca9b4dec00442490621155ab0d1cc105b675a6f 100644 (file)
@@ -51,7 +51,7 @@ __FBSDID("$FreeBSD: src/usr.bin/cpio/cmdline.c,v 1.5 2008/12/06 07:30:40 kientzl
 /*
  * Short options for cpio.  Please keep this sorted.
  */
-static const char *short_options = "0AaBC:cdE:F:f:H:hI:iJjLlmnO:opR:rtuVvW:yZz";
+static const char *short_options = "06AaBC:cdE:F:f:H:hI:iJjLlmnO:opR:rtuVvW:yZz";
 
 /*
  * Long options for cpio.  Please keep this sorted.
@@ -86,6 +86,7 @@ static const struct option {
        { "pass-through",               0, 'p' },
        { "preserve-modification-time", 0, 'm' },
        { "preserve-owner",             0, OPTION_PRESERVE_OWNER },
+       { "pwb",                        0, '6' },
        { "quiet",                      0, OPTION_QUIET },
        { "unconditional",              0, 'u' },
        { "uuencode",                   0, OPTION_UUENCODE },
index e073bae069dfa2e6c9379759077ae32f368f776f..678d2419b71358806c3ff2d9bd0636b408663dec 100644 (file)
@@ -192,6 +192,9 @@ main(int argc, char *argv[])
                case '0': /* GNU convention: --null, -0 */
                        cpio->option_null = 1;
                        break;
+               case '6': /* 6th edition (PWB) interpretation of file mode bits */
+                       cpio->option_pwb = 1;
+                       break;
                case 'A': /* NetBSD/OpenBSD */
                        cpio->option_append = 1;
                        break;
@@ -583,6 +586,8 @@ mode_out(struct cpio *cpio)
        }
        if (r < ARCHIVE_WARN)
                lafe_errc(1, 0, "Requested filter not available");
+       if (cpio->option_pwb)
+               cpio->format = "pwb";
        r = archive_write_set_format_by_name(cpio->archive, cpio->format);
        if (r != ARCHIVE_OK)
                lafe_errc(1, 0, "%s", archive_error_string(cpio->archive));
@@ -968,6 +973,8 @@ mode_in(struct cpio *cpio)
                lafe_errc(1, 0, "Couldn't allocate archive object");
        archive_read_support_filter_all(a);
        archive_read_support_format_all(a);
+       if (cpio->option_pwb)
+               archive_read_set_options(a, "pwb");
        if (cpio->passphrase != NULL)
                r = archive_read_add_passphrase(a, cpio->passphrase);
        else
@@ -1078,6 +1085,8 @@ mode_list(struct cpio *cpio)
                lafe_errc(1, 0, "Couldn't allocate archive object");
        archive_read_support_filter_all(a);
        archive_read_support_format_all(a);
+       if (cpio->option_pwb)
+               archive_read_set_options(a, "pwb");
        if (cpio->passphrase != NULL)
                r = archive_read_add_passphrase(a, cpio->passphrase);
        else
index 8e7cc5fdd2067b190cc2d2600e2498746de9e608..a71b6649d35f3bb1ee62595a895e3039996a7359 100644 (file)
@@ -62,6 +62,7 @@ struct cpio {
        int               option_list; /* -t */
        char              option_null; /* --null */
        int               option_numeric_uid_gid; /* -n */
+       int               option_pwb; /* -6 */
        int               option_rename; /* -r */
        char             *destdir;
        size_t            destdir_len;
index 47d04ef3765621cc2ad8d245772107a57f4f5690..750e689e2cf334d98390f59d67ac1254a3147a72 100644 (file)
@@ -319,6 +319,7 @@ typedef const char *archive_passphrase_callback(struct archive *,
 #define        ARCHIVE_FORMAT_CPIO_SVR4_NOCRC          (ARCHIVE_FORMAT_CPIO | 4)
 #define        ARCHIVE_FORMAT_CPIO_SVR4_CRC            (ARCHIVE_FORMAT_CPIO | 5)
 #define        ARCHIVE_FORMAT_CPIO_AFIO_LARGE          (ARCHIVE_FORMAT_CPIO | 6)
+#define        ARCHIVE_FORMAT_CPIO_PWB                 (ARCHIVE_FORMAT_CPIO | 7)
 #define        ARCHIVE_FORMAT_SHAR                     0x20000
 #define        ARCHIVE_FORMAT_SHAR_BASE                (ARCHIVE_FORMAT_SHAR | 1)
 #define        ARCHIVE_FORMAT_SHAR_DUMP                (ARCHIVE_FORMAT_SHAR | 2)
@@ -800,8 +801,10 @@ __LA_DECL int archive_write_set_format_7zip(struct archive *);
 __LA_DECL int archive_write_set_format_ar_bsd(struct archive *);
 __LA_DECL int archive_write_set_format_ar_svr4(struct archive *);
 __LA_DECL int archive_write_set_format_cpio(struct archive *);
+__LA_DECL int archive_write_set_format_cpio_bin(struct archive *);
 __LA_DECL int archive_write_set_format_cpio_newc(struct archive *);
 __LA_DECL int archive_write_set_format_cpio_odc(struct archive *);
+__LA_DECL int archive_write_set_format_cpio_pwb(struct archive *);
 __LA_DECL int archive_write_set_format_gnutar(struct archive *);
 __LA_DECL int archive_write_set_format_iso9660(struct archive *);
 __LA_DECL int archive_write_set_format_mtree(struct archive *);
index 1c96e6ac195fc0d27fd0474cf200c0baa997e29c..d81752ea74e6cc83b3ebecc795424d8be8cf307d 100644 (file)
@@ -185,6 +185,8 @@ struct cpio {
        struct archive_string_conv *opt_sconv;
        struct archive_string_conv *sconv_default;
        int                       init_default_conversion;
+
+       int                       option_pwb;
 };
 
 static int64_t atol16(const char *, unsigned);
@@ -343,6 +345,10 @@ archive_read_format_cpio_options(struct archive_read *a,
                                ret = ARCHIVE_FATAL;
                }
                return (ret);
+       } else if (strcmp(key, "pwb")  == 0) {
+               if (val != NULL && val[0] != 0)
+                       cpio->option_pwb = 1;
+               ret = ARCHIVE_OK;
        }
 
        /* Note: The "warn" return is just to inform the options
@@ -891,6 +897,12 @@ header_bin_le(struct archive_read *a, struct cpio *cpio,
        archive_entry_set_dev(entry, header[bin_dev_offset] + header[bin_dev_offset + 1] * 256);
        archive_entry_set_ino(entry, header[bin_ino_offset] + header[bin_ino_offset + 1] * 256);
        archive_entry_set_mode(entry, header[bin_mode_offset] + header[bin_mode_offset + 1] * 256);
+       if (cpio->option_pwb) {
+               /* turn off random bits left over from V6 inode */
+               archive_entry_set_mode(entry, archive_entry_mode(entry) & 067777);
+               if ((archive_entry_mode(entry) & AE_IFMT) == 0)
+                       archive_entry_set_mode(entry, archive_entry_mode(entry) | AE_IFREG);
+       }
        archive_entry_set_uid(entry, header[bin_uid_offset] + header[bin_uid_offset + 1] * 256);
        archive_entry_set_gid(entry, header[bin_gid_offset] + header[bin_gid_offset + 1] * 256);
        archive_entry_set_nlink(entry, header[bin_nlink_offset] + header[bin_nlink_offset + 1] * 256);
@@ -930,6 +942,12 @@ header_bin_be(struct archive_read *a, struct cpio *cpio,
        archive_entry_set_dev(entry, header[bin_dev_offset] * 256 + header[bin_dev_offset + 1]);
        archive_entry_set_ino(entry, header[bin_ino_offset] * 256 + header[bin_ino_offset + 1]);
        archive_entry_set_mode(entry, header[bin_mode_offset] * 256 + header[bin_mode_offset + 1]);
+       if (cpio->option_pwb) {
+               /* turn off random bits left over from V6 inode */
+               archive_entry_set_mode(entry, archive_entry_mode(entry) & 067777);
+               if ((archive_entry_mode(entry) & AE_IFMT) == 0)
+                       archive_entry_set_mode(entry, archive_entry_mode(entry) | AE_IFREG);
+       }
        archive_entry_set_uid(entry, header[bin_uid_offset] * 256 + header[bin_uid_offset + 1]);
        archive_entry_set_gid(entry, header[bin_gid_offset] * 256 + header[bin_gid_offset + 1]);
        archive_entry_set_nlink(entry, header[bin_nlink_offset] * 256 + header[bin_nlink_offset + 1]);
index ab32945ff1b50785af6dbf945450a3c8dd731cb2..1f65fa4a77ebb68b0b749b0ae9007a45154ffe06 100644 (file)
@@ -44,6 +44,8 @@ struct { int code; int (*setter)(struct archive *); } codes[] =
 {
        { ARCHIVE_FORMAT_7ZIP,          archive_write_set_format_7zip },
        { ARCHIVE_FORMAT_CPIO,          archive_write_set_format_cpio },
+       { ARCHIVE_FORMAT_CPIO_BIN_LE,   archive_write_set_format_cpio_bin },
+       { ARCHIVE_FORMAT_CPIO_PWB,      archive_write_set_format_cpio_pwb },
        { ARCHIVE_FORMAT_CPIO_POSIX,    archive_write_set_format_cpio_odc },
        { ARCHIVE_FORMAT_CPIO_SVR4_NOCRC,       archive_write_set_format_cpio_newc },
        { ARCHIVE_FORMAT_ISO9660,       archive_write_set_format_iso9660 },
index 927707375d92efeaf5ca3c143bfead2f881b8d59..bfb4b3545f2c41b4af14695e605760a3e597403e 100644 (file)
@@ -49,6 +49,7 @@ struct { const char *name; int (*setter)(struct archive *); } names[] =
        { "arbsd",      archive_write_set_format_ar_bsd },
        { "argnu",      archive_write_set_format_ar_svr4 },
        { "arsvr4",     archive_write_set_format_ar_svr4 },
+       { "bin",        archive_write_set_format_cpio_bin },
        { "bsdtar",     archive_write_set_format_pax_restricted },
        { "cd9660",     archive_write_set_format_iso9660 },
        { "cpio",       archive_write_set_format_cpio },
@@ -63,6 +64,7 @@ struct { const char *name; int (*setter)(struct archive *); } names[] =
        { "pax",        archive_write_set_format_pax },
        { "paxr",       archive_write_set_format_pax_restricted },
        { "posix",      archive_write_set_format_pax },
+       { "pwb",        archive_write_set_format_cpio_pwb },
        { "raw",        archive_write_set_format_raw },
        { "rpax",       archive_write_set_format_pax_restricted },
        { "shar",       archive_write_set_format_shar },
diff --git a/libarchive/archive_write_set_format_cpio_binary.c b/libarchive/archive_write_set_format_cpio_binary.c
new file mode 100644 (file)
index 0000000..01aca6f
--- /dev/null
@@ -0,0 +1,608 @@
+/*-
+ * Copyright (c) 2003-2007 Tim Kientzle
+ * Copyright (c) 2011-2012 Michihiro NAKAJIMA
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "archive_platform.h"
+__FBSDID("$FreeBSD: head/lib/libarchive/archive_write_set_format_cpio.c 201170 2009-12-29 06:34:23Z kientzle $");
+
+#ifdef HAVE_ERRNO_H
+#include <errno.h>
+#endif
+#include <stdio.h>
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+
+#include "archive.h"
+#include "archive_entry.h"
+#include "archive_entry_locale.h"
+#include "archive_private.h"
+#include "archive_write_private.h"
+#include "archive_write_set_format_private.h"
+
+static ssize_t archive_write_binary_data(struct archive_write *,
+                   const void *buff, size_t s);
+static int     archive_write_binary_close(struct archive_write *);
+static int     archive_write_binary_free(struct archive_write *);
+static int     archive_write_binary_finish_entry(struct archive_write *);
+static int     archive_write_binary_header(struct archive_write *,
+                   struct archive_entry *);
+static int     archive_write_binary_options(struct archive_write *,
+                   const char *, const char *);
+static int     write_header(struct archive_write *, struct archive_entry *);
+
+struct cpio {
+       uint64_t          entry_bytes_remaining;
+
+       int64_t           ino_next;
+
+       struct           { int64_t old; int new;} *ino_list;
+       size_t            ino_list_size;
+       size_t            ino_list_next;
+
+       struct archive_string_conv *opt_sconv;
+       struct archive_string_conv *sconv_default;
+       int               init_default_conversion;
+};
+
+/* This struct needs to be packed to get the header right */
+
+#if defined(__GNUC__)
+#define PACKED(x) x __attribute__((packed))
+#elif defined(_MSC_VER)
+#define PACKED(x) __pragma(pack(push, 1)) x __pragma(pack(pop))
+#else
+#define PACKED(x) x
+#endif
+
+#define HSIZE 26
+
+PACKED(struct cpio_binary_header {
+       uint16_t        h_magic;
+       uint16_t        h_dev;
+       uint16_t        h_ino;
+       uint16_t        h_mode;
+       uint16_t        h_uid;
+       uint16_t        h_gid;
+       uint16_t        h_nlink;
+       uint16_t        h_majmin;
+       uint32_t        h_mtime;
+       uint16_t        h_namesize;
+       uint32_t        h_filesize;
+});
+
+/* Back in the day, the 7th Edition cpio.c had this, to
+ * adapt to, as the comment said, "VAX, Interdata, ...":
+ *
+ * union { long l; short s[2]; char c[4]; } U;
+ * #define MKSHORT(v,lv) {U.l=1L;if(U.c[0]) U.l=lv,v[0]=U.s[1],v[1]=U.s[0]; else U.l=lv,v[0]=U.s[0],v[1]=U.s[1];}
+ * long mklong(v)
+ * short v[];
+ * {
+ *         U.l = 1;
+ *         if(U.c[0])
+ *                 U.s[0] = v[1], U.s[1] = v[0];
+ *         else
+ *                 U.s[0] = v[0], U.s[1] = v[1];
+ *         return U.l;
+ * }
+ *
+ * Of course, that assumes that all machines have little-endian shorts,
+ * and just adapts the others to the special endianness of the PDP-11.
+ *
+ * Now, we could do this:
+ *
+ * union { uint32_t l; uint16_t s[2]; uint8_t c[4]; } U;
+ * #define PUTI16(v,sv) {U.s[0]=1;if(U.c[0]) v=sv; else U.s[0]=sv,U.c[2]=U.c[1],U.c[3]=U.c[0],v=U.s[1];}
+ * #define PUTI32(v,lv) {char_t Ut;U.l=1;if(U.c[0]) U.l=lv,v[0]=U.s[1],v[1]=U.s[0]; else U.l=lv,Ut=U.c[0],U.c[0]=U.c[1],U.c[1]=Ut,Ut=U.c[2],U.c[2]=U.c[3],U.c[3]=Ut,v[0]=U.s[0],v[1]=U.s[1];}
+ *
+ * ...but it feels a little better to do it like this (which by the way,
+ * assumes that it will never be run on a PDP-11):
+ */
+
+static uint16_t swap16(uint16_t in) {
+       union {
+               uint16_t s[2];
+               uint8_t c[4];
+       } U;
+       U.s[0] = 1;
+       if (U.c[0])
+               return in;
+       else {
+               U.s[0] = in;
+               U.c[2] = U.c[1];
+               U.c[3] = U.c[0];
+               return U.s[1];
+       }
+       /* NOTREACHED */
+}
+
+static uint32_t swap32(uint32_t in) {
+       union {
+               uint32_t l;
+               uint16_t s[2];
+               uint8_t c[4];
+       } U;
+       U.l = 1;
+       if (U.c[0]) {
+               uint16_t t;
+               U.l = in;
+               t = U.s[0];
+               U.s[0] = U.s[1];
+               U.s[1] = t;
+       } else {
+               uint8_t t;
+               U.l = in;
+               t = U.c[0];
+               U.c[0] = U.c[1];
+               U.c[1] = t;
+               t = U.c[2];
+               U.c[2] = U.c[3];
+               U.c[3] = t;
+       }
+       return U.l;
+}
+
+/*
+ * Set output format to the selected binary variant
+ */
+static int
+archive_write_set_format_cpio_binary(struct archive *_a, int format)
+{
+       struct archive_write *a = (struct archive_write *)_a;
+       struct cpio *cpio;
+
+       if (sizeof(struct cpio_binary_header) != HSIZE) {
+               archive_set_error(&a->archive, EINVAL,
+                                 "Binary cpio format not supported on this platform");
+               return (ARCHIVE_FATAL);
+       }
+
+       archive_check_magic(_a, ARCHIVE_WRITE_MAGIC,
+           ARCHIVE_STATE_NEW, "archive_write_set_format_cpio_binary");
+
+       /* If someone else was already registered, unregister them. */
+       if (a->format_free != NULL)
+               (a->format_free)(a);
+
+       cpio = (struct cpio *)calloc(1, sizeof(*cpio));
+       if (cpio == NULL) {
+               archive_set_error(&a->archive, ENOMEM, "Can't allocate cpio data");
+               return (ARCHIVE_FATAL);
+       }
+       a->format_data = cpio;
+       a->format_name = "cpio";
+       a->format_options = archive_write_binary_options;
+       a->format_write_header = archive_write_binary_header;
+       a->format_write_data = archive_write_binary_data;
+       a->format_finish_entry = archive_write_binary_finish_entry;
+       a->format_close = archive_write_binary_close;
+       a->format_free = archive_write_binary_free;
+       a->archive.archive_format = format;
+       switch (format) {
+       case ARCHIVE_FORMAT_CPIO_PWB:
+               a->archive.archive_format_name = "PWB cpio";
+               break;
+       case ARCHIVE_FORMAT_CPIO_BIN_LE:
+               a->archive.archive_format_name = "7th Edition cpio";
+               break;
+       default:
+               archive_set_error(&a->archive, EINVAL, "binary format must be 'pwb' or 'bin'");
+               return (ARCHIVE_FATAL);
+       }
+       return (ARCHIVE_OK);
+}
+
+/*
+ * Set output format to PWB (6th Edition) binary format
+ */
+int
+archive_write_set_format_cpio_pwb(struct archive *_a)
+{
+       return archive_write_set_format_cpio_binary(_a, ARCHIVE_FORMAT_CPIO_PWB);
+}
+
+/*
+ * Set output format to 7th Edition binary format
+ */
+int
+archive_write_set_format_cpio_bin(struct archive *_a)
+{
+       return archive_write_set_format_cpio_binary(_a, ARCHIVE_FORMAT_CPIO_BIN_LE);
+}
+
+static int
+archive_write_binary_options(struct archive_write *a, const char *key,
+    const char *val)
+{
+       struct cpio *cpio = (struct cpio *)a->format_data;
+       int ret = ARCHIVE_FAILED;
+
+       if (strcmp(key, "hdrcharset")  == 0) {
+               if (val == NULL || val[0] == 0)
+                       archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
+                           "%s: hdrcharset option needs a character-set name",
+                           a->format_name);
+               else {
+                       cpio->opt_sconv = archive_string_conversion_to_charset(
+                           &a->archive, val, 0);
+                       if (cpio->opt_sconv != NULL)
+                               ret = ARCHIVE_OK;
+                       else
+                               ret = ARCHIVE_FATAL;
+               }
+               return (ret);
+       }
+
+       /* Note: The "warn" return is just to inform the options
+        * supervisor that we didn't handle it.  It will generate
+        * a suitable error if no one used this option. */
+       return (ARCHIVE_WARN);
+}
+
+/*
+ * Ino values are as long as 64 bits on some systems; cpio format
+ * only allows 16 bits and relies on the ino values to identify hardlinked
+ * files.  So, we can't merely "hash" the ino numbers since collisions
+ * would corrupt the archive.  Instead, we generate synthetic ino values
+ * to store in the archive and maintain a map of original ino values to
+ * synthetic ones so we can preserve hardlink information.
+ *
+ * TODO: Make this more efficient.  It's not as bad as it looks (most
+ * files don't have any hardlinks and we don't do any work here for those),
+ * but it wouldn't be hard to do better.
+ *
+ * TODO: Work with dev/ino pairs here instead of just ino values.
+ */
+static int
+synthesize_ino_value(struct cpio *cpio, struct archive_entry *entry)
+{
+       int64_t ino = archive_entry_ino64(entry);
+       int ino_new;
+       size_t i;
+
+       /*
+        * If no index number was given, don't assign one.  In
+        * particular, this handles the end-of-archive marker
+        * correctly by giving it a zero index value.  (This is also
+        * why we start our synthetic index numbers with one below.)
+        */
+       if (ino == 0)
+               return (0);
+
+       /* Don't store a mapping if we don't need to. */
+       if (archive_entry_nlink(entry) < 2) {
+               return (int)(++cpio->ino_next);
+       }
+
+       /* Look up old ino; if we have it, this is a hardlink
+        * and we reuse the same value. */
+       for (i = 0; i < cpio->ino_list_next; ++i) {
+               if (cpio->ino_list[i].old == ino)
+                       return (cpio->ino_list[i].new);
+       }
+
+       /* Assign a new index number. */
+       ino_new = (int)(++cpio->ino_next);
+
+       /* Ensure space for the new mapping. */
+       if (cpio->ino_list_size <= cpio->ino_list_next) {
+               size_t newsize = cpio->ino_list_size < 512
+                   ? 512 : cpio->ino_list_size * 2;
+               void *newlist = realloc(cpio->ino_list,
+                   sizeof(cpio->ino_list[0]) * newsize);
+               if (newlist == NULL)
+                       return (-1);
+
+               cpio->ino_list_size = newsize;
+               cpio->ino_list = newlist;
+       }
+
+       /* Record and return the new value. */
+       cpio->ino_list[cpio->ino_list_next].old = ino;
+       cpio->ino_list[cpio->ino_list_next].new = ino_new;
+       ++cpio->ino_list_next;
+       return (ino_new);
+}
+
+
+static struct archive_string_conv *
+get_sconv(struct archive_write *a)
+{
+       struct cpio *cpio;
+       struct archive_string_conv *sconv;
+
+       cpio = (struct cpio *)a->format_data;
+       sconv = cpio->opt_sconv;
+       if (sconv == NULL) {
+               if (!cpio->init_default_conversion) {
+                       cpio->sconv_default =
+                           archive_string_default_conversion_for_write(
+                             &(a->archive));
+                       cpio->init_default_conversion = 1;
+               }
+               sconv = cpio->sconv_default;
+       }
+       return (sconv);
+}
+
+static int
+archive_write_binary_header(struct archive_write *a, struct archive_entry *entry)
+{
+       const char *path;
+       size_t len;
+
+       if (archive_entry_filetype(entry) == 0 && archive_entry_hardlink(entry) == NULL) {
+               archive_set_error(&a->archive, -1, "Filetype required");
+               return (ARCHIVE_FAILED);
+       }
+
+       if (archive_entry_pathname_l(entry, &path, &len, get_sconv(a)) != 0
+           && errno == ENOMEM) {
+               archive_set_error(&a->archive, ENOMEM,
+                   "Can't allocate memory for Pathname");
+               return (ARCHIVE_FATAL);
+       }
+       if (len == 0 || path == NULL || path[0] == '\0') {
+               archive_set_error(&a->archive, -1, "Pathname required");
+               return (ARCHIVE_FAILED);
+       }
+
+       if (!archive_entry_size_is_set(entry) || archive_entry_size(entry) < 0) {
+               archive_set_error(&a->archive, -1, "Size required");
+               return (ARCHIVE_FAILED);
+       }
+       return write_header(a, entry);
+}
+
+static int
+write_header(struct archive_write *a, struct archive_entry *entry)
+{
+       struct cpio *cpio;
+       const char *p, *path;
+       int pathlength, ret, ret_final;
+       int64_t ino;
+       struct cpio_binary_header h;
+       struct archive_string_conv *sconv;
+       struct archive_entry *entry_main;
+       size_t len;
+
+       cpio = (struct cpio *)a->format_data;
+       ret_final = ARCHIVE_OK;
+       sconv = get_sconv(a);
+
+#if defined(_WIN32) && !defined(__CYGWIN__)
+       /* Make sure the path separators in pathname, hardlink and symlink
+        * are all slash '/', not the Windows path separator '\'. */
+       entry_main = __la_win_entry_in_posix_pathseparator(entry);
+       if (entry_main == NULL) {
+               archive_set_error(&a->archive, ENOMEM,
+                   "Can't allocate ustar data");
+               return(ARCHIVE_FATAL);
+       }
+       if (entry != entry_main)
+               entry = entry_main;
+       else
+               entry_main = NULL;
+#else
+       entry_main = NULL;
+#endif
+
+       ret = archive_entry_pathname_l(entry, &path, &len, sconv);
+       if (ret != 0) {
+               if (errno == ENOMEM) {
+                       archive_set_error(&a->archive, ENOMEM,
+                           "Can't allocate memory for Pathname");
+                       ret_final = ARCHIVE_FATAL;
+                       goto exit_write_header;
+               }
+               archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
+                   "Can't translate pathname '%s' to %s",
+                   archive_entry_pathname(entry),
+                   archive_string_conversion_charset_name(sconv));
+               ret_final = ARCHIVE_WARN;
+       }
+       /* Include trailing null */
+       pathlength = (int)len + 1;
+
+       h.h_magic = swap16(070707);
+       h.h_dev = swap16(archive_entry_dev(entry));
+
+       ino = synthesize_ino_value(cpio, entry);
+       if (ino < 0) {
+               archive_set_error(&a->archive, ENOMEM,
+                   "No memory for ino translation table");
+               ret_final = ARCHIVE_FATAL;
+               goto exit_write_header;
+       } else if (ino > 077777) {
+               archive_set_error(&a->archive, ERANGE,
+                   "Too many files for this cpio format");
+               ret_final = ARCHIVE_FATAL;
+               goto exit_write_header;
+       }
+       h.h_ino = swap16(ino);
+
+       h.h_mode = archive_entry_mode(entry);
+       if (((h.h_mode & AE_IFMT) == AE_IFSOCK) || ((h.h_mode & AE_IFMT) == AE_IFIFO)) {
+               archive_set_error(&a->archive, EINVAL,
+                                 "sockets and fifos cannot be represented in the binary cpio format");
+               ret_final = ARCHIVE_FATAL;
+               goto exit_write_header;
+       }
+       if (a->archive.archive_format == ARCHIVE_FORMAT_CPIO_PWB) {
+               if (((h.h_mode & AE_IFMT) == AE_IFLNK) || ((h.h_mode & AE_IFMT) == AE_IFREG))
+                       h.h_mode &= (~AE_IFMT);
+       }
+       h.h_mode = swap16(h.h_mode);
+
+       h.h_uid = swap16(archive_entry_uid(entry));
+       h.h_gid = swap16(archive_entry_gid(entry));
+       h.h_nlink = swap16(archive_entry_nlink(entry));
+
+       if (archive_entry_filetype(entry) == AE_IFBLK
+           || archive_entry_filetype(entry) == AE_IFCHR)
+               h.h_majmin = swap16(archive_entry_rdev(entry));
+       else
+               h.h_majmin = 0;
+
+       h.h_mtime = swap32(archive_entry_mtime(entry));
+       h.h_namesize = swap16(pathlength);
+
+       /* Non-regular files don't store bodies. */
+       if (archive_entry_filetype(entry) != AE_IFREG)
+               archive_entry_set_size(entry, 0);
+
+       /* Symlinks get the link written as the body of the entry. */
+       ret = archive_entry_symlink_l(entry, &p, &len, sconv);
+       if (ret != 0) {
+               if (errno == ENOMEM) {
+                       archive_set_error(&a->archive, ENOMEM,
+                           "Can't allocate memory for Linkname");
+                       ret_final = ARCHIVE_FATAL;
+                       goto exit_write_header;
+               }
+               archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
+                   "Can't translate linkname '%s' to %s",
+                   archive_entry_symlink(entry),
+                   archive_string_conversion_charset_name(sconv));
+               ret_final = ARCHIVE_WARN;
+       }
+
+       if (len > 0 && p != NULL  &&  *p != '\0') {
+               if (a->archive.archive_format == ARCHIVE_FORMAT_CPIO_PWB) {
+                       archive_set_error(&a->archive, EINVAL,
+                                         "symlinks are not supported by UNIX V6 or by PWB cpio");
+                       ret_final = ARCHIVE_FATAL;
+                       goto exit_write_header;
+               }
+               h.h_filesize = swap32(strlen(p)); /* symlink */
+       } else {
+               if ((a->archive.archive_format == ARCHIVE_FORMAT_CPIO_PWB) &&
+                   (archive_entry_size(entry) > 256*256*256-1)) {
+                       archive_set_error(&a->archive, ERANGE,
+                                         "File is too large for PWB binary cpio format.");
+                       ret_final = ARCHIVE_FAILED;
+                       goto exit_write_header;
+               } else if (archive_entry_size(entry) > INT32_MAX) {
+                       archive_set_error(&a->archive, ERANGE,
+                                         "File is too large for binary cpio format.");
+                       ret_final = ARCHIVE_FAILED;
+                       goto exit_write_header;
+               }
+               h.h_filesize = swap32(archive_entry_size(entry)); /* file */
+       }
+
+       ret = __archive_write_output(a, &h, HSIZE);
+       if (ret != ARCHIVE_OK) {
+               ret_final = ARCHIVE_FATAL;
+               goto exit_write_header;
+       }
+
+       ret = __archive_write_output(a, path, pathlength);
+       if ((ret == ARCHIVE_OK) && ((pathlength % 2) != 0))
+               ret = __archive_write_nulls(a, 1);
+       if (ret != ARCHIVE_OK) {
+               ret_final = ARCHIVE_FATAL;
+               goto exit_write_header;
+       }
+
+       cpio->entry_bytes_remaining = archive_entry_size(entry);
+       if ((cpio->entry_bytes_remaining % 2) != 0)
+               cpio->entry_bytes_remaining++;
+
+       /* Write the symlink now. */
+       if (p != NULL  &&  *p != '\0') {
+               ret = __archive_write_output(a, p, strlen(p));
+               if ((ret == ARCHIVE_OK) && ((strlen(p) % 2) != 0))
+                       ret = __archive_write_nulls(a, 1);
+               if (ret != ARCHIVE_OK) {
+                       ret_final = ARCHIVE_FATAL;
+                       goto exit_write_header;
+               }
+       }
+       
+exit_write_header:
+       archive_entry_free(entry_main);
+       return (ret_final);
+}
+
+static ssize_t
+archive_write_binary_data(struct archive_write *a, const void *buff, size_t s)
+{
+       struct cpio *cpio;
+       int ret;
+
+       cpio = (struct cpio *)a->format_data;
+       if (s > cpio->entry_bytes_remaining)
+               s = (size_t)cpio->entry_bytes_remaining;
+
+       ret = __archive_write_output(a, buff, s);
+       cpio->entry_bytes_remaining -= s;
+       if (ret >= 0)
+               return (s);
+       else
+               return (ret);
+}
+
+static int
+archive_write_binary_close(struct archive_write *a)
+{
+       int er;
+       struct archive_entry *trailer;
+
+       trailer = archive_entry_new2(NULL);
+       /* nlink = 1 here for GNU cpio compat. */
+       archive_entry_set_nlink(trailer, 1);
+       archive_entry_set_size(trailer, 0);
+       archive_entry_set_pathname(trailer, "TRAILER!!!");
+       er = write_header(a, trailer);
+       archive_entry_free(trailer);
+       return (er);
+}
+
+static int
+archive_write_binary_free(struct archive_write *a)
+{
+       struct cpio *cpio;
+
+       cpio = (struct cpio *)a->format_data;
+       free(cpio->ino_list);
+       free(cpio);
+       a->format_data = NULL;
+       return (ARCHIVE_OK);
+}
+
+static int
+archive_write_binary_finish_entry(struct archive_write *a)
+{
+       struct cpio *cpio;
+
+       cpio = (struct cpio *)a->format_data;
+       return (__archive_write_nulls(a,
+               (size_t)cpio->entry_bytes_remaining));
+}