Author: kientzle
Date: Tue Sep 13 05:52:34 2011
New Revision: 225525
URL: http://svn.freebsd.org/changeset/base/225525
Log:
Fix cpio on ARM.
PR: bin/160430
Submitted by: Ian Lepore
Approved by: re (Kostik Belousov)
MFC after: 7 days
Modified:
head/lib/libarchive/archive_read_support_format_cpio.c
head/lib/libarchive/archive_write_set_format_cpio.c
Modified: head/lib/libarchive/archive_read_support_format_cpio.c
==============================================================================
--- head/lib/libarchive/archive_read_support_format_cpio.c Tue Sep 13
02:46:22 2011 (r225524)
+++ head/lib/libarchive/archive_read_support_format_cpio.c Tue Sep 13
05:52:34 2011 (r225525)
@@ -54,7 +54,7 @@ struct cpio_bin_header {
unsigned char c_mtime[4];
unsigned char c_namesize[2];
unsigned char c_filesize[4];
-};
+} __packed;
struct cpio_odc_header {
char c_magic[6];
@@ -68,7 +68,7 @@ struct cpio_odc_header {
char c_mtime[11];
char c_namesize[6];
char c_filesize[11];
-};
+} __packed;
struct cpio_newc_header {
char c_magic[6];
@@ -85,7 +85,7 @@ struct cpio_newc_header {
char c_rdevminor[8];
char c_namesize[8];
char c_crc[8];
-};
+} __packed;
struct links_entry {
struct links_entry *next;
Modified: head/lib/libarchive/archive_write_set_format_cpio.c
==============================================================================
--- head/lib/libarchive/archive_write_set_format_cpio.c Tue Sep 13 02:46:22
2011 (r225524)
+++ head/lib/libarchive/archive_write_set_format_cpio.c Tue Sep 13 05:52:34
2011 (r225525)
@@ -74,7 +74,7 @@ struct cpio_header {
char c_mtime[11];
char c_namesize[6];
char c_filesize[11];
-};
+} __packed;
/*
* Set output format to 'cpio' format.
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
