wok annotate busybox/stuff/busybox-1.31-cpio.u @ rev 23976
net-snmp: do not install darwin?.h
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Sat Oct 31 15:07:33 2020 +0000 (2020-10-31) |
parents | 0830d8859de8 |
children |
rev | line source |
---|---|
pascal@21761 | 1 --- busybox-1.31/archival/cpio.c |
pascal@21761 | 2 +++ busybox-1.31/archival/cpio.c |
pascal@21761 | 3 @@ -247,6 +247,9 @@ |
pascal@21761 | 4 if (!(S_ISLNK(st.st_mode) || S_ISREG(st.st_mode))) |
pascal@21761 | 5 st.st_size = 0; /* paranoia */ |
pascal@21761 | 6 |
pascal@21761 | 7 + if (S_ISLNK(st.st_mode)) |
pascal@21761 | 8 + st.st_nlink = 1; /* like GNU cpio */ |
pascal@21761 | 9 + |
pascal@21761 | 10 /* Store hardlinks for later processing, dont output them */ |
pascal@21761 | 11 if (!S_ISDIR(st.st_mode) && st.st_nlink > 1) { |
pascal@21761 | 12 struct name_s *n; |
pascal@23976 | 13 --- busybox-1.31/archival/libarchive/get_header_cpio.c |
pascal@23976 | 14 +++ busybox-1.31/archival/libarchive/get_header_cpio.c |
pascal@23976 | 15 @@ -80,7 +80,7 @@ |
pascal@23976 | 16 /* Update offset amount and skip padding before file contents */ |
pascal@23976 | 17 data_align(archive_handle, 4); |
pascal@23976 | 18 |
pascal@23976 | 19 - if (strcmp(file_header->name, cpio_TRAILER) == 0) { |
pascal@23976 | 20 + if ((strcmp(file_header->name, cpio_TRAILER) | file_header->mode) == 0) { |
pascal@23976 | 21 /* Always round up. ">> 9" divides by 512 */ |
pascal@23976 | 22 archive_handle->cpio__blocks = (uoff_t)(archive_handle->offset + 511) >> 9; |
pascal@23976 | 23 goto create_hardlinks; |