diff options
| author | kientzle <kientzle@FreeBSD.org> | 2011-09-13 05:52:34 +0000 |
|---|---|---|
| committer | kientzle <kientzle@FreeBSD.org> | 2011-09-13 05:52:34 +0000 |
| commit | 53989b8fb0ae13566fd563f6b15f09c8c2f97240 (patch) | |
| tree | 1063c2a64e5ef8eabe35dc5f01d97f3abf3ea250 | |
| parent | ce750aacfc656eeafcd42ef8b5dfc3f93d07caaf (diff) | |
| download | FreeBSD-src-53989b8fb0ae13566fd563f6b15f09c8c2f97240.zip FreeBSD-src-53989b8fb0ae13566fd563f6b15f09c8c2f97240.tar.gz | |
Fix cpio on ARM.
PR: bin/160430
Submitted by: Ian Lepore
Approved by: re (Kostik Belousov)
MFC after: 7 days
| -rw-r--r-- | lib/libarchive/archive_read_support_format_cpio.c | 6 | ||||
| -rw-r--r-- | lib/libarchive/archive_write_set_format_cpio.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/libarchive/archive_read_support_format_cpio.c b/lib/libarchive/archive_read_support_format_cpio.c index 7e52fbe..24f3d35 100644 --- a/lib/libarchive/archive_read_support_format_cpio.c +++ b/lib/libarchive/archive_read_support_format_cpio.c @@ -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; diff --git a/lib/libarchive/archive_write_set_format_cpio.c b/lib/libarchive/archive_write_set_format_cpio.c index a0bccc5..798646a 100644 --- a/lib/libarchive/archive_write_set_format_cpio.c +++ b/lib/libarchive/archive_write_set_format_cpio.c @@ -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. |
