summary refs log tree commit diff
diff options
context:
space:
mode:
authorJulius Plenz <plenz@cis.fu-berlin.de>2012-11-15 17:35:06 +0100
committerJason A. Donenfeld <Jason@zx2c4.com>2013-02-01 13:46:47 +0100
commit225c8aba3171156fb917abe043ea55797e2cc1f9 (patch)
tree7d6ed1520a4ae3a46fba6a8404dd0318c1c63d9b
parentb1e172acca870e7999f2d2d917db7b4c42aa05b3 (diff)
ssdiff: correctly manage tab expansion
Previously, replace_tabs("foo\tbar") would become "        foobar".

Signed-off-by: Julius Plenz <plenz@cis.fu-berlin.de>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
-rw-r--r--ui-ssdiff.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/ui-ssdiff.c b/ui-ssdiff.c
index 7108779..3d3dad6 100644
--- a/ui-ssdiff.c
+++ b/ui-ssdiff.c
@@ -138,9 +138,8 @@ static char *replace_tabs(char *line)
 			strcat(result, prev_buf);
 			break;
 		} else {
-			strcat(result, " ");
-			strncat(result, spaces, 8 - (strlen(result) % 8));
 			strncat(result, prev_buf, cur_buf - prev_buf);
+			strncat(result, spaces, 8 - (strlen(result) % 8));
 		}
 		prev_buf = cur_buf + 1;
 	}