all repos — cgit @ 2fc008d6dea2456548825c973a5516b5cdfd9c8c

a hyperfast web frontend for git written in c 

ui-shared: ban strcat()

Git upstream bans strcat() with commit:

  banned.h: mark strcat() as banned
  1b11b64b815db62f93a04242e4aed5687a448748

To avoid compiler warnings from gcc 8.1.x we get the hard way.

Signed-off-by: Christian Hesse <mail@eworm.de>
Christian Hesse mail@eworm.de
Tue, 28 Aug 2018 20:33:02 +0200
commit

2fc008d6dea2456548825c973a5516b5cdfd9c8c

parent

edb3403f00f14ac5cc23b9ba3a122cb4ee8b81fa

1 files changed, 8 insertions(+), 4 deletions(-)

jump to
M ui-shared.c → ui-shared.c 
@@ -1159,7 +1159,7 @@ }
 
 void cgit_set_title_from_path(const char *path)
 {
-	size_t path_len, path_index, path_last_end;
+	size_t path_len, path_index, path_last_end, line_len;
 	char *new_title;
 
 	if (!path)

@@ -1176,14 +1176,18 @@ path_last_end = path_index - 1;
 				continue;
 			}
 			strncat(new_title, &path[path_index + 1], path_last_end - path_index - 1);
-			strcat(new_title, "\\");
+			line_len = strlen(new_title);
+			new_title[line_len++] = '\\';
+			new_title[line_len] = '\0';
 			path_last_end = path_index;
 		}
 	}
 	if (path_last_end)
 		strncat(new_title, path, path_last_end);
 
-	strcat(new_title, " - ");
-	strcat(new_title, ctx.page.title);
+	line_len = strlen(new_title);
+	memcpy(&new_title[line_len], " - ", 3);
+	new_title[line_len + 3] = '\0';
+	strncat(new_title, ctx.page.title, sizeof(new_title) - strlen(new_title) - 1);
 	ctx.page.title = new_title;
 }