|
diff --git a/cgit.c b/cgit.c index ccd61f4..2036ceb 100644 --- a/ cgit.c+++ b/ cgit.c |
|
@@ -44,48 +44,50 @@ void config_cb(const char *name, const char *value) |
44 | else if (!strcmp(name, "snapshots")) |
44 | else if (!strcmp(name, "snapshots")) |
45 | ctx.cfg.snapshots = cgit_parse_snapshots_mask(value); |
45 | ctx.cfg.snapshots = cgit_parse_snapshots_mask(value); |
46 | else if (!strcmp(name, "enable-index-links")) |
46 | else if (!strcmp(name, "enable-index-links")) |
47 | ctx.cfg.enable_index_links = atoi(value); |
47 | ctx.cfg.enable_index_links = atoi(value); |
48 | else if (!strcmp(name, "enable-log-filecount")) |
48 | else if (!strcmp(name, "enable-log-filecount")) |
49 | ctx.cfg.enable_log_filecount = atoi(value); |
49 | ctx.cfg.enable_log_filecount = atoi(value); |
50 | else if (!strcmp(name, "enable-log-linecount")) |
50 | else if (!strcmp(name, "enable-log-linecount")) |
51 | ctx.cfg.enable_log_linecount = atoi(value); |
51 | ctx.cfg.enable_log_linecount = atoi(value); |
52 | else if (!strcmp(name, "cache-size")) |
52 | else if (!strcmp(name, "cache-size")) |
53 | ctx.cfg.cache_size = atoi(value); |
53 | ctx.cfg.cache_size = atoi(value); |
54 | else if (!strcmp(name, "cache-root")) |
54 | else if (!strcmp(name, "cache-root")) |
55 | ctx.cfg.cache_root = xstrdup(value); |
55 | ctx.cfg.cache_root = xstrdup(value); |
56 | else if (!strcmp(name, "cache-root-ttl")) |
56 | else if (!strcmp(name, "cache-root-ttl")) |
57 | ctx.cfg.cache_root_ttl = atoi(value); |
57 | ctx.cfg.cache_root_ttl = atoi(value); |
58 | else if (!strcmp(name, "cache-repo-ttl")) |
58 | else if (!strcmp(name, "cache-repo-ttl")) |
59 | ctx.cfg.cache_repo_ttl = atoi(value); |
59 | ctx.cfg.cache_repo_ttl = atoi(value); |
60 | else if (!strcmp(name, "cache-static-ttl")) |
60 | else if (!strcmp(name, "cache-static-ttl")) |
61 | ctx.cfg.cache_static_ttl = atoi(value); |
61 | ctx.cfg.cache_static_ttl = atoi(value); |
62 | else if (!strcmp(name, "cache-dynamic-ttl")) |
62 | else if (!strcmp(name, "cache-dynamic-ttl")) |
63 | ctx.cfg.cache_dynamic_ttl = atoi(value); |
63 | ctx.cfg.cache_dynamic_ttl = atoi(value); |
64 | else if (!strcmp(name, "max-message-length")) |
64 | else if (!strcmp(name, "max-message-length")) |
65 | ctx.cfg.max_msg_len = atoi(value); |
65 | ctx.cfg.max_msg_len = atoi(value); |
66 | else if (!strcmp(name, "max-repodesc-length")) |
66 | else if (!strcmp(name, "max-repodesc-length")) |
67 | ctx.cfg.max_repodesc_len = atoi(value); |
67 | ctx.cfg.max_repodesc_len = atoi(value); |
| |
68 | else if (!strcmp(name, "max-repo-count")) |
| |
69 | ctx.cfg.max_repo_count = atoi(value); |
68 | else if (!strcmp(name, "max-commit-count")) |
70 | else if (!strcmp(name, "max-commit-count")) |
69 | ctx.cfg.max_commit_count = atoi(value); |
71 | ctx.cfg.max_commit_count = atoi(value); |
70 | else if (!strcmp(name, "summary-log")) |
72 | else if (!strcmp(name, "summary-log")) |
71 | ctx.cfg.summary_log = atoi(value); |
73 | ctx.cfg.summary_log = atoi(value); |
72 | else if (!strcmp(name, "summary-branches")) |
74 | else if (!strcmp(name, "summary-branches")) |
73 | ctx.cfg.summary_branches = atoi(value); |
75 | ctx.cfg.summary_branches = atoi(value); |
74 | else if (!strcmp(name, "summary-tags")) |
76 | else if (!strcmp(name, "summary-tags")) |
75 | ctx.cfg.summary_tags = atoi(value); |
77 | ctx.cfg.summary_tags = atoi(value); |
76 | else if (!strcmp(name, "agefile")) |
78 | else if (!strcmp(name, "agefile")) |
77 | ctx.cfg.agefile = xstrdup(value); |
79 | ctx.cfg.agefile = xstrdup(value); |
78 | else if (!strcmp(name, "renamelimit")) |
80 | else if (!strcmp(name, "renamelimit")) |
79 | ctx.cfg.renamelimit = atoi(value); |
81 | ctx.cfg.renamelimit = atoi(value); |
80 | else if (!strcmp(name, "robots")) |
82 | else if (!strcmp(name, "robots")) |
81 | ctx.cfg.robots = xstrdup(value); |
83 | ctx.cfg.robots = xstrdup(value); |
82 | else if (!strcmp(name, "clone-prefix")) |
84 | else if (!strcmp(name, "clone-prefix")) |
83 | ctx.cfg.clone_prefix = xstrdup(value); |
85 | ctx.cfg.clone_prefix = xstrdup(value); |
84 | else if (!strcmp(name, "repo.group")) |
86 | else if (!strcmp(name, "repo.group")) |
85 | ctx.cfg.repo_group = xstrdup(value); |
87 | ctx.cfg.repo_group = xstrdup(value); |
86 | else if (!strcmp(name, "repo.url")) |
88 | else if (!strcmp(name, "repo.url")) |
87 | ctx.repo = cgit_add_repo(value); |
89 | ctx.repo = cgit_add_repo(value); |
88 | else if (!strcmp(name, "repo.name")) |
90 | else if (!strcmp(name, "repo.name")) |
89 | ctx.repo->name = xstrdup(value); |
91 | ctx.repo->name = xstrdup(value); |
90 | else if (ctx.repo && !strcmp(name, "repo.path")) |
92 | else if (ctx.repo && !strcmp(name, "repo.path")) |
91 | ctx.repo->path = trim_end(value, '/'); |
93 | ctx.repo->path = trim_end(value, '/'); |
@@ -138,48 +140,49 @@ static void querystring_cb(const char *name, const char *value) |
138 | ctx.qry.has_sha1 = 1; |
140 | ctx.qry.has_sha1 = 1; |
139 | } else if (!strcmp(name, "ofs")) { |
141 | } else if (!strcmp(name, "ofs")) { |
140 | ctx.qry.ofs = atoi(value); |
142 | ctx.qry.ofs = atoi(value); |
141 | } else if (!strcmp(name, "path")) { |
143 | } else if (!strcmp(name, "path")) { |
142 | ctx.qry.path = trim_end(value, '/'); |
144 | ctx.qry.path = trim_end(value, '/'); |
143 | } else if (!strcmp(name, "name")) { |
145 | } else if (!strcmp(name, "name")) { |
144 | ctx.qry.name = xstrdup(value); |
146 | ctx.qry.name = xstrdup(value); |
145 | } |
147 | } |
146 | } |
148 | } |
147 | |
149 | |
148 | static void prepare_context(struct cgit_context *ctx) |
150 | static void prepare_context(struct cgit_context *ctx) |
149 | { |
151 | { |
150 | memset(ctx, 0, sizeof(ctx)); |
152 | memset(ctx, 0, sizeof(ctx)); |
151 | ctx->cfg.agefile = "info/web/last-modified"; |
153 | ctx->cfg.agefile = "info/web/last-modified"; |
152 | ctx->cfg.nocache = 0; |
154 | ctx->cfg.nocache = 0; |
153 | ctx->cfg.cache_size = 0; |
155 | ctx->cfg.cache_size = 0; |
154 | ctx->cfg.cache_dynamic_ttl = 5; |
156 | ctx->cfg.cache_dynamic_ttl = 5; |
155 | ctx->cfg.cache_max_create_time = 5; |
157 | ctx->cfg.cache_max_create_time = 5; |
156 | ctx->cfg.cache_repo_ttl = 5; |
158 | ctx->cfg.cache_repo_ttl = 5; |
157 | ctx->cfg.cache_root = CGIT_CACHE_ROOT; |
159 | ctx->cfg.cache_root = CGIT_CACHE_ROOT; |
158 | ctx->cfg.cache_root_ttl = 5; |
160 | ctx->cfg.cache_root_ttl = 5; |
159 | ctx->cfg.cache_static_ttl = -1; |
161 | ctx->cfg.cache_static_ttl = -1; |
160 | ctx->cfg.css = "/cgit.css"; |
162 | ctx->cfg.css = "/cgit.css"; |
161 | ctx->cfg.logo = "/git-logo.png"; |
163 | ctx->cfg.logo = "/git-logo.png"; |
| |
164 | ctx->cfg.max_repo_count = 50; |
162 | ctx->cfg.max_commit_count = 50; |
165 | ctx->cfg.max_commit_count = 50; |
163 | ctx->cfg.max_lock_attempts = 5; |
166 | ctx->cfg.max_lock_attempts = 5; |
164 | ctx->cfg.max_msg_len = 60; |
167 | ctx->cfg.max_msg_len = 60; |
165 | ctx->cfg.max_repodesc_len = 60; |
168 | ctx->cfg.max_repodesc_len = 60; |
166 | ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s"; |
169 | ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s"; |
167 | ctx->cfg.renamelimit = -1; |
170 | ctx->cfg.renamelimit = -1; |
168 | ctx->cfg.robots = "index, nofollow"; |
171 | ctx->cfg.robots = "index, nofollow"; |
169 | ctx->cfg.root_title = "Git repository browser"; |
172 | ctx->cfg.root_title = "Git repository browser"; |
170 | ctx->cfg.root_desc = "a fast webinterface for the git dscm"; |
173 | ctx->cfg.root_desc = "a fast webinterface for the git dscm"; |
171 | ctx->cfg.script_name = CGIT_SCRIPT_NAME; |
174 | ctx->cfg.script_name = CGIT_SCRIPT_NAME; |
172 | ctx->page.mimetype = "text/html"; |
175 | ctx->page.mimetype = "text/html"; |
173 | ctx->page.charset = PAGE_ENCODING; |
176 | ctx->page.charset = PAGE_ENCODING; |
174 | ctx->page.filename = NULL; |
177 | ctx->page.filename = NULL; |
175 | ctx->page.modified = time(NULL); |
178 | ctx->page.modified = time(NULL); |
176 | ctx->page.expires = ctx->page.modified; |
179 | ctx->page.expires = ctx->page.modified; |
177 | } |
180 | } |
178 | |
181 | |
179 | struct refmatch { |
182 | struct refmatch { |
180 | char *req_ref; |
183 | char *req_ref; |
181 | char *first_ref; |
184 | char *first_ref; |
182 | int match; |
185 | int match; |
183 | }; |
186 | }; |
184 | |
187 | |
185 | int find_current_ref(const char *refname, const unsigned char *sha1, |
188 | int find_current_ref(const char *refname, const unsigned char *sha1, |
|