diff options
author | Christian Hesse <mail@eworm.de> | 2019-02-12 21:53:02 +0100 |
---|---|---|
committer | Christian Hesse <mail@eworm.de> | 2019-02-12 21:53:02 +0100 |
commit | 5e88e8f91c48f543f5060209fbe97ca83dd6e4de (patch) | |
tree | ffcd8958b8afe0beec6cea11200b57f3fde3096d | |
parent | 7d87cd3a215976a480b3c71b017a191597e5cb44 (diff) | |
download | cgit-5e88e8f91c48f543f5060209fbe97ca83dd6e4de.tar.gz |
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 c456033..a5892fb 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'; |