From: Mark Wooding Date: Mon, 27 Feb 2006 12:52:52 GMT Subject: [PATCH 2/2] combine-diff: Honour -z option correctly. Message-ID: <20060227125252.25144.12278.stgit@metalzone.distorted.org.uk> In-Reply-To: <20060227124815.25144.83101.stgit@metalzone.distorted.org.uk> From: Mark Wooding Combined diffs don't null terminate things in the same way as standard diffs. This is presumably wrong. Signed-off-by: Mark Wooding --- combine-diff.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/combine-diff.c b/combine-diff.c index 984103e..a23894d 100644 --- a/combine-diff.c +++ b/combine-diff.c @@ -726,7 +726,7 @@ static int show_patch_diff(struct combin if (header) { shown_header++; - puts(header); + printf("%s%c", header, opt->line_termination); } printf("diff --%s ", dense ? "cc" : "combined"); if (quote_c_style(elem->path, NULL, NULL, 0)) @@ -799,7 +799,7 @@ static void show_raw_diff(struct combine inter_name_termination = 0; if (header) - puts(header); + printf("%s%c", header, line_termination); for (i = 0; i < num_parent; i++) { if (p->parent[i].mode)