@matheusbsbs / matheus-bagliano / commits / 621c53cc08
Fork 0

builtin-diff: \No newline at end of file.

Signed-off-by: Junio C Hamano <junkio@cox.net>

Linus Torvalds committed Mar 25, 2006 at 07:56 UTC 621c53cc082299eaf69e9f2dc0274547c7d87fb0
1 file changed +10 -2
xdiff/xutils.c
+10 -2
@@ -31,14 +31,22 @@
31
32 int xdl_emit_diffrec(char const *rec, long size, char const *pre, long psize,
33 xdemitcb_t *ecb) {
34 - mmbuffer_t mb[2];
34 + mmbuffer_t mb[3];
35 + int i;
36
37 mb[0].ptr = (char *) pre;
38 mb[0].size = psize;
39 mb[1].ptr = (char *) rec;
40 mb[1].size = size;
41 + i = 2;
42
41 - if (ecb->outf(ecb->priv, mb, 2) < 0) {
43 + if (!size || rec[size-1] != '\n') {
44 + mb[2].ptr = "\n\\ No newline at end of file\n";
45 + mb[2].size = strlen(mb[2].ptr);
46 + i = 3;
47 + }
48 +
49 + if (ecb->outf(ecb->priv, mb, i) < 0) {
50
51 return -1;
52 }