aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cache.c6
-rw-r--r--cgit.c31
-rw-r--r--cgit.h12
-rw-r--r--parsing.c16
-rw-r--r--shared.c61
-rw-r--r--ui-commit.c4
-rw-r--r--ui-log.c10
-rw-r--r--ui-repolist.c30
-rw-r--r--ui-shared.c28
-rw-r--r--ui-summary.c4
-rw-r--r--ui-tree.c2
11 files changed, 101 insertions, 103 deletions
diff --git a/cache.c b/cache.c
index 2ed0d6f..7860fc7 100644
--- a/cache.c
+++ b/cache.c
@@ -48,18 +48,18 @@ int cache_create_dirs()
if (mkdir(path, S_IRWXU) && errno!=EEXIST)
return 0;
- if (!cgit_repo)
+ if (!ctx.repo)
return 0;
path = fmt("%s/%s", ctx.cfg.cache_root,
- cache_safe_filename(cgit_repo->url));
+ cache_safe_filename(ctx.repo->url));
if (mkdir(path, S_IRWXU) && errno!=EEXIST)
return 0;
if (ctx.qry.page) {
path = fmt("%s/%s/%s", ctx.cfg.cache_root,
- cache_safe_filename(cgit_repo->url),
+ cache_safe_filename(ctx.repo->url),
ctx.qry.page);
if (mkdir(path, S_IRWXU) && errno!=EEXIST)
return 0;
diff --git a/cgit.c b/cgit.c
index f0907a1..b270fdc 100644
--- a/cgit.c
+++ b/cgit.c
@@ -10,7 +10,7 @@
static int cgit_prepare_cache(struct cacheitem *item)
{
- if (!cgit_repo && ctx.qry.repo) {
+ if (!ctx.repo && ctx.qry.repo) {
char *title = fmt("%s - %s", ctx.cfg.root_title, "Bad request");
cgit_print_docstart(title, item);
cgit_print_pageheader(title, 0);
@@ -19,7 +19,7 @@ static int cgit_prepare_cache(struct cacheitem *item)
return 0;
}
- if (!cgit_repo) {
+ if (!ctx.repo) {
item->name = xstrdup(fmt("%s/index.html", ctx.cfg.cache_root));
item->ttl = ctx.cfg.cache_root_ttl;
return 1;
@@ -27,12 +27,12 @@ static int cgit_prepare_cache(struct cacheitem *item)
if (!cgit_cmd) {
item->name = xstrdup(fmt("%s/%s/index.%s.html", ctx.cfg.cache_root,
- cache_safe_filename(cgit_repo->url),
+ cache_safe_filename(ctx.repo->url),
cache_safe_filename(ctx.qry.raw)));
item->ttl = ctx.cfg.cache_repo_ttl;
} else {
item->name = xstrdup(fmt("%s/%s/%s/%s.html", ctx.cfg.cache_root,
- cache_safe_filename(cgit_repo->url),
+ cache_safe_filename(ctx.repo->url),
ctx.qry.page,
cache_safe_filename(ctx.qry.raw)));
if (ctx.qry.has_symref)
@@ -64,7 +64,7 @@ int find_current_ref(const char *refname, const unsigned char *sha1,
return info->match;
}
-char *find_default_branch(struct repoinfo *repo)
+char *find_default_branch(struct cgit_repo *repo)
{
struct refmatch info;
@@ -84,7 +84,7 @@ static void cgit_print_repo_page(struct cacheitem *item)
int show_search;
unsigned char sha1[20];
- if (chdir(cgit_repo->path)) {
+ if (chdir(ctx.repo->path)) {
title = fmt("%s - %s", ctx.cfg.root_title, "Bad request");
cgit_print_docstart(title, item);
cgit_print_pageheader(title, 0);
@@ -94,13 +94,13 @@ static void cgit_print_repo_page(struct cacheitem *item)
return;
}
- title = fmt("%s - %s", cgit_repo->name, cgit_repo->desc);
+ title = fmt("%s - %s", ctx.repo->name, ctx.repo->desc);
show_search = 0;
- setenv("GIT_DIR", cgit_repo->path, 1);
+ setenv("GIT_DIR", ctx.repo->path, 1);
if (!ctx.qry.head) {
- ctx.qry.head = xstrdup(find_default_branch(cgit_repo));
- cgit_repo->defbranch = ctx.qry.head;
+ ctx.qry.head = xstrdup(find_default_branch(ctx.repo));
+ ctx.repo->defbranch = ctx.qry.head;
}
if (!ctx.qry.head) {
@@ -113,7 +113,7 @@ static void cgit_print_repo_page(struct cacheitem *item)
if (get_sha1(ctx.qry.head, sha1)) {
tmp = xstrdup(ctx.qry.head);
- ctx.qry.head = cgit_repo->defbranch;
+ ctx.qry.head = ctx.repo->defbranch;
cgit_print_docstart(title, item);
cgit_print_pageheader(title, 0);
cgit_print_error(fmt("Invalid branch: %s", tmp));
@@ -121,11 +121,11 @@ static void cgit_print_repo_page(struct cacheitem *item)
return;
}
- if ((cgit_cmd == CMD_SNAPSHOT) && cgit_repo->snapshots) {
+ if ((cgit_cmd == CMD_SNAPSHOT) && ctx.repo->snapshots) {
cgit_print_snapshot(item, ctx.qry.head, ctx.qry.sha1,
- cgit_repobasename(cgit_repo->url),
+ cgit_repobasename(ctx.repo->url),
ctx.qry.path,
- cgit_repo->snapshots );
+ ctx.repo->snapshots );
return;
}
@@ -192,7 +192,7 @@ static void cgit_fill_cache(struct cacheitem *item, int use_cache)
chk_positive(dup2(item->fd, STDOUT_FILENO), "Dup2(cachefile)");
}
- if (cgit_repo)
+ if (ctx.repo)
cgit_print_repo_page(item);
else
cgit_print_repolist(item);
@@ -300,7 +300,6 @@ int main(int argc, const char **argv)
cgit_read_config(cgit_config_env ? cgit_config_env : CGIT_CONFIG,
cgit_global_config_cb);
- cgit_repo = NULL;
if (getenv("SCRIPT_NAME"))
ctx.cfg.script_name = xstrdup(getenv("SCRIPT_NAME"));
if (getenv("QUERY_STRING"))
diff --git a/cgit.h b/cgit.h
index 0338ebd..598d8c3 100644
--- a/cgit.h
+++ b/cgit.h
@@ -66,7 +66,7 @@ struct cacheitem {
int fd;
};
-struct repoinfo {
+struct cgit_repo {
char *url;
char *name;
char *path;
@@ -82,10 +82,10 @@ struct repoinfo {
int enable_log_linecount;
};
-struct repolist {
+struct cgit_repolist {
int length;
int count;
- struct repoinfo *repos;
+ struct cgit_repo *repos;
};
struct commitinfo {
@@ -177,12 +177,12 @@ struct cgit_config {
struct cgit_context {
struct cgit_query qry;
struct cgit_config cfg;
+ struct cgit_repo *repo;
};
extern const char *cgit_version;
-extern struct repolist cgit_repolist;
-extern struct repoinfo *cgit_repo;
+extern struct cgit_repolist cgit_repolist;
extern struct cgit_context ctx;
extern int cgit_cmd;
@@ -190,7 +190,7 @@ extern int htmlfd;
extern void cgit_prepare_context(struct cgit_context *ctx);
extern int cgit_get_cmd_index(const char *cmd);
-extern struct repoinfo *cgit_get_repoinfo(const char *url);
+extern struct cgit_repo *cgit_get_repoinfo(const char *url);
extern void cgit_global_config_cb(const char *name, const char *value);
extern void cgit_repo_config_cb(const char *name, const char *value);
extern void cgit_querystring_cb(const char *name, const char *value);
diff --git a/parsing.c b/parsing.c
index 8cf56a4..027f06b 100644
--- a/parsing.c
+++ b/parsing.c
@@ -143,27 +143,27 @@ void cgit_parse_url(const char *url)
{
char *cmd, *p;
- cgit_repo = NULL;
+ ctx.repo = NULL;
if (!url || url[0] == '\0')
return;
- cgit_repo = cgit_get_repoinfo(url);
- if (cgit_repo) {
- ctx.qry.repo = cgit_repo->url;
+ ctx.repo = cgit_get_repoinfo(url);
+ if (ctx.repo) {
+ ctx.qry.repo = ctx.repo->url;
return;
}
cmd = strchr(url, '/');
- while (!cgit_repo && cmd) {
+ while (!ctx.repo && cmd) {
cmd[0] = '\0';
- cgit_repo = cgit_get_repoinfo(url);
- if (cgit_repo == NULL) {
+ ctx.repo = cgit_get_repoinfo(url);
+ if (ctx.repo == NULL) {
cmd[0] = '/';
cmd = strchr(cmd + 1, '/');
continue;
}
- ctx.qry.repo = cgit_repo->url;
+ ctx.qry.repo = ctx.repo->url;
p = strchr(cmd + 1, '/');
if (p) {
p[0] = '\0';
diff --git a/shared.c b/shared.c
index 8dd2b00..808e674 100644
--- a/shared.c
+++ b/shared.c
@@ -8,8 +8,7 @@
#include "cgit.h"
-struct repolist cgit_repolist;
-struct repoinfo *cgit_repo;
+struct cgit_repolist cgit_repolist;
struct cgit_context ctx;
int cgit_cmd;
@@ -73,9 +72,9 @@ int chk_non_negative(int result, char *msg)
return result;
}
-struct repoinfo *add_repo(const char *url)
+struct cgit_repo *add_repo(const char *url)
{
- struct repoinfo *ret;
+ struct cgit_repo *ret;
if (++cgit_repolist.count > cgit_repolist.length) {
if (cgit_repolist.length == 0)
@@ -84,7 +83,7 @@ struct repoinfo *add_repo(const char *url)
cgit_repolist.length *= 2;
cgit_repolist.repos = xrealloc(cgit_repolist.repos,
cgit_repolist.length *
- sizeof(struct repoinfo));
+ sizeof(struct cgit_repo));
}
ret = &cgit_repolist.repos[cgit_repolist.count-1];
@@ -103,10 +102,10 @@ struct repoinfo *add_repo(const char *url)
return ret;
}
-struct repoinfo *cgit_get_repoinfo(const char *url)
+struct cgit_repo *cgit_get_repoinfo(const char *url)
{
int i;
- struct repoinfo *repo;
+ struct cgit_repo *repo;
for (i=0; i<cgit_repolist.count; i++) {
repo = &cgit_repolist.repos[i];
@@ -179,32 +178,32 @@ void cgit_global_config_cb(const char *name, const char *value)
else if (!strcmp(name, "repo.group"))
ctx.cfg.repo_group = xstrdup(value);
else if (!strcmp(name, "repo.url"))
- cgit_repo = add_repo(value);
+ ctx.repo = add_repo(value);
else if (!strcmp(name, "repo.name"))
- cgit_repo->name = xstrdup(value);
- else if (cgit_repo && !strcmp(name, "repo.path"))
- cgit_repo->path = trim_end(value, '/');
- else if (cgit_repo && !strcmp(name, "repo.clone-url"))
- cgit_repo->clone_url = xstrdup(value);
- else if (cgit_repo && !strcmp(name, "repo.desc"))
- cgit_repo->desc = xstrdup(value);
- else if (cgit_repo && !strcmp(name, "repo.owner"))
- cgit_repo->owner = xstrdup(value);
- else if (cgit_repo && !strcmp(name, "repo.defbranch"))
- cgit_repo->defbranch = xstrdup(value);
- else if (cgit_repo && !strcmp(name, "repo.snapshots"))
- cgit_repo->snapshots = ctx.cfg.snapshots & cgit_parse_snapshots_mask(value); /* XXX: &? */
- else if (cgit_repo && !strcmp(name, "repo.enable-log-filecount"))
- cgit_repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value);
- else if (cgit_repo && !strcmp(name, "repo.enable-log-linecount"))
- cgit_repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value);
- else if (cgit_repo && !strcmp(name, "repo.module-link"))
- cgit_repo->module_link= xstrdup(value);
- else if (cgit_repo && !strcmp(name, "repo.readme") && value != NULL) {
+ ctx.repo->name = xstrdup(value);
+ else if (ctx.repo && !strcmp(name, "repo.path"))
+ ctx.repo->path = trim_end(value, '/');
+ else if (ctx.repo && !strcmp(name, "repo.clone-url"))
+ ctx.repo->clone_url = xstrdup(value);
+ else if (ctx.repo && !strcmp(name, "repo.desc"))
+ ctx.repo->desc = xstrdup(value);
+ else if (ctx.repo && !strcmp(name, "repo.owner"))
+ ctx.repo->owner = xstrdup(value);
+ else if (ctx.repo && !strcmp(name, "repo.defbranch"))
+ ctx.repo->defbranch = xstrdup(value);
+ else if (ctx.repo && !strcmp(name, "repo.snapshots"))
+ ctx.repo->snapshots = ctx.cfg.snapshots & cgit_parse_snapshots_mask(value); /* XXX: &? */
+ else if (ctx.repo && !strcmp(name, "repo.enable-log-filecount"))
+ ctx.repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value);
+ else if (ctx.repo && !strcmp(name, "repo.enable-log-linecount"))
+ ctx.repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value);
+ else if (ctx.repo && !strcmp(name, "repo.module-link"))
+ ctx.repo->module_link= xstrdup(value);
+ else if (ctx.repo && !strcmp(name, "repo.readme") && value != NULL) {
if (*value == '/')
- cgit_repo->readme = xstrdup(value);
+ ctx.repo->readme = xstrdup(value);
else
- cgit_repo->readme = xstrdup(fmt("%s/%s", cgit_repo->path, value));
+ ctx.repo->readme = xstrdup(fmt("%s/%s", ctx.repo->path, value));
} else if (!strcmp(name, "include"))
cgit_read_config(value, cgit_global_config_cb);
}
@@ -213,7 +212,7 @@ void cgit_querystring_cb(const char *name, const char *value)
{
if (!strcmp(name,"r")) {
ctx.qry.repo = xstrdup(value);
- cgit_repo = cgit_get_repoinfo(value);
+ ctx.repo = cgit_get_repoinfo(value);
} else if (!strcmp(name, "p")) {
ctx.qry.page = xstrdup(value);
cgit_cmd = cgit_get_cmd_index(value);
diff --git a/ui-commit.c b/ui-commit.c
index 3b0919b..25721ca 100644
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -194,10 +194,10 @@ void cgit_print_commit(char *hex)
sha1_to_hex(p->item->object.sha1), NULL);
html(")</td></tr>");
}
- if (cgit_repo->snapshots) {
+ if (ctx.repo->snapshots) {
html("<tr><th>download</th><td colspan='2' class='sha1'>");
cgit_print_snapshot_links(ctx.qry.repo, ctx.qry.head,
- hex, cgit_repo->snapshots);
+ hex, ctx.repo->snapshots);
html("</td></tr>");
}
html("</table>\n");
diff --git a/ui-log.c b/ui-log.c
index a39474b..72e2a4b 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -25,7 +25,7 @@ void count_lines(char *line, int size)
void inspect_files(struct diff_filepair *pair)
{
files++;
- if (cgit_repo->enable_log_linecount)
+ if (ctx.repo->enable_log_linecount)
cgit_diff_files(pair->one->sha1, pair->two->sha1, count_lines);
}
@@ -39,14 +39,14 @@ void print_commit(struct commit *commit)
html("</td><td>");
cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head,
sha1_to_hex(commit->object.sha1));
- if (cgit_repo->enable_log_filecount) {
+ if (ctx.repo->enable_log_filecount) {
files = 0;
add_lines = 0;
rem_lines = 0;
cgit_diff_commit(commit, inspect_files);
html("</td><td class='right'>");
htmlf("%d", files);
- if (cgit_repo->enable_log_linecount) {
+ if (ctx.repo->enable_log_linecount) {
html("</td><td class='right'>");
htmlf("-%d/+%d", rem_lines, add_lines);
}
@@ -94,9 +94,9 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
html("<tr class='nohover'><th class='left'>Age</th>"
"<th class='left'>Message</th>");
- if (cgit_repo->enable_log_filecount) {
+ if (ctx.repo->enable_log_filecount) {
html("<th class='right'>Files</th>");
- if (cgit_repo->enable_log_linecount)
+ if (ctx.repo->enable_log_linecount)
html("<th class='right'>Lines</th>");
}
html("<th class='left'>Author</th></tr>\n");
diff --git a/ui-repolist.c b/ui-repolist.c
index a6cc2cc..5fde174 100644
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -25,7 +25,7 @@ time_t read_agefile(char *path)
return 0;
}
-static void print_modtime(struct repoinfo *repo)
+static void print_modtime(struct cgit_repo *repo)
{
char *path;
struct stat s;
@@ -70,32 +70,32 @@ void cgit_print_repolist(struct cacheitem *item)
html("</tr>\n");
for (i=0; i<cgit_repolist.count; i++) {
- cgit_repo = &cgit_repolist.repos[i];
- if ((last_group == NULL && cgit_repo->group != NULL) ||
- (last_group != NULL && cgit_repo->group == NULL) ||
- (last_group != NULL && cgit_repo->group != NULL &&
- strcmp(cgit_repo->group, last_group))) {
+ ctx.repo = &cgit_repolist.repos[i];
+ if ((last_group == NULL && ctx.repo->group != NULL) ||
+ (last_group != NULL && ctx.repo->group == NULL) ||
+ (last_group != NULL && ctx.repo->group != NULL &&
+ strcmp(ctx.repo->group, last_group))) {
htmlf("<tr class='nohover'><td colspan='%d' class='repogroup'>",
columns);
- html_txt(cgit_repo->group);
+ html_txt(ctx.repo->group);
html("</td></tr>");
- last_group = cgit_repo->group;
+ last_group = ctx.repo->group;
}
htmlf("<tr><td class='%s'>",
- cgit_repo->group ? "sublevel-repo" : "toplevel-repo");
- html_link_open(cgit_repourl(cgit_repo->url), NULL, NULL);
- html_txt(cgit_repo->name);
+ ctx.repo->group ? "sublevel-repo" : "toplevel-repo");
+ html_link_open(cgit_repourl(ctx.repo->url), NULL, NULL);
+ html_txt(ctx.repo->name);
html_link_close();
html("</td><td>");
- html_ntxt(ctx.cfg.max_repodesc_len, cgit_repo->desc);
+ html_ntxt(ctx.cfg.max_repodesc_len, ctx.repo->desc);
html("</td><td>");
- html_txt(cgit_repo->owner);
+ html_txt(ctx.repo->owner);
html("</td><td>");
- print_modtime(cgit_repo);
+ print_modtime(ctx.repo);
html("</td>");
if (ctx.cfg.enable_index_links) {
html("<td>");
- html_link_open(cgit_repourl(cgit_repo->url),
+ html_link_open(cgit_repourl(ctx.repo->url),
NULL, "button");
html("summary</a>");
cgit_log_link("log", NULL, "button", NULL, NULL, NULL,
diff --git a/ui-shared.c b/ui-shared.c
index b96237d..b9f487a 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -141,8 +141,8 @@ static char *repolink(char *title, char *class, char *page, char *head,
html_attr(ctx.cfg.virtual_root);
if (ctx.cfg.virtual_root[strlen(ctx.cfg.virtual_root) - 1] != '/')
html("/");
- html_attr(cgit_repo->url);
- if (cgit_repo->url[strlen(cgit_repo->url) - 1] != '/')
+ html_attr(ctx.repo->url);
+ if (ctx.repo->url[strlen(ctx.repo->url) - 1] != '/')
html("/");
if (page) {
html(page);
@@ -153,8 +153,8 @@ static char *repolink(char *title, char *class, char *page, char *head,
} else {
html(ctx.cfg.script_name);
html("?url=");
- html_attr(cgit_repo->url);
- if (cgit_repo->url[strlen(cgit_repo->url) - 1] != '/')
+ html_attr(ctx.repo->url);
+ if (ctx.repo->url[strlen(ctx.repo->url) - 1] != '/')
html("/");
if (page) {
html(page);
@@ -164,7 +164,7 @@ static char *repolink(char *title, char *class, char *page, char *head,
}
delim = "&amp;";
}
- if (head && strcmp(head, cgit_repo->defbranch)) {
+ if (head && strcmp(head, ctx.repo->defbranch)) {
html(delim);
html("h=");
html_attr(head);
@@ -446,7 +446,7 @@ void add_hidden_formfields(int incl_head, int incl_search, char *page)
html_hidden("url", url);
}
- if (incl_head && strcmp(ctx.qry.head, cgit_repo->defbranch))
+ if (incl_head && strcmp(ctx.qry.head, ctx.repo->defbranch))
html_hidden("h", ctx.qry.head);
if (ctx.qry.sha1)
@@ -478,12 +478,12 @@ void cgit_print_pageheader(char *title, int show_search)
html("</td></tr>\n<tr><td class='sidebar'>\n");
if (ctx.qry.repo) {
html("<h1 class='first'>");
- html_txt(strrpart(cgit_repo->name, 20));
+ html_txt(strrpart(ctx.repo->name, 20));
html("</h1>\n");
- html_txt(cgit_repo->desc);
- if (cgit_repo->owner) {
+ html_txt(ctx.repo->desc);
+ if (ctx.repo->owner) {
html("<h1>owner</h1>\n");
- html_txt(cgit_repo->owner);
+ html_txt(ctx.repo->owner);
}
html("<h1>navigate</h1>\n");
reporevlink(NULL, "summary", NULL, "menu", ctx.qry.head,
@@ -501,13 +501,13 @@ void cgit_print_pageheader(char *title, int show_search)
for_each_ref(print_archive_ref, &header);
- if (cgit_repo->clone_url || ctx.cfg.clone_prefix) {
+ if (ctx.repo->clone_url || ctx.cfg.clone_prefix) {
html("<h1>clone</h1>\n");
- if (cgit_repo->clone_url)
- url = cgit_repo->clone_url;
+ if (ctx.repo->clone_url)
+ url = ctx.repo->clone_url;
else
url = fmt("%s%s", ctx.cfg.clone_prefix,
- cgit_repo->url);
+ ctx.repo->url);
html("<a class='menu' href='");
html_attr(url);
html("' title='");
diff --git a/ui-summary.c b/ui-summary.c
index 0a44994..3baac08 100644
--- a/ui-summary.c
+++ b/ui-summary.c
@@ -182,9 +182,9 @@ void cgit_print_tags(int maxcount)
void cgit_print_summary()
{
- if (cgit_repo->readme) {
+ if (ctx.repo->readme) {
html("<div id='summary'>");
- html_include(cgit_repo->readme);
+ html_include(ctx.repo->readme);
html("</div>");
}
if (ctx.cfg.summary_log > 0)
diff --git a/ui-tree.c b/ui-tree.c
index 7cae85a..df05ad3 100644
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -83,7 +83,7 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen,
html("</td><td>");
if (S_ISGITLINK(mode)) {
htmlf("<a class='ls-mod' href='");
- html_attr(fmt(cgit_repo->module_link,
+ html_attr(fmt(ctx.repo->module_link,
name,
sha1_to_hex(sha1)));
html("'>");
generated by cgit v1.2.3-18-g5258 (git 2.32.0) at 2024-11-04 21:35:29 +0000