From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 17 Dec 2008 20:37:58 +0000 (-0800)
Subject: combine-diff.c: use strbuf_readlink()
X-Git-Tag: v1.6.1-rc4~20^2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=912342d9d69a30e49491f3fd4d3aa8dc2f6050f3;p=git.git

combine-diff.c: use strbuf_readlink()

When showing combined diff using work tree contents, use strbuf_readlink()
to read symbolic links.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
Acked-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/combine-diff.c b/combine-diff.c
index ec8df39bb..bccc018ab 100644
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -703,15 +703,15 @@ static void show_patch_diff(struct combine_diff_path *elem, int num_parent,
 			goto deleted_file;
 
 		if (S_ISLNK(st.st_mode)) {
-			size_t len = xsize_t(st.st_size);
-			result_size = len;
-			result = xmalloc(len + 1);
-			if (result_size != readlink(elem->path, result, len)) {
+			struct strbuf buf = STRBUF_INIT;
+
+			if (strbuf_readlink(&buf, elem->path, st.st_size) < 0) {
 				error("readlink(%s): %s", elem->path,
 				      strerror(errno));
 				return;
 			}
-			result[len] = 0;
+			result_size = buf.len;
+			result = strbuf_detach(&buf, NULL);
 			elem->mode = canon_mode(st.st_mode);
 		}
 		else if (0 <= (fd = open(elem->path, O_RDONLY)) &&