Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.zx2c4.com/cgit.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/cgit.c
diff options
context:
space:
mode:
Diffstat (limited to 'cgit.c')
-rw-r--r--cgit.c137
1 files changed, 69 insertions, 68 deletions
diff --git a/cgit.c b/cgit.c
index e616292..ca318e8 100644
--- a/cgit.c
+++ b/cgit.c
@@ -6,6 +6,8 @@
* (see COPYING for full license text)
*/
+#define USE_THE_REPOSITORY_VARIABLE
+
#include "cgit.h"
#include "cache.h"
#include "cmd.h"
@@ -39,31 +41,33 @@ static void add_mimetype(const char *name, const char *value)
static void process_cached_repolist(const char *path);
-static void repo_config(struct cgit_repo *repo, const char *name, const char *value)
+void cgit_repo_config(struct cgit_repo *repo, const char *name, const char *value)
{
const char *path;
struct string_list_item *item;
if (!strcmp(name, "name"))
- repo->name = xstrdup(value);
+ repo->name = strdup_first_line(value);
else if (!strcmp(name, "clone-url"))
- repo->clone_url = xstrdup(value);
+ repo->clone_url = strdup_first_line(value);
else if (!strcmp(name, "desc"))
- repo->desc = xstrdup(value);
+ repo->desc = strdup_first_line(value);
else if (!strcmp(name, "owner"))
- repo->owner = xstrdup(value);
+ repo->owner = strdup_first_line(value);
else if (!strcmp(name, "homepage"))
- repo->homepage = xstrdup(value);
+ repo->homepage = strdup_first_line(value);
else if (!strcmp(name, "defbranch"))
- repo->defbranch = xstrdup(value);
+ repo->defbranch = strdup_first_line(value);
else if (!strcmp(name, "extra-head-content"))
- repo->extra_head_content = xstrdup(value);
+ repo->extra_head_content = strdup_first_line(value);
else if (!strcmp(name, "snapshots"))
repo->snapshots = ctx.cfg.snapshots & cgit_parse_snapshots_mask(value);
else if (!strcmp(name, "enable-blame"))
repo->enable_blame = atoi(value);
else if (!strcmp(name, "enable-commit-graph"))
repo->enable_commit_graph = atoi(value);
+ else if (!strcmp(name, "enable-follow-links"))
+ repo->enable_follow_links = atoi(value);
else if (!strcmp(name, "enable-log-filecount"))
repo->enable_log_filecount = atoi(value);
else if (!strcmp(name, "enable-log-linecount"))
@@ -87,22 +91,22 @@ static void repo_config(struct cgit_repo *repo, const char *name, const char *va
} else if (!strcmp(name, "max-stats"))
repo->max_stats = cgit_find_stats_period(value, NULL);
else if (!strcmp(name, "module-link"))
- repo->module_link= xstrdup(value);
+ repo->module_link= strdup_first_line(value);
else if (skip_prefix(name, "module-link.", &path)) {
- item = string_list_append(&repo->submodules, xstrdup(path));
- item->util = xstrdup(value);
+ item = string_list_append(&repo->submodules, strdup_first_line(path));
+ item->util = strdup_first_line(value);
} else if (!strcmp(name, "section"))
- repo->section = xstrdup(value);
+ repo->section = strdup_first_line(value);
else if (!strcmp(name, "snapshot-prefix"))
- repo->snapshot_prefix = xstrdup(value);
+ repo->snapshot_prefix = strdup_first_line(value);
else if (!strcmp(name, "readme") && value != NULL) {
if (repo->readme.items == ctx.cfg.readme.items)
memset(&repo->readme, 0, sizeof(repo->readme));
- string_list_append(&repo->readme, xstrdup(value));
+ string_list_append(&repo->readme, strdup_first_line(value));
} else if (!strcmp(name, "logo") && value != NULL)
- repo->logo = xstrdup(value);
+ repo->logo = strdup_first_line(value);
else if (!strcmp(name, "logo-link") && value != NULL)
- repo->logo_link = xstrdup(value);
+ repo->logo_link = strdup_first_line(value);
else if (!strcmp(name, "hide"))
repo->hide = atoi(value);
else if (!strcmp(name, "ignore"))
@@ -126,41 +130,41 @@ static void config_cb(const char *name, const char *value)
const char *arg;
if (!strcmp(name, "section"))
- ctx.cfg.section = xstrdup(value);
+ ctx.cfg.section = strdup_first_line(value);
else if (!strcmp(name, "repo.url"))
ctx.repo = cgit_add_repo(value);
else if (ctx.repo && !strcmp(name, "repo.path"))
ctx.repo->path = trim_end(value, '/');
else if (ctx.repo && skip_prefix(name, "repo.", &arg))
- repo_config(ctx.repo, arg, value);
+ cgit_repo_config(ctx.repo, arg, value);
else if (!strcmp(name, "readme"))
- string_list_append(&ctx.cfg.readme, xstrdup(value));
+ string_list_append(&ctx.cfg.readme, strdup_first_line(value));
else if (!strcmp(name, "root-title"))
- ctx.cfg.root_title = xstrdup(value);
+ ctx.cfg.root_title = strdup_first_line(value);
else if (!strcmp(name, "root-desc"))
- ctx.cfg.root_desc = xstrdup(value);
+ ctx.cfg.root_desc = strdup_first_line(value);
else if (!strcmp(name, "root-readme"))
- ctx.cfg.root_readme = xstrdup(value);
+ ctx.cfg.root_readme = strdup_first_line(value);
else if (!strcmp(name, "css"))
- string_list_append(&ctx.cfg.css, xstrdup(value));
+ string_list_append(&ctx.cfg.css, strdup_first_line(value));
else if (!strcmp(name, "js"))
- string_list_append(&ctx.cfg.js, xstrdup(value));
+ string_list_append(&ctx.cfg.js, strdup_first_line(value));
else if (!strcmp(name, "favicon"))
- ctx.cfg.favicon = xstrdup(value);
+ ctx.cfg.favicon = strdup_first_line(value);
else if (!strcmp(name, "footer"))
- ctx.cfg.footer = xstrdup(value);
+ ctx.cfg.footer = strdup_first_line(value);
else if (!strcmp(name, "head-include"))
- ctx.cfg.head_include = xstrdup(value);
+ ctx.cfg.head_include = strdup_first_line(value);
else if (!strcmp(name, "header"))
- ctx.cfg.header = xstrdup(value);
+ ctx.cfg.header = strdup_first_line(value);
else if (!strcmp(name, "logo"))
- ctx.cfg.logo = xstrdup(value);
+ ctx.cfg.logo = strdup_first_line(value);
else if (!strcmp(name, "logo-link"))
- ctx.cfg.logo_link = xstrdup(value);
+ ctx.cfg.logo_link = strdup_first_line(value);
else if (!strcmp(name, "module-link"))
- ctx.cfg.module_link = xstrdup(value);
+ ctx.cfg.module_link = strdup_first_line(value);
else if (!strcmp(name, "strict-export"))
- ctx.cfg.strict_export = xstrdup(value);
+ ctx.cfg.strict_export = strdup_first_line(value);
else if (!strcmp(name, "virtual-root"))
ctx.cfg.virtual_root = ensure_end(value, '/');
else if (!strcmp(name, "noplainemail"))
@@ -202,7 +206,7 @@ static void config_cb(const char *name, const char *value)
else if (!strcmp(name, "cache-size"))
ctx.cfg.cache_size = atoi(value);
else if (!strcmp(name, "cache-root"))
- ctx.cfg.cache_root = xstrdup(expand_macros(value));
+ ctx.cfg.cache_root = strdup_first_line(expand_macros(value));
else if (!strcmp(name, "cache-root-ttl"))
ctx.cfg.cache_root_ttl = atoi(value);
else if (!strcmp(name, "cache-repo-ttl"))
@@ -246,21 +250,21 @@ static void config_cb(const char *name, const char *value)
} else if (!strcmp(name, "max-commit-count"))
ctx.cfg.max_commit_count = atoi(value);
else if (!strcmp(name, "project-list"))
- ctx.cfg.project_list = xstrdup(expand_macros(value));
+ ctx.cfg.project_list = strdup_first_line(expand_macros(value));
else if (!strcmp(name, "scan-path"))
if (ctx.cfg.cache_size)
process_cached_repolist(expand_macros(value));
else if (ctx.cfg.project_list)
scan_projects(expand_macros(value),
- ctx.cfg.project_list, repo_config);
+ ctx.cfg.project_list);
else
- scan_tree(expand_macros(value), repo_config);
+ scan_tree(expand_macros(value));
else if (!strcmp(name, "scan-hidden-path"))
ctx.cfg.scan_hidden_path = atoi(value);
else if (!strcmp(name, "section-from-path"))
ctx.cfg.section_from_path = atoi(value);
else if (!strcmp(name, "repository-sort"))
- ctx.cfg.repository_sort = xstrdup(value);
+ ctx.cfg.repository_sort = strdup_first_line(value);
else if (!strcmp(name, "section-sort"))
ctx.cfg.section_sort = atoi(value);
else if (!strcmp(name, "source-filter"))
@@ -274,19 +278,19 @@ static void config_cb(const char *name, const char *value)
else if (!strcmp(name, "side-by-side-diffs"))
ctx.cfg.difftype = atoi(value) ? DIFF_SSDIFF : DIFF_UNIFIED;
else if (!strcmp(name, "agefile"))
- ctx.cfg.agefile = xstrdup(value);
+ ctx.cfg.agefile = strdup_first_line(value);
else if (!strcmp(name, "mimetype-file"))
- ctx.cfg.mimetype_file = xstrdup(value);
+ ctx.cfg.mimetype_file = strdup_first_line(value);
else if (!strcmp(name, "renamelimit"))
ctx.cfg.renamelimit = atoi(value);
else if (!strcmp(name, "remove-suffix"))
ctx.cfg.remove_suffix = atoi(value);
else if (!strcmp(name, "robots"))
- ctx.cfg.robots = xstrdup(value);
+ ctx.cfg.robots = strdup_first_line(value);
else if (!strcmp(name, "clone-prefix"))
- ctx.cfg.clone_prefix = xstrdup(value);
+ ctx.cfg.clone_prefix = strdup_first_line(value);
else if (!strcmp(name, "clone-url"))
- ctx.cfg.clone_url = xstrdup(value);
+ ctx.cfg.clone_url = strdup_first_line(value);
else if (!strcmp(name, "local-time"))
ctx.cfg.local_time = atoi(value);
else if (!strcmp(name, "commit-sort")) {
@@ -446,16 +450,15 @@ struct refmatch {
int match;
};
-static int find_current_ref(const char *refname, const struct object_id *oid,
- int flags, void *cb_data)
+static int find_current_ref(const struct reference *ref, void *cb_data)
{
struct refmatch *info;
info = (struct refmatch *)cb_data;
- if (!strcmp(refname, info->req_ref))
+ if (!strcmp(ref->name, info->req_ref))
info->match = 1;
if (!info->first_ref)
- info->first_ref = xstrdup(refname);
+ info->first_ref = xstrdup(ref->name);
return info->match;
}
@@ -473,7 +476,8 @@ static char *find_default_branch(struct cgit_repo *repo)
info.req_ref = repo->defbranch;
info.first_ref = NULL;
info.match = 0;
- for_each_branch_ref(find_current_ref, &info);
+ refs_for_each_branch_ref(get_main_ref_store(the_repository),
+ find_current_ref, &info);
if (info.match)
ref = info.req_ref;
else
@@ -490,7 +494,8 @@ static char *guess_defbranch(void)
const char *ref, *refname;
struct object_id oid;
- ref = resolve_ref_unsafe("HEAD", 0, &oid, NULL);
+ ref = refs_resolve_ref_unsafe(get_main_ref_store(the_repository),
+ "HEAD", 0, &oid, NULL);
if (!ref || !skip_prefix(ref, "refs/heads/", &refname))
return "master";
return xstrdup(refname);
@@ -781,15 +786,6 @@ static char *build_snapshot_setting(int bitmap)
return strbuf_detach(&result, NULL);
}
-static char *get_first_line(char *txt)
-{
- char *t = xstrdup(txt);
- char *p = strchr(t, '\n');
- if (p)
- *p = '\0';
- return t;
-}
-
static void print_repo(FILE *f, struct cgit_repo *repo)
{
struct string_list_item *item;
@@ -798,11 +794,8 @@ static void print_repo(FILE *f, struct cgit_repo *repo)
fprintf(f, "repo.path=%s\n", repo->path);
if (repo->owner)
fprintf(f, "repo.owner=%s\n", repo->owner);
- if (repo->desc) {
- char *tmp = get_first_line(repo->desc);
- fprintf(f, "repo.desc=%s\n", tmp);
- free(tmp);
- }
+ if (repo->desc)
+ fprintf(f, "repo.desc=%s\n", repo->desc);
for_each_string_list_item(item, &repo->readme) {
if (item->util)
fprintf(f, "repo.readme=%s:%s\n", (char *)item->util, item->string);
@@ -825,6 +818,8 @@ static void print_repo(FILE *f, struct cgit_repo *repo)
repo->enable_blame);
fprintf(f, "repo.enable-commit-graph=%d\n",
repo->enable_commit_graph);
+ fprintf(f, "repo.enable-follow-links=%d\n",
+ repo->enable_follow_links);
fprintf(f, "repo.enable-log-filecount=%d\n",
repo->enable_log_filecount);
fprintf(f, "repo.enable-log-linecount=%d\n",
@@ -901,9 +896,9 @@ static int generate_cached_repolist(const char *path, const char *cached_rc)
}
idx = cgit_repolist.count;
if (ctx.cfg.project_list)
- scan_projects(path, ctx.cfg.project_list, repo_config);
+ scan_projects(path, ctx.cfg.project_list);
else
- scan_tree(path, repo_config);
+ scan_tree(path);
print_repolist(f, &cgit_repolist, idx);
if (rename(locked_rc.buf, cached_rc))
fprintf(stderr, "[cgit] Error renaming %s to %s: %s (%d)\n",
@@ -933,10 +928,9 @@ static void process_cached_repolist(const char *path)
*/
if (generate_cached_repolist(path, cached_rc.buf)) {
if (ctx.cfg.project_list)
- scan_projects(path, ctx.cfg.project_list,
- repo_config);
+ scan_projects(path, ctx.cfg.project_list);
else
- scan_tree(path, repo_config);
+ scan_tree(path);
}
goto out;
}
@@ -1017,7 +1011,7 @@ static void cgit_parse_args(int argc, const char **argv)
*/
ctx.cfg.snapshots = 0xFF;
scan++;
- scan_tree(arg, repo_config);
+ scan_tree(arg);
}
}
if (scan) {
@@ -1051,6 +1045,12 @@ static int calc_ttl(void)
return ctx.cfg.cache_repo_ttl;
}
+static NORETURN void cgit_die_routine(const char *msg, va_list params)
+{
+ cgit_vprint_error_page(400, "Bad request", msg, params);
+ exit(0);
+}
+
int cmd_main(int argc, const char **argv)
{
const char *path;
@@ -1058,6 +1058,7 @@ int cmd_main(int argc, const char **argv)
cgit_init_filters();
atexit(cgit_cleanup_filters);
+ set_die_routine(cgit_die_routine);
prepare_context();
cgit_repolist.length = 0;
generated by cgit v1.2.3 (git 2.25.1) at 2026-06-15 18:41:57 +0300