diff options
| author | Christian Hesse <mail@eworm.de> | 2019-02-12 21:53:02 +0100 |
|---|---|---|
| committer | Christian Hesse <mail@eworm.de> | 2019-06-05 15:37:49 +0200 |
| commit | 68de710c1c0e9b823a156b1398643601a682fbf9 (patch) | |
| tree | 27901bb130957f90467ac44642f31d46a4afd316 | |
| parent | ccba7eb9d0c43ffe99178ab6632dc3794f887309 (diff) | |
| download | cgit-68de710c1c0e9b823a156b1398643601a682fbf9.tar.gz cgit-68de710c1c0e9b823a156b1398643601a682fbf9.tar.xz | |
ui-ssdiff: ban strncat()
Git version v2.21.0 marks strncat() as banned (commit
ace5707a803eda0f1dde3d776dc3729d3bc7759a), so replace it.
Signed-off-by: Christian Hesse <mail@eworm.de>
| -rw-r--r-- | ui-ssdiff.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/ui-ssdiff.c b/ui-ssdiff.c index b6dc5b0..af8bc9e 100644 --- a/ui-ssdiff.c +++ b/ui-ssdiff.c @@ -117,7 +117,7 @@ static char *replace_tabs(char *line) int n_tabs = 0; int i; char *result; - int result_len; + size_t result_len; if (linelen == 0) { result = xmalloc(1); @@ -136,10 +136,12 @@ static char *replace_tabs(char *line) for (;;) { cur_buf = strchr(prev_buf, '\t'); if (!cur_buf) { - strncat(result, prev_buf, result_len); + linelen = strlen(result); + strlcpy(&result[linelen], prev_buf, result_len - linelen + 1); break; } else { - strncat(result, prev_buf, cur_buf - prev_buf); + linelen = strlen(result); + strlcpy(&result[linelen], prev_buf, cur_buf - prev_buf + 1); linelen = strlen(result); memset(&result[linelen], ' ', 8 - (linelen % 8)); result[linelen + 8 - (linelen % 8)] = '\0'; |