wok diff busybox/stuff/busybox-1.31-cpio.u @ rev 24924
Add as & asxxxx
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Wed Apr 13 10:27:34 2022 +0000 (2022-04-13) |
parents | 0830d8859de8 |
children |
line diff
1.1 --- a/busybox/stuff/busybox-1.31-cpio.u Thu Jun 27 12:32:05 2019 +0200 1.2 +++ b/busybox/stuff/busybox-1.31-cpio.u Wed Apr 13 10:27:34 2022 +0000 1.3 @@ -10,3 +10,14 @@ 1.4 /* Store hardlinks for later processing, dont output them */ 1.5 if (!S_ISDIR(st.st_mode) && st.st_nlink > 1) { 1.6 struct name_s *n; 1.7 +--- busybox-1.31/archival/libarchive/get_header_cpio.c 1.8 ++++ busybox-1.31/archival/libarchive/get_header_cpio.c 1.9 +@@ -80,7 +80,7 @@ 1.10 + /* Update offset amount and skip padding before file contents */ 1.11 + data_align(archive_handle, 4); 1.12 + 1.13 +- if (strcmp(file_header->name, cpio_TRAILER) == 0) { 1.14 ++ if ((strcmp(file_header->name, cpio_TRAILER) | file_header->mode) == 0) { 1.15 + /* Always round up. ">> 9" divides by 512 */ 1.16 + archive_handle->cpio__blocks = (uoff_t)(archive_handle->offset + 511) >> 9; 1.17 + goto create_hardlinks;