git: update to v2.26.0

[cgit.git] / ui-shared.c

diff --git a/ui-shared.c b/ui-shared.c
index 7a4c7265962fb93ad5261849360f1ef2b541eeb0..d2358f292823ce11bfe91523ed833cdf4cdca235 100644 (file)
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -945,12 +945,13 @@ static void cgit_print_path_crumbs(char *path)
 {
        char *old_path = ctx.qry.path;
        char *p = path, *q, *end = path + strlen(path);
 {
        char *old_path = ctx.qry.path;
        char *p = path, *q, *end = path + strlen(path);

+       int levels = 0;

 
        ctx.qry.path = NULL;
        cgit_self_link("root", NULL, NULL);
        ctx.qry.path = p = path;
        while (p < end) {
 
        ctx.qry.path = NULL;
        cgit_self_link("root", NULL, NULL);
        ctx.qry.path = p = path;
        while (p < end) {

-               if (!(q = strchr(p, '/')))
+               if (!(q = strchr(p, '/')) || levels > 15)

                        q = end;
                *q = '\0';
                html_txt("/");
                        q = end;
                *q = '\0';
                html_txt("/");


@@ -958,6 +959,7 @@ static void cgit_print_path_crumbs(char *path)
                if (q < end)
                        *q = '/';
                p = q + 1;
                if (q < end)
                        *q = '/';
                p = q + 1;

+               ++levels;

        }
        ctx.qry.path = old_path;
 }
        }
        ctx.qry.path = old_path;
 }


@@ -1192,35 +1194,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;
-       char *new_title;
+       struct strbuf sb = STRBUF_INIT;
+       const char *slash, *last_slash;

 
        if (!path)
                return;
 
 
        if (!path)
                return;
 

-       path_len = strlen(path);
-       new_title = xmalloc(path_len + 3 + strlen(ctx.page.title) + 1);
-       new_title[0] = '\0';
-
-       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);
-                       line_len = strlen(new_title);
-                       new_title[line_len++] = '\\';
-                       new_title[line_len] = '\0';
-                       path_last_end = path_index;
-               }
+       for (last_slash = path + strlen(path); (slash = memrchr(path, '/', last_slash - path)) != NULL; last_slash = slash) {
+               strbuf_add(&sb, slash + 1, last_slash - slash - 1);
+               strbuf_addstr(&sb, " \xc2\xab ");

        }
        }

-       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;
+       strbuf_add(&sb, path, last_slash - path);
+       strbuf_addf(&sb, " - %s", ctx.page.title);
+       ctx.page.title = strbuf_detach(&sb, NULL);

 }
 }