diff options
| author | Florian Pritz <bluewind@xinu.at> | 2018-08-03 17:52:44 +0200 |
|---|---|---|
| committer | Florian Pritz <bluewind@xinu.at> | 2018-08-03 17:52:44 +0200 |
| commit | 42f8840323a219d3eca59a7a2a388c3a28eeb8fb (patch) | |
| tree | ec799ab66ed4119b68268192ea8fbe62a96b51aa /ui-ssdiff.c | |
| parent | 343a8b8ee33f9a181e662fc0e3a3979dd9b52dd4 (diff) | |
| parent | 824138e59194acaf5efe53690d4ef6eaf38e1549 (diff) | |
| download | cgit-42f8840323a219d3eca59a7a2a388c3a28eeb8fb.tar.gz cgit-42f8840323a219d3eca59a7a2a388c3a28eeb8fb.tar.xz | |
Merge branch 'master' of https://git.zx2c4.com/cgit into local
Diffstat (limited to 'ui-ssdiff.c')
| -rw-r--r-- | ui-ssdiff.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/ui-ssdiff.c b/ui-ssdiff.c index 7f261ed..68c2044 100644 --- a/ui-ssdiff.c +++ b/ui-ssdiff.c @@ -114,11 +114,10 @@ static char *replace_tabs(char *line) { char *prev_buf = line; char *cur_buf; - int linelen = strlen(line); + size_t linelen = strlen(line); int n_tabs = 0; int i; char *result; - char *spaces = " "; if (linelen == 0) { result = xmalloc(1); @@ -126,20 +125,23 @@ static char *replace_tabs(char *line) return result; } - for (i = 0; i < linelen; i++) + for (i = 0; i < linelen; i++) { if (line[i] == '\t') n_tabs += 1; + } result = xmalloc(linelen + n_tabs * 8 + 1); result[0] = '\0'; - while (1) { + for (;;) { cur_buf = strchr(prev_buf, '\t'); if (!cur_buf) { strcat(result, prev_buf); break; } else { strncat(result, prev_buf, cur_buf - prev_buf); - strncat(result, spaces, 8 - (strlen(result) % 8)); + linelen = strlen(result); + memset(&result[linelen], ' ', 8 - (linelen % 8)); + result[linelen + 8 - (linelen % 8)] = '\0'; } prev_buf = cur_buf + 1; } |