emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cpio: emit TRAILER even when hard links were found.

Browse Source 
by Pascal Bellard (pascal.bellard AT ads-lu.com)
This commit is contained in:
Denis Vlasenko 2008-10-26 19:55:20 +00:00
parent 6b9d6c7544
commit c503dde01a
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
archival/cpio.c
View File

@ -30,6 +30,7 @@ static off_t cpio_pad4(off_t size)
* It's ok to exit instead of return. */ * It's ok to exit instead of return. */
static int cpio_o(void) static int cpio_o(void)
{ {
static const char trailer[] ALIGN1 = "TRAILER!!!";
struct name_s { struct name_s {
struct name_s *next; struct name_s *next;
char name[1]; char name[1];
@ -119,7 +120,7 @@ static int cpio_o(void)
} else { } else {
/* If no (more) hardlinks to output, /* If no (more) hardlinks to output,
* output "trailer" entry */ * output "trailer" entry */
name = "TRAILER!!!"; name = trailer;
/* st.st_size == 0 is a must, but for uniformity /* st.st_size == 0 is a must, but for uniformity
* in the output, we zero out everything */ * in the output, we zero out everything */
memset(&st, 0, sizeof(st)); memset(&st, 0, sizeof(st));
@ -167,7 +168,7 @@ static int cpio_o(void)
} }
if (!line) { if (!line) {
if (links) if (name != trailer)
goto next_link; goto next_link;
/* TODO: GNU cpio pads trailer to 512 bytes, do we want that? */ /* TODO: GNU cpio pads trailer to 512 bytes, do we want that? */
return EXIT_SUCCESS; return EXIT_SUCCESS;