ui-shared: restrict to 15 levels

[cgit.git] / ui-shared.c

diff --git a/ui-shared.c b/ui-shared.c
index 739505a865cc7660621f28666474ec9c6d624718..d2358f292823ce11bfe91523ed833cdf4cdca235 100644 (file)
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -68,15 +68,48 @@ char *cgit_hosturl(void)
 char *cgit_currenturl(void)
 {
        const char *root = cgit_rooturl();
-       size_t len = strlen(root);
 
        if (!ctx.qry.url)
                return xstrdup(root);
-       if (len && root[len - 1] == '/')
+       if (root[0] && root[strlen(root) - 1] == '/')
                return fmtalloc("%s%s", root, ctx.qry.url);
        return fmtalloc("%s/%s", root, ctx.qry.url);
 }
 
+char *cgit_currentfullurl(void)
+{
+       const char *root = cgit_rooturl();
+       const char *orig_query = ctx.env.query_string ? ctx.env.query_string : "";
+       size_t len = strlen(orig_query);
+       char *query = xmalloc(len + 2), *start_url, *ret;
+
+       /* Remove all url=... parts from query string */
+       memcpy(query + 1, orig_query, len + 1);
+       query[0] = '?';
+       start_url = query;
+       while ((start_url = strstr(start_url, "url=")) != NULL) {
+               if (start_url[-1] == '?' || start_url[-1] == '&') {
+                       const char *end_url = strchr(start_url, '&');
+                       if (end_url)
+                               memmove(start_url, end_url + 1, strlen(end_url));
+                       else
+                               start_url[0] = '\0';
+               } else
+                       ++start_url;
+       }
+       if (!query[1])
+               query[0] = '\0';
+
+       if (!ctx.qry.url)
+               ret = fmtalloc("%s%s", root, query);
+       else if (root[0] && root[strlen(root) - 1] == '/')
+               ret = fmtalloc("%s%s%s", root, ctx.qry.url, query);
+       else
+               ret = fmtalloc("%s/%s%s", root, ctx.qry.url, query);
+       free(query);
+       return ret;
+}
+
 const char *cgit_rooturl(void)
 {
        if (ctx.cfg.virtual_root)
@@ -912,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);
+       int levels = 0;
 
        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("/");
@@ -925,6 +959,7 @@ static void cgit_print_path_crumbs(char *path)
                if (q < end)
                        *q = '/';
                p = q + 1;
+               ++levels;
        }
        ctx.qry.path = old_path;
 }
@@ -1159,31 +1194,17 @@ void cgit_print_snapshot_links(const struct cgit_repo *repo, const char *ref,
 
 void cgit_set_title_from_path(const char *path)
 {
-       size_t path_len, path_index, path_last_end;
-       char *new_title;
+       struct strbuf sb = STRBUF_INIT;
+       const char *slash, *last_slash;
 
        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);
-                       strcat(new_title, "\\");
-                       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);
-
-       strcat(new_title, " - ");
-       strcat(new_title, ctx.page.title);
-       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);
 }