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
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile13
-rw-r--r--cache.c2
-rw-r--r--cgit.c137
-rw-r--r--cgit.css10
-rw-r--r--cgit.h16
-rw-r--r--cgitrc.5.txt4
-rw-r--r--filter.c6
m---------git0
-rw-r--r--parsing.c12
-rw-r--r--scan-tree.c43
-rw-r--r--scan-tree.h4
-rw-r--r--shared.c29
-rw-r--r--ui-atom.c2
-rw-r--r--ui-blame.c8
-rw-r--r--ui-blob.c16
-rw-r--r--ui-clone.c54
-rw-r--r--ui-commit.c2
-rw-r--r--ui-diff.c6
-rw-r--r--ui-log.c8
-rw-r--r--ui-patch.c4
-rw-r--r--ui-plain.c8
-rw-r--r--ui-refs.c11
-rw-r--r--ui-repolist.c2
-rw-r--r--ui-shared.c26
-rw-r--r--ui-shared.h1
-rw-r--r--ui-snapshot.c4
-rw-r--r--ui-stats.c2
-rw-r--r--ui-tag.c4
-rw-r--r--ui-tree.c10
29 files changed, 269 insertions, 175 deletions
diff --git a/Makefile b/Makefile
index 1eb64ea..9d39bf4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
all::
-CGIT_VERSION = v1.2.3
+CGIT_VERSION = v1.3.1
CGIT_SCRIPT_NAME = cgit.cgi
CGIT_SCRIPT_PATH = /var/www/htdocs/cgit
CGIT_DATA_PATH = $(CGIT_SCRIPT_PATH)
@@ -14,7 +14,7 @@ htmldir = $(docdir)
pdfdir = $(docdir)
mandir = $(prefix)/share/man
SHA1_HEADER = <openssl/sha.h>
-GIT_VER = 2.45.2
+GIT_VER = 2.54.0
GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.xz
INSTALL = install
COPYTREE = cp -r
@@ -108,11 +108,20 @@ install-pdf: doc-pdf
$(INSTALL) -m 0755 -d $(DESTDIR)$(pdfdir)
$(INSTALL) -m 0644 $(DOC_PDF) $(DESTDIR)$(pdfdir)
+define rm_f
+rm -f $(1)
+
+endef
+
uninstall:
rm -f $(DESTDIR)$(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME)
rm -f $(DESTDIR)$(CGIT_DATA_PATH)/cgit.css
+ rm -f $(DESTDIR)$(CGIT_DATA_PATH)/cgit.js
rm -f $(DESTDIR)$(CGIT_DATA_PATH)/cgit.png
rm -f $(DESTDIR)$(CGIT_DATA_PATH)/favicon.ico
+ rm -f $(DESTDIR)$(CGIT_DATA_PATH)/robots.txt
+ $(foreach file,$(patsubst filters/%,%,$(shell find filters/ ! -type d)), \
+ $(call rm_f,$(DESTDIR)$(filterdir)/$(file)))
uninstall-doc: uninstall-man uninstall-html uninstall-pdf
diff --git a/cache.c b/cache.c
index 1c843ba..e70af13 100644
--- a/cache.c
+++ b/cache.c
@@ -185,6 +185,8 @@ static int lock_slot(struct cache_slot *slot)
slot->lock_fd = -1;
return saved_errno;
}
+ if (ftruncate(slot->lock_fd, 0) < 0)
+ return errno;
if (xwrite(slot->lock_fd, slot->key, slot->keylen + 1) < 0)
return errno;
return 0;
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;
diff --git a/cgit.css b/cgit.css
index 1b848cf..d10a24d 100644
--- a/cgit.css
+++ b/cgit.css
@@ -330,6 +330,11 @@ div#cgit table.ssdiff td.lineno a:hover {
color: black;
}
+div#cgit table.blob td.linenumbers a:target:before {
+ color: red;
+ content: "\2BA9";
+}
+
div#cgit table.blame td.hashes,
div#cgit table.blame td.lines,
div#cgit table.blame td.linenumbers {
@@ -679,6 +684,7 @@ div#cgit a.branch-deco {
padding: 0px 0.25em;
background-color: #88ff88;
border: solid 1px #007700;
+ border-radius: 2px;
}
div#cgit a.tag-deco {
@@ -687,6 +693,7 @@ div#cgit a.tag-deco {
padding: 0px 0.25em;
background-color: #ffff88;
border: solid 1px #777700;
+ border-radius: 2px;
}
div#cgit a.tag-annotated-deco {
@@ -695,6 +702,7 @@ div#cgit a.tag-annotated-deco {
padding: 0px 0.25em;
background-color: #ffcc88;
border: solid 1px #777700;
+ border-radius: 2px;
}
div#cgit a.remote-deco {
@@ -703,6 +711,7 @@ div#cgit a.remote-deco {
padding: 0px 0.25em;
background-color: #ccccff;
border: solid 1px #000077;
+ border-radius: 2px;
}
div#cgit a.deco {
@@ -711,6 +720,7 @@ div#cgit a.deco {
padding: 0px 0.25em;
background-color: #ff8888;
border: solid 1px #770000;
+ border-radius: 2px;
}
div#cgit div.commit-subject a.branch-deco,
diff --git a/cgit.h b/cgit.h
index e0d286d..7d7ece7 100644
--- a/cgit.h
+++ b/cgit.h
@@ -17,7 +17,7 @@
#include <notes.h>
#include <object.h>
#include <object-name.h>
-#include <object-store.h>
+#include <odb.h>
#include <path.h>
#include <refs.h>
#include <revision.h>
@@ -101,6 +101,7 @@ struct cgit_repo {
int snapshots;
int enable_blame;
int enable_commit_graph;
+ int enable_follow_links;
int enable_log_filecount;
int enable_log_linecount;
int enable_remote_branches;
@@ -120,9 +121,6 @@ struct cgit_repo {
int ignore;
};
-typedef void (*repo_config_fn)(struct cgit_repo *repo, const char *name,
- const char *value);
-
struct cgit_repolist {
int length;
int count;
@@ -333,7 +331,8 @@ extern const struct cgit_snapshot_format cgit_snapshot_formats[];
extern char *cgit_default_repo_desc;
extern struct cgit_repo *cgit_add_repo(const char *url);
extern struct cgit_repo *cgit_get_repoinfo(const char *url);
-extern void cgit_repo_config_cb(const char *name, const char *value);
+extern void cgit_repo_config(struct cgit_repo *repo, const char *name,
+ const char *value);
extern int chk_zero(int result, char *msg);
extern int chk_positive(int result, char *msg);
@@ -346,8 +345,7 @@ extern void strbuf_ensure_end(struct strbuf *sb, char c);
extern void cgit_add_ref(struct reflist *list, struct refinfo *ref);
extern void cgit_free_reflist_inner(struct reflist *list);
-extern int cgit_refs_cb(const char *refname, const struct object_id *oid,
- int flags, void *cb_data);
+extern int cgit_refs_cb(const struct reference *ref, void *cb_data);
extern void cgit_free_commitinfo(struct commitinfo *info);
extern void cgit_free_taginfo(struct taginfo *info);
@@ -395,7 +393,9 @@ extern void cgit_init_filters(void);
extern void cgit_prepare_repo_env(struct cgit_repo * repo);
-extern int readfile(const char *path, char **buf, size_t *size);
+extern int read_first_line(const char *path, char **buf, size_t *size);
+
+extern char *strdup_first_line(const char *txt);
extern char *expand_macros(const char *txt);
diff --git a/cgitrc.5.txt b/cgitrc.5.txt
index 6f3e952..7c39bf9 100644
--- a/cgitrc.5.txt
+++ b/cgitrc.5.txt
@@ -503,6 +503,10 @@ repo.enable-commit-graph::
A flag which can be used to disable the global setting
`enable-commit-graph'. Default value: none.
+repo.enable-follow-links::
+ A flag which can be used to disable the global setting
+ `enable-follow-links'. Default value: none.
+
repo.enable-html-serving::
A flag which can be used to override the global setting
`enable-html-serving`. Default value: none.
diff --git a/filter.c b/filter.c
index 22b4970..c778d05 100644
--- a/filter.c
+++ b/filter.c
@@ -114,7 +114,7 @@ static struct cgit_filter *new_exec_filter(const char *cmd, int argument_count)
f = xmalloc(sizeof(*f));
/* We leave argv for now and assign it below. */
- cgit_exec_filter_init(f, xstrdup(cmd), NULL);
+ cgit_exec_filter_init(f, strdup_first_line(cmd), NULL);
f->base.argument_count = argument_count;
args_size = (2 + argument_count) * sizeof(char *);
f->argv = xmalloc(args_size);
@@ -356,7 +356,7 @@ static struct cgit_filter *new_lua_filter(const char *cmd, int argument_count)
filter->base.fprintfp = fprintf_lua_filter;
filter->base.cleanup = cleanup_lua_filter;
filter->base.argument_count = argument_count;
- filter->script_file = xstrdup(cmd);
+ filter->script_file = strdup_first_line(cmd);
return &filter->base;
}
@@ -402,7 +402,7 @@ static const struct {
struct cgit_filter *cgit_new_filter(const char *cmd, filter_type filtertype)
{
- char *colon;
+ const char *colon;
int i;
size_t len;
int argument_count;
diff --git a/git b/git
-Subproject bea9ecd24b0c3bf06cab4a851694fe09e7e5140
+Subproject 94f057755b7941b321fd11fec1b2e3ca5313a4e
diff --git a/parsing.c b/parsing.c
index dc44ffd..bdaed25 100644
--- a/parsing.c
+++ b/parsing.c
@@ -6,6 +6,8 @@
* (see COPYING for full license text)
*/
+#define USE_THE_REPOSITORY_VARIABLE
+
#include "cgit.h"
/*
@@ -17,7 +19,7 @@
*/
void cgit_parse_url(const char *url)
{
- char *c, *cmd, *p;
+ char *c, *cmd, *p, *buf;
struct cgit_repo *repo;
if (!url || url[0] == '\0')
@@ -30,11 +32,12 @@ void cgit_parse_url(const char *url)
return;
}
+ buf = xstrdup(url);
cmd = NULL;
- c = strchr(url, '/');
+ c = strchr(buf, '/');
while (c) {
c[0] = '\0';
- repo = cgit_get_repoinfo(url);
+ repo = cgit_get_repoinfo(buf);
if (repo) {
ctx.repo = repo;
cmd = c;
@@ -54,6 +57,7 @@ void cgit_parse_url(const char *url)
if (cmd[1])
ctx.qry.page = xstrdup(cmd + 1);
}
+ free(buf);
}
static char *substr(const char *head, const char *tail)
@@ -198,7 +202,7 @@ struct taginfo *cgit_parse_tag(struct tag *tag)
const char *p;
struct taginfo *ret = NULL;
- data = repo_read_object_file(the_repository, &tag->object.oid, &type, &size);
+ data = odb_read_object(the_repository->objects, &tag->object.oid, &type, &size);
if (!data || type != OBJ_TAG)
goto cleanup;
diff --git a/scan-tree.c b/scan-tree.c
index 84da86e..c120efe 100644
--- a/scan-tree.c
+++ b/scan-tree.c
@@ -47,27 +47,27 @@ out:
}
static struct cgit_repo *repo;
-static repo_config_fn config_fn;
static void scan_tree_repo_config(const char *name, const char *value)
{
- config_fn(repo, name, value);
+ cgit_repo_config(repo, name, value);
}
-static int gitconfig_config(const char *key, const char *value, const struct config_context *, void *cb)
+static int gitconfig_config(const char *key, const char *value,
+ const __attribute__((unused)) struct config_context *ctx, void *cb)
{
const char *name;
if (!strcmp(key, "gitweb.owner"))
- config_fn(repo, "owner", value);
+ cgit_repo_config(repo, "owner", value);
else if (!strcmp(key, "gitweb.description"))
- config_fn(repo, "desc", value);
+ cgit_repo_config(repo, "desc", value);
else if (!strcmp(key, "gitweb.category"))
- config_fn(repo, "section", value);
+ cgit_repo_config(repo, "section", value);
else if (!strcmp(key, "gitweb.homepage"))
- config_fn(repo, "homepage", value);
+ cgit_repo_config(repo, "homepage", value);
else if (skip_prefix(key, "cgit.", &name))
- config_fn(repo, name, value);
+ cgit_repo_config(repo, name, value);
return 0;
}
@@ -79,7 +79,7 @@ static char *xstrrchr(char *s, char *from, int c)
return from < s ? NULL : from;
}
-static void add_repo(const char *base, struct strbuf *path, repo_config_fn fn)
+static void add_repo(const char *base, struct strbuf *path)
{
struct stat st;
struct passwd *pwd;
@@ -121,7 +121,6 @@ static void add_repo(const char *base, struct strbuf *path, repo_config_fn fn)
strbuf_setlen(&rel, rel.len - 1);
repo = cgit_add_repo(rel.buf);
- config_fn = fn;
if (ctx.cfg.enable_git_config) {
strbuf_addstr(path, "config");
git_config_from_file(gitconfig_config, path->buf, NULL);
@@ -134,7 +133,7 @@ static void add_repo(const char *base, struct strbuf *path, repo_config_fn fn)
strip_suffix_mem(repo->url, &urllen, "/");
repo->url[urllen] = '\0';
}
- repo->path = xstrdup(path->buf);
+ repo->path = strdup_first_line(path->buf);
while (!repo->owner) {
if ((pwd = getpwuid(st.st_uid)) == NULL) {
fprintf(stderr, "Error reading owner-info for %s: %s (%d)\n",
@@ -144,13 +143,13 @@ static void add_repo(const char *base, struct strbuf *path, repo_config_fn fn)
if (pwd->pw_gecos)
if ((p = strchr(pwd->pw_gecos, ',')))
*p = '\0';
- repo->owner = xstrdup(pwd->pw_gecos ? pwd->pw_gecos : pwd->pw_name);
+ repo->owner = strdup_first_line(pwd->pw_gecos ? pwd->pw_gecos : pwd->pw_name);
}
if (repo->desc == cgit_default_repo_desc || !repo->desc) {
strbuf_addstr(path, "description");
if (!stat(path->buf, &st))
- readfile(path->buf, &repo->desc, &size);
+ read_first_line(path->buf, &repo->desc, &size);
strbuf_setlen(path, pathlen);
}
@@ -167,7 +166,7 @@ static void add_repo(const char *base, struct strbuf *path, repo_config_fn fn)
}
if (slash && !n) {
*slash = '\0';
- repo->section = xstrdup(rel.buf);
+ repo->section = strdup_first_line(rel.buf);
*slash = '/';
if (starts_with(repo->name, repo->section)) {
repo->name += strlen(repo->section);
@@ -184,7 +183,7 @@ static void add_repo(const char *base, struct strbuf *path, repo_config_fn fn)
strbuf_release(&rel);
}
-static void scan_path(const char *base, const char *path, repo_config_fn fn)
+static void scan_path(const char *base, const char *path)
{
DIR *dir = opendir(path);
struct dirent *ent;
@@ -200,12 +199,12 @@ static void scan_path(const char *base, const char *path, repo_config_fn fn)
strbuf_add(&pathbuf, path, strlen(path));
if (is_git_dir(pathbuf.buf)) {
- add_repo(base, &pathbuf, fn);
+ add_repo(base, &pathbuf);
goto end;
}
strbuf_addstr(&pathbuf, "/.git");
if (is_git_dir(pathbuf.buf)) {
- add_repo(base, &pathbuf, fn);
+ add_repo(base, &pathbuf);
goto end;
}
/*
@@ -230,14 +229,14 @@ static void scan_path(const char *base, const char *path, repo_config_fn fn)
continue;
}
if (S_ISDIR(st.st_mode))
- scan_path(base, pathbuf.buf, fn);
+ scan_path(base, pathbuf.buf);
}
end:
strbuf_release(&pathbuf);
closedir(dir);
}
-void scan_projects(const char *path, const char *projectsfile, repo_config_fn fn)
+void scan_projects(const char *path, const char *projectsfile)
{
struct strbuf line = STRBUF_INIT;
FILE *projects;
@@ -254,7 +253,7 @@ void scan_projects(const char *path, const char *projectsfile, repo_config_fn fn
continue;
strbuf_insert(&line, 0, "/", 1);
strbuf_insert(&line, 0, path, strlen(path));
- scan_path(path, line.buf, fn);
+ scan_path(path, line.buf);
}
if ((err = ferror(projects))) {
fprintf(stderr, "Error reading from projectsfile %s: %s (%d)\n",
@@ -264,7 +263,7 @@ void scan_projects(const char *path, const char *projectsfile, repo_config_fn fn
strbuf_release(&line);
}
-void scan_tree(const char *path, repo_config_fn fn)
+void scan_tree(const char *path)
{
- scan_path(path, path, fn);
+ scan_path(path, path);
}
diff --git a/scan-tree.h b/scan-tree.h
index 1afbd4b..def0a7a 100644
--- a/scan-tree.h
+++ b/scan-tree.h
@@ -1,2 +1,2 @@
-extern void scan_projects(const char *path, const char *projectsfile, repo_config_fn fn);
-extern void scan_tree(const char *path, repo_config_fn fn);
+extern void scan_projects(const char *path, const char *projectsfile);
+extern void scan_tree(const char *path);
diff --git a/shared.c b/shared.c
index 26b6ddb..a39394d 100644
--- a/shared.c
+++ b/shared.c
@@ -6,6 +6,8 @@
* (see COPYING for full license text)
*/
+#define USE_THE_REPOSITORY_VARIABLE
+
#include "cgit.h"
struct cgit_repolist cgit_repolist;
@@ -50,6 +52,7 @@ struct cgit_repo *cgit_add_repo(const char *url)
ret = &cgit_repolist.repos[cgit_repolist.count-1];
memset(ret, 0, sizeof(struct cgit_repo));
ret->url = trim_end(url, '/');
+ *strchrnul(ret->url, '\n') = '\0';
ret->name = ret->url;
ret->path = NULL;
ret->desc = cgit_default_repo_desc;
@@ -60,6 +63,7 @@ struct cgit_repo *cgit_add_repo(const char *url)
ret->snapshots = ctx.cfg.snapshots;
ret->enable_blame = ctx.cfg.enable_blame;
ret->enable_commit_graph = ctx.cfg.enable_commit_graph;
+ ret->enable_follow_links = ctx.cfg.enable_follow_links;
ret->enable_log_filecount = ctx.cfg.enable_log_filecount;
ret->enable_log_linecount = ctx.cfg.enable_log_linecount;
ret->enable_remote_branches = ctx.cfg.enable_remote_branches;
@@ -210,11 +214,10 @@ void cgit_free_reflist_inner(struct reflist *list)
free(list->refs);
}
-int cgit_refs_cb(const char *refname, const struct object_id *oid, int flags,
- void *cb_data)
+int cgit_refs_cb(const struct reference *ref, void *cb_data)
{
struct reflist *list = (struct reflist *)cb_data;
- struct refinfo *info = cgit_mk_refinfo(refname, oid);
+ struct refinfo *info = cgit_mk_refinfo(ref->name, ref->oid);
if (info)
cgit_add_ref(list, info);
@@ -241,7 +244,7 @@ static int load_mmfile(mmfile_t *file, const struct object_id *oid)
file->ptr = (char *)"";
file->size = 0;
} else {
- file->ptr = repo_read_object_file(the_repository, oid, &type,
+ file->ptr = odb_read_object(the_repository->objects, oid, &type,
(unsigned long *)&file->size);
}
return 1;
@@ -393,7 +396,7 @@ int cgit_parse_snapshots_mask(const char *str)
if (strcmp(str, "all") == 0)
return INT_MAX;
- string_list_split(&tokens, str, ' ', -1);
+ string_list_split(&tokens, str, " ", -1);
string_list_remove_empty_items(&tokens, 0);

contacts: admin@thfree.ru

mirrors for living