mirrors/cgit
0
0
Fork 0
mirror of https://git.zx2c4.com/cgit synced 2024-11-09 18:18:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

ui-tree: move set_title_from_path to ui-shared

Browse Source 
The ui-blame code will also need to call set_title_from_path, so go
ahead and move it to ui-shared.

Signed-off-by: Jeff Smith <whydoubt@gmail.com>
Reviewed-by: John Keeping <john@keeping.me.uk>
This commit is contained in:
Jeff Smith 2017-10-01 23:39:06 -05:00 committed by John Keeping
parent 70787254b2
commit 9337c7ee83
3 changed files with 35 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
ui-shared.c
View File

@ -1111,3 +1111,34 @@ void cgit_print_snapshot_links(const char *repo, const char *head,
} }
strbuf_release(&filename); strbuf_release(&filename);
} }
void cgit_set_title_from_path(const char *path)
{
size_t path_len, path_index, path_last_end;
char *new_title;
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;
}
}
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;
}

2
ui-shared.h
View File

@ -77,4 +77,6 @@ extern void cgit_print_snapshot_links(const char *repo, const char *head,
const char *hex, int snapshots); const char *hex, int snapshots);
extern void cgit_add_hidden_formfields(int incl_head, int incl_search, extern void cgit_add_hidden_formfields(int incl_head, int incl_search,
const char *page); const char *page);
extern void cgit_set_title_from_path(const char *path);
#endif /* UI_SHARED_H */ #endif /* UI_SHARED_H */

35
ui-tree.c
View File

@ -84,37 +84,6 @@ static void print_binary_buffer(char *buf, unsigned long size)
html("</table>\n"); html("</table>\n");
} }
static void set_title_from_path(const char *path)
{
size_t path_len, path_index, path_last_end;
char *new_title;
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;
}
}
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;
}
static void print_object(const unsigned char *sha1, char *path, const char *basename, const char *rev) static void print_object(const unsigned char *sha1, char *path, const char *basename, const char *rev)
{ {
enum object_type type; enum object_type type;
@ -135,7 +104,7 @@ static void print_object(const unsigned char *sha1, char *path, const char *base
return; return;
} }
set_title_from_path(path); cgit_set_title_from_path(path);
cgit_print_layout_start(); cgit_print_layout_start();
htmlf("blob: %s (", sha1_to_hex(sha1)); htmlf("blob: %s (", sha1_to_hex(sha1));
@ -335,7 +304,7 @@ static int walk_tree(const unsigned char *sha1, struct strbuf *base,
if (S_ISDIR(mode)) { if (S_ISDIR(mode)) {
walk_tree_ctx->state = 1; walk_tree_ctx->state = 1;
set_title_from_path(buffer.buf); cgit_set_title_from_path(buffer.buf);
strbuf_release(&buffer); strbuf_release(&buffer);
ls_head(); ls_head();
return READ_TREE_RECURSIVE; return READ_TREE_RECURSIVE;