When hardlinking files for -l by using archive_write_header(),

ensure that we're just doing a bare hardlink without any accompanying
data.  (Remember that cpio allows hardlinks to have data.)
Otherwise, -l creates a link and then opens the linked files
for overwrite, resulting in the files being erased.

SVN-Revision: 143

diff --git a/cpio/cpio.c b/cpio/cpio.c
index 7b30062380cf93e00271363851eb31e6bad9c9ae..a92cd3e866bf5ae362926077582e9d451f70d904 100644 (file)
--- a/cpio/cpio.c
+++ b/cpio/cpio.c
@@ -546,6 +546,7 @@ entry_to_archive(struct cpio *cpio, struct archive_entry *entry)
                /* Note: link(2) doesn't create parent directories,
                 * so we use archive_write_header() instead. */
                archive_entry_set_hardlink(t, srcpath);
+               archive_entry_set_size(t, 0);
                r = archive_write_header(cpio->archive, t);
                archive_entry_free(t);
                if (r != ARCHIVE_OK)