[PATCH 2/2] bugfix: make ss-diff correctly handle tab expansion

Julius Plenz plenz at cis.fu-berlin.de
Tue Oct 30 13:56:02 CET 2012


Previously, replace_tabs("foo\tbar") would become "        foobar".

Signed-off-by: Julius Plenz <plenz at cis.fu-berlin.de>
---
 ui-ssdiff.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui-ssdiff.c b/ui-ssdiff.c
index 7108779..fbb46cf 100644
--- a/ui-ssdiff.c
+++ b/ui-ssdiff.c
@@ -138,9 +138,9 @@ static char *replace_tabs(char *line)
 			strcat(result, prev_buf);
 			break;
 		} else {
+			strncat(result, prev_buf, cur_buf - prev_buf);
 			strcat(result, " ");
 			strncat(result, spaces, 8 - (strlen(result) % 8));
-			strncat(result, prev_buf, cur_buf - prev_buf);
 		}
 		prev_buf = cur_buf + 1;
 	}
-- 
1.7.12.3-zedat





More information about the CGit mailing list