crtxcr/cgitsb
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ui-shared: fix broken sizeof in title setting and rewrite

Browse Source 
The old algorithm was totally incorrect. While we're at it, use «
instead of \, since it makes more sense.

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
This commit is contained in:
Jason A. Donenfeld 2019-01-02 07:52:12 +01:00
parent 55ebd5e97c
commit e23f63461f
1 changed files with 8 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
ui-shared.c
View File

@ -1192,35 +1192,17 @@ void cgit_print_snapshot_links(const struct cgit_repo *repo, const char *ref,
void cgit_set_title_from_path(const char *path) void cgit_set_title_from_path(const char *path)
{ {
size_t path_len, path_index, path_last_end, line_len; struct strbuf sb = STRBUF_INIT;
char *new_title; const char *slash, *last_slash;
if (!path) if (!path)
return; return;
path_len = strlen(path); for (last_slash = path + strlen(path); (slash = memrchr(path, '/', last_slash - path)) != NULL; last_slash = slash) {
new_title = xmalloc(path_len + 3 + strlen(ctx.page.title) + 1); strbuf_add(&sb, slash + 1, last_slash - slash - 1);
new_title[0] = '\0'; strbuf_addstr(&sb, " \xc2\xab ");
for (path_index = path_len, path_last_end = path_len; path_index-- > 0;) {
if (path[path_index] == '/') {
if (path_index == path_len - 1) {
path_last_end = path_index - 1;
continue;
} }
strncat(new_title, &path[path_index + 1], path_last_end - path_index - 1); strbuf_add(&sb, path, last_slash - path);
line_len = strlen(new_title); strbuf_addf(&sb, " - %s", ctx.page.title);
new_title[line_len++] = '\\'; ctx.page.title = strbuf_detach(&sb, NULL);
new_title[line_len] = '\0';
path_last_end = path_index;
}
}
if (path_last_end)
strncat(new_title, path, path_last_end);
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;
} }