about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorJason A. Donenfeld2019-01-02 07:52:12 +0100
committerJason A. Donenfeld2019-01-02 16:13:57 +0100
commite23f63461f17aeb770d47d9c3134414e549d1f0e (patch)
tree1de691c973f91e39afb89a1b24996ccf244afd2d
parentgit: update to v2.20.0 (diff)
downloadcgit-e23f63461f17aeb770d47d9c3134414e549d1f0e.tar.gz
cgit-e23f63461f17aeb770d47d9c3134414e549d1f0e.zip
ui-shared: fix broken sizeof in title setting and rewrite
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>
-rw-r--r--ui-shared.c34
1 files changed, 8 insertions, 26 deletions
diff --git a/ui-shared.c b/ui-shared.c index 7a4c726..d27a5fd 100644 --- a/ui-shared.c +++ b/ui-shared.c
@@ -1192,35 +1192,17 @@ void cgit_print_snapshot_links(const struct cgit_repo *repo, const char *ref,
1192 1192
1193void cgit_set_title_from_path(const char *path) 1193void cgit_set_title_from_path(const char *path)
1194{ 1194{
1195 size_t path_len, path_index, path_last_end, line_len; 1195 struct strbuf sb = STRBUF_INIT;
1196 char *new_title; 1196 const char *slash, *last_slash;
1197 1197
1198 if (!path) 1198 if (!path)
1199 return; 1199 return;
1200 1200
1201 path_len = strlen(path); 1201 for (last_slash = path + strlen(path); (slash = memrchr(path, '/', last_slash - path)) != NULL; last_slash = slash) {
1202 new_title = xmalloc(path_len + 3 + strlen(ctx.page.title) + 1); 1202 strbuf_add(&sb, slash + 1, last_slash - slash - 1);
1203 new_title[0] = '\0'; 1203 strbuf_addstr(&sb, " \xc2\xab ");
1204
1205 for (path_index = path_len, path_last_end = path_len; path_index-- > 0;) {
1206 if (path[path_index] == '/') {
1207 if (path_index == path_len - 1) {
1208 path_last_end = path_index - 1;
1209 continue;
1210 }
1211 strncat(new_title, &path[path_index + 1], path_last_end - path_index - 1);
1212 line_len = strlen(new_title);
1213 new_title[line_len++] = '\\';
1214 new_title[line_len] = '\0';
1215 path_last_end = path_index;
1216 }
1217 } 1204 }
1218 if (path_last_end) 1205 strbuf_add(&sb, path, last_slash - path);
1219 strncat(new_title, path, path_last_end); 1206 strbuf_addf(&sb, " - %s", ctx.page.title);
1220 1207 ctx.page.title = strbuf_detach(&sb, NULL);
1221 line_len = strlen(new_title);
1222 memcpy(&new_title[line_len], " - ", 3);
1223 new_title[line_len + 3] = '\0';
1224 strncat(new_title, ctx.page.title, sizeof(new_title) - strlen(new_title) - 1);
1225 ctx.page.title = new_title;
1226} 1208}