From: Denis Vlasenko <vda.linux@googlemail.com>
Date: Sun, 26 Oct 2008 19:55:20 +0000 (-0000)
Subject: cpio: emit TRAILER even when hard links were found.
X-Git-Tag: 1_13_0~62
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c503dde01a3be1ddabf3a3bcc1d1074457cf5f1a;p=oweals%2Fbusybox.git

cpio: emit TRAILER even when hard links were found.
 by Pascal Bellard (pascal.bellard AT ads-lu.com)
---

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