author | Lars Hjemli <hjemli@gmail.com> | 2009-08-09 11:45:36 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2009-08-09 11:45:36 (UTC) |
commit | 17e3ff42646f182911fd0e5d872082977538db9e (patch) (unidiff) | |
tree | 6fedf480751b534ac11066dd143fd0589cad284a /cgit.c | |
parent | b4c3562f57c924866314d0f80f46dddecd4ce61a (diff) | |
parent | c4d46c7035d07070ac1ebf0c0b44df927358687f (diff) | |
download | cgit-17e3ff42646f182911fd0e5d872082977538db9e.zip cgit-17e3ff42646f182911fd0e5d872082977538db9e.tar.gz cgit-17e3ff42646f182911fd0e5d872082977538db9e.tar.bz2 |
Merge branch 'lh/mimetypes'
-rw-r--r-- | cgit.c | 11 |
1 files changed, 11 insertions, 0 deletions
@@ -1,153 +1,163 @@ | |||
1 | /* cgit.c: cgi for the git scm | 1 | /* cgit.c: cgi for the git scm |
2 | * | 2 | * |
3 | * Copyright (C) 2006 Lars Hjemli | 3 | * Copyright (C) 2006 Lars Hjemli |
4 | * | 4 | * |
5 | * Licensed under GNU General Public License v2 | 5 | * Licensed under GNU General Public License v2 |
6 | * (see COPYING for full license text) | 6 | * (see COPYING for full license text) |
7 | */ | 7 | */ |
8 | 8 | ||
9 | #include "cgit.h" | 9 | #include "cgit.h" |
10 | #include "cache.h" | 10 | #include "cache.h" |
11 | #include "cmd.h" | 11 | #include "cmd.h" |
12 | #include "configfile.h" | 12 | #include "configfile.h" |
13 | #include "html.h" | 13 | #include "html.h" |
14 | #include "ui-shared.h" | 14 | #include "ui-shared.h" |
15 | #include "ui-stats.h" | 15 | #include "ui-stats.h" |
16 | #include "scan-tree.h" | 16 | #include "scan-tree.h" |
17 | 17 | ||
18 | const char *cgit_version = CGIT_VERSION; | 18 | const char *cgit_version = CGIT_VERSION; |
19 | 19 | ||
20 | void add_mimetype(const char *name, const char *value) | ||
21 | { | ||
22 | struct string_list_item *item; | ||
23 | |||
24 | item = string_list_insert(xstrdup(name), &ctx.cfg.mimetypes); | ||
25 | item->util = xstrdup(value); | ||
26 | } | ||
27 | |||
20 | void config_cb(const char *name, const char *value) | 28 | void config_cb(const char *name, const char *value) |
21 | { | 29 | { |
22 | if (!strcmp(name, "root-title")) | 30 | if (!strcmp(name, "root-title")) |
23 | ctx.cfg.root_title = xstrdup(value); | 31 | ctx.cfg.root_title = xstrdup(value); |
24 | else if (!strcmp(name, "root-desc")) | 32 | else if (!strcmp(name, "root-desc")) |
25 | ctx.cfg.root_desc = xstrdup(value); | 33 | ctx.cfg.root_desc = xstrdup(value); |
26 | else if (!strcmp(name, "root-readme")) | 34 | else if (!strcmp(name, "root-readme")) |
27 | ctx.cfg.root_readme = xstrdup(value); | 35 | ctx.cfg.root_readme = xstrdup(value); |
28 | else if (!strcmp(name, "css")) | 36 | else if (!strcmp(name, "css")) |
29 | ctx.cfg.css = xstrdup(value); | 37 | ctx.cfg.css = xstrdup(value); |
30 | else if (!strcmp(name, "favicon")) | 38 | else if (!strcmp(name, "favicon")) |
31 | ctx.cfg.favicon = xstrdup(value); | 39 | ctx.cfg.favicon = xstrdup(value); |
32 | else if (!strcmp(name, "footer")) | 40 | else if (!strcmp(name, "footer")) |
33 | ctx.cfg.footer = xstrdup(value); | 41 | ctx.cfg.footer = xstrdup(value); |
34 | else if (!strcmp(name, "head-include")) | 42 | else if (!strcmp(name, "head-include")) |
35 | ctx.cfg.head_include = xstrdup(value); | 43 | ctx.cfg.head_include = xstrdup(value); |
36 | else if (!strcmp(name, "header")) | 44 | else if (!strcmp(name, "header")) |
37 | ctx.cfg.header = xstrdup(value); | 45 | ctx.cfg.header = xstrdup(value); |
38 | else if (!strcmp(name, "logo")) | 46 | else if (!strcmp(name, "logo")) |
39 | ctx.cfg.logo = xstrdup(value); | 47 | ctx.cfg.logo = xstrdup(value); |
40 | else if (!strcmp(name, "index-header")) | 48 | else if (!strcmp(name, "index-header")) |
41 | ctx.cfg.index_header = xstrdup(value); | 49 | ctx.cfg.index_header = xstrdup(value); |
42 | else if (!strcmp(name, "index-info")) | 50 | else if (!strcmp(name, "index-info")) |
43 | ctx.cfg.index_info = xstrdup(value); | 51 | ctx.cfg.index_info = xstrdup(value); |
44 | else if (!strcmp(name, "logo-link")) | 52 | else if (!strcmp(name, "logo-link")) |
45 | ctx.cfg.logo_link = xstrdup(value); | 53 | ctx.cfg.logo_link = xstrdup(value); |
46 | else if (!strcmp(name, "module-link")) | 54 | else if (!strcmp(name, "module-link")) |
47 | ctx.cfg.module_link = xstrdup(value); | 55 | ctx.cfg.module_link = xstrdup(value); |
48 | else if (!strcmp(name, "virtual-root")) { | 56 | else if (!strcmp(name, "virtual-root")) { |
49 | ctx.cfg.virtual_root = trim_end(value, '/'); | 57 | ctx.cfg.virtual_root = trim_end(value, '/'); |
50 | if (!ctx.cfg.virtual_root && (!strcmp(value, "/"))) | 58 | if (!ctx.cfg.virtual_root && (!strcmp(value, "/"))) |
51 | ctx.cfg.virtual_root = ""; | 59 | ctx.cfg.virtual_root = ""; |
52 | } else if (!strcmp(name, "nocache")) | 60 | } else if (!strcmp(name, "nocache")) |
53 | ctx.cfg.nocache = atoi(value); | 61 | ctx.cfg.nocache = atoi(value); |
54 | else if (!strcmp(name, "noplainemail")) | 62 | else if (!strcmp(name, "noplainemail")) |
55 | ctx.cfg.noplainemail = atoi(value); | 63 | ctx.cfg.noplainemail = atoi(value); |
56 | else if (!strcmp(name, "noheader")) | 64 | else if (!strcmp(name, "noheader")) |
57 | ctx.cfg.noheader = atoi(value); | 65 | ctx.cfg.noheader = atoi(value); |
58 | else if (!strcmp(name, "snapshots")) | 66 | else if (!strcmp(name, "snapshots")) |
59 | ctx.cfg.snapshots = cgit_parse_snapshots_mask(value); | 67 | ctx.cfg.snapshots = cgit_parse_snapshots_mask(value); |
60 | else if (!strcmp(name, "enable-index-links")) | 68 | else if (!strcmp(name, "enable-index-links")) |
61 | ctx.cfg.enable_index_links = atoi(value); | 69 | ctx.cfg.enable_index_links = atoi(value); |
62 | else if (!strcmp(name, "enable-log-filecount")) | 70 | else if (!strcmp(name, "enable-log-filecount")) |
63 | ctx.cfg.enable_log_filecount = atoi(value); | 71 | ctx.cfg.enable_log_filecount = atoi(value); |
64 | else if (!strcmp(name, "enable-log-linecount")) | 72 | else if (!strcmp(name, "enable-log-linecount")) |
65 | ctx.cfg.enable_log_linecount = atoi(value); | 73 | ctx.cfg.enable_log_linecount = atoi(value); |
66 | else if (!strcmp(name, "max-stats")) | 74 | else if (!strcmp(name, "max-stats")) |
67 | ctx.cfg.max_stats = cgit_find_stats_period(value, NULL); | 75 | ctx.cfg.max_stats = cgit_find_stats_period(value, NULL); |
68 | else if (!strcmp(name, "cache-size")) | 76 | else if (!strcmp(name, "cache-size")) |
69 | ctx.cfg.cache_size = atoi(value); | 77 | ctx.cfg.cache_size = atoi(value); |
70 | else if (!strcmp(name, "cache-root")) | 78 | else if (!strcmp(name, "cache-root")) |
71 | ctx.cfg.cache_root = xstrdup(value); | 79 | ctx.cfg.cache_root = xstrdup(value); |
72 | else if (!strcmp(name, "cache-root-ttl")) | 80 | else if (!strcmp(name, "cache-root-ttl")) |
73 | ctx.cfg.cache_root_ttl = atoi(value); | 81 | ctx.cfg.cache_root_ttl = atoi(value); |
74 | else if (!strcmp(name, "cache-repo-ttl")) | 82 | else if (!strcmp(name, "cache-repo-ttl")) |
75 | ctx.cfg.cache_repo_ttl = atoi(value); | 83 | ctx.cfg.cache_repo_ttl = atoi(value); |
76 | else if (!strcmp(name, "cache-static-ttl")) | 84 | else if (!strcmp(name, "cache-static-ttl")) |
77 | ctx.cfg.cache_static_ttl = atoi(value); | 85 | ctx.cfg.cache_static_ttl = atoi(value); |
78 | else if (!strcmp(name, "cache-dynamic-ttl")) | 86 | else if (!strcmp(name, "cache-dynamic-ttl")) |
79 | ctx.cfg.cache_dynamic_ttl = atoi(value); | 87 | ctx.cfg.cache_dynamic_ttl = atoi(value); |
80 | else if (!strcmp(name, "embedded")) | 88 | else if (!strcmp(name, "embedded")) |
81 | ctx.cfg.embedded = atoi(value); | 89 | ctx.cfg.embedded = atoi(value); |
82 | else if (!strcmp(name, "max-message-length")) | 90 | else if (!strcmp(name, "max-message-length")) |
83 | ctx.cfg.max_msg_len = atoi(value); | 91 | ctx.cfg.max_msg_len = atoi(value); |
84 | else if (!strcmp(name, "max-repodesc-length")) | 92 | else if (!strcmp(name, "max-repodesc-length")) |
85 | ctx.cfg.max_repodesc_len = atoi(value); | 93 | ctx.cfg.max_repodesc_len = atoi(value); |
86 | else if (!strcmp(name, "max-repo-count")) | 94 | else if (!strcmp(name, "max-repo-count")) |
87 | ctx.cfg.max_repo_count = atoi(value); | 95 | ctx.cfg.max_repo_count = atoi(value); |
88 | else if (!strcmp(name, "max-commit-count")) | 96 | else if (!strcmp(name, "max-commit-count")) |
89 | ctx.cfg.max_commit_count = atoi(value); | 97 | ctx.cfg.max_commit_count = atoi(value); |
90 | else if (!strcmp(name, "summary-log")) | 98 | else if (!strcmp(name, "summary-log")) |
91 | ctx.cfg.summary_log = atoi(value); | 99 | ctx.cfg.summary_log = atoi(value); |
92 | else if (!strcmp(name, "summary-branches")) | 100 | else if (!strcmp(name, "summary-branches")) |
93 | ctx.cfg.summary_branches = atoi(value); | 101 | ctx.cfg.summary_branches = atoi(value); |
94 | else if (!strcmp(name, "summary-tags")) | 102 | else if (!strcmp(name, "summary-tags")) |
95 | ctx.cfg.summary_tags = atoi(value); | 103 | ctx.cfg.summary_tags = atoi(value); |
96 | else if (!strcmp(name, "agefile")) | 104 | else if (!strcmp(name, "agefile")) |
97 | ctx.cfg.agefile = xstrdup(value); | 105 | ctx.cfg.agefile = xstrdup(value); |
98 | else if (!strcmp(name, "renamelimit")) | 106 | else if (!strcmp(name, "renamelimit")) |
99 | ctx.cfg.renamelimit = atoi(value); | 107 | ctx.cfg.renamelimit = atoi(value); |
100 | else if (!strcmp(name, "robots")) | 108 | else if (!strcmp(name, "robots")) |
101 | ctx.cfg.robots = xstrdup(value); | 109 | ctx.cfg.robots = xstrdup(value); |
102 | else if (!strcmp(name, "clone-prefix")) | 110 | else if (!strcmp(name, "clone-prefix")) |
103 | ctx.cfg.clone_prefix = xstrdup(value); | 111 | ctx.cfg.clone_prefix = xstrdup(value); |
104 | else if (!strcmp(name, "local-time")) | 112 | else if (!strcmp(name, "local-time")) |
105 | ctx.cfg.local_time = atoi(value); | 113 | ctx.cfg.local_time = atoi(value); |
114 | else if (!prefixcmp(name, "mimetype.")) | ||
115 | add_mimetype(name + 9, value); | ||
106 | else if (!strcmp(name, "repo.group")) | 116 | else if (!strcmp(name, "repo.group")) |
107 | ctx.cfg.repo_group = xstrdup(value); | 117 | ctx.cfg.repo_group = xstrdup(value); |
108 | else if (!strcmp(name, "repo.url")) | 118 | else if (!strcmp(name, "repo.url")) |
109 | ctx.repo = cgit_add_repo(value); | 119 | ctx.repo = cgit_add_repo(value); |
110 | else if (!strcmp(name, "repo.name")) | 120 | else if (!strcmp(name, "repo.name")) |
111 | ctx.repo->name = xstrdup(value); | 121 | ctx.repo->name = xstrdup(value); |
112 | else if (ctx.repo && !strcmp(name, "repo.path")) | 122 | else if (ctx.repo && !strcmp(name, "repo.path")) |
113 | ctx.repo->path = trim_end(value, '/'); | 123 | ctx.repo->path = trim_end(value, '/'); |
114 | else if (ctx.repo && !strcmp(name, "repo.clone-url")) | 124 | else if (ctx.repo && !strcmp(name, "repo.clone-url")) |
115 | ctx.repo->clone_url = xstrdup(value); | 125 | ctx.repo->clone_url = xstrdup(value); |
116 | else if (ctx.repo && !strcmp(name, "repo.desc")) | 126 | else if (ctx.repo && !strcmp(name, "repo.desc")) |
117 | ctx.repo->desc = xstrdup(value); | 127 | ctx.repo->desc = xstrdup(value); |
118 | else if (ctx.repo && !strcmp(name, "repo.owner")) | 128 | else if (ctx.repo && !strcmp(name, "repo.owner")) |
119 | ctx.repo->owner = xstrdup(value); | 129 | ctx.repo->owner = xstrdup(value); |
120 | else if (ctx.repo && !strcmp(name, "repo.defbranch")) | 130 | else if (ctx.repo && !strcmp(name, "repo.defbranch")) |
121 | ctx.repo->defbranch = xstrdup(value); | 131 | ctx.repo->defbranch = xstrdup(value); |
122 | else if (ctx.repo && !strcmp(name, "repo.snapshots")) | 132 | else if (ctx.repo && !strcmp(name, "repo.snapshots")) |
123 | ctx.repo->snapshots = ctx.cfg.snapshots & cgit_parse_snapshots_mask(value); /* XXX: &? */ | 133 | ctx.repo->snapshots = ctx.cfg.snapshots & cgit_parse_snapshots_mask(value); /* XXX: &? */ |
124 | else if (ctx.repo && !strcmp(name, "repo.enable-log-filecount")) | 134 | else if (ctx.repo && !strcmp(name, "repo.enable-log-filecount")) |
125 | ctx.repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value); | 135 | ctx.repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value); |
126 | else if (ctx.repo && !strcmp(name, "repo.enable-log-linecount")) | 136 | else if (ctx.repo && !strcmp(name, "repo.enable-log-linecount")) |
127 | ctx.repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value); | 137 | ctx.repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value); |
128 | else if (ctx.repo && !strcmp(name, "repo.max-stats")) | 138 | else if (ctx.repo && !strcmp(name, "repo.max-stats")) |
129 | ctx.repo->max_stats = cgit_find_stats_period(value, NULL); | 139 | ctx.repo->max_stats = cgit_find_stats_period(value, NULL); |
130 | else if (ctx.repo && !strcmp(name, "repo.module-link")) | 140 | else if (ctx.repo && !strcmp(name, "repo.module-link")) |
131 | ctx.repo->module_link= xstrdup(value); | 141 | ctx.repo->module_link= xstrdup(value); |
132 | else if (ctx.repo && !strcmp(name, "repo.readme") && value != NULL) { | 142 | else if (ctx.repo && !strcmp(name, "repo.readme") && value != NULL) { |
133 | if (*value == '/') | 143 | if (*value == '/') |
134 | ctx.repo->readme = xstrdup(value); | 144 | ctx.repo->readme = xstrdup(value); |
135 | else | 145 | else |
136 | ctx.repo->readme = xstrdup(fmt("%s/%s", ctx.repo->path, value)); | 146 | ctx.repo->readme = xstrdup(fmt("%s/%s", ctx.repo->path, value)); |
137 | } else if (!strcmp(name, "include")) | 147 | } else if (!strcmp(name, "include")) |
138 | parse_configfile(value, config_cb); | 148 | parse_configfile(value, config_cb); |
139 | } | 149 | } |
140 | 150 | ||
141 | static void querystring_cb(const char *name, const char *value) | 151 | static void querystring_cb(const char *name, const char *value) |
142 | { | 152 | { |
143 | if (!strcmp(name,"r")) { | 153 | if (!strcmp(name,"r")) { |
144 | ctx.qry.repo = xstrdup(value); | 154 | ctx.qry.repo = xstrdup(value); |
145 | ctx.repo = cgit_get_repoinfo(value); | 155 | ctx.repo = cgit_get_repoinfo(value); |
146 | } else if (!strcmp(name, "p")) { | 156 | } else if (!strcmp(name, "p")) { |
147 | ctx.qry.page = xstrdup(value); | 157 | ctx.qry.page = xstrdup(value); |
148 | } else if (!strcmp(name, "url")) { | 158 | } else if (!strcmp(name, "url")) { |
149 | ctx.qry.url = xstrdup(value); | 159 | ctx.qry.url = xstrdup(value); |
150 | cgit_parse_url(value); | 160 | cgit_parse_url(value); |
151 | } else if (!strcmp(name, "qt")) { | 161 | } else if (!strcmp(name, "qt")) { |
152 | ctx.qry.grep = xstrdup(value); | 162 | ctx.qry.grep = xstrdup(value); |
153 | } else if (!strcmp(name, "q")) { | 163 | } else if (!strcmp(name, "q")) { |
@@ -170,96 +180,97 @@ static void querystring_cb(const char *name, const char *value) | |||
170 | } else if (!strcmp(name, "mimetype")) { | 180 | } else if (!strcmp(name, "mimetype")) { |
171 | ctx.qry.mimetype = xstrdup(value); | 181 | ctx.qry.mimetype = xstrdup(value); |
172 | } else if (!strcmp(name, "s")){ | 182 | } else if (!strcmp(name, "s")){ |
173 | ctx.qry.sort = xstrdup(value); | 183 | ctx.qry.sort = xstrdup(value); |
174 | } else if (!strcmp(name, "showmsg")) { | 184 | } else if (!strcmp(name, "showmsg")) { |
175 | ctx.qry.showmsg = atoi(value); | 185 | ctx.qry.showmsg = atoi(value); |
176 | } else if (!strcmp(name, "period")) { | 186 | } else if (!strcmp(name, "period")) { |
177 | ctx.qry.period = xstrdup(value); | 187 | ctx.qry.period = xstrdup(value); |
178 | } | 188 | } |
179 | } | 189 | } |
180 | 190 | ||
181 | static void prepare_context(struct cgit_context *ctx) | 191 | static void prepare_context(struct cgit_context *ctx) |
182 | { | 192 | { |
183 | memset(ctx, 0, sizeof(ctx)); | 193 | memset(ctx, 0, sizeof(ctx)); |
184 | ctx->cfg.agefile = "info/web/last-modified"; | 194 | ctx->cfg.agefile = "info/web/last-modified"; |
185 | ctx->cfg.nocache = 0; | 195 | ctx->cfg.nocache = 0; |
186 | ctx->cfg.cache_size = 0; | 196 | ctx->cfg.cache_size = 0; |
187 | ctx->cfg.cache_dynamic_ttl = 5; | 197 | ctx->cfg.cache_dynamic_ttl = 5; |
188 | ctx->cfg.cache_max_create_time = 5; | 198 | ctx->cfg.cache_max_create_time = 5; |
189 | ctx->cfg.cache_repo_ttl = 5; | 199 | ctx->cfg.cache_repo_ttl = 5; |
190 | ctx->cfg.cache_root = CGIT_CACHE_ROOT; | 200 | ctx->cfg.cache_root = CGIT_CACHE_ROOT; |
191 | ctx->cfg.cache_root_ttl = 5; | 201 | ctx->cfg.cache_root_ttl = 5; |
192 | ctx->cfg.cache_static_ttl = -1; | 202 | ctx->cfg.cache_static_ttl = -1; |
193 | ctx->cfg.css = "/cgit.css"; | 203 | ctx->cfg.css = "/cgit.css"; |
194 | ctx->cfg.logo = "/git-logo.png"; | 204 | ctx->cfg.logo = "/git-logo.png"; |
195 | ctx->cfg.local_time = 0; | 205 | ctx->cfg.local_time = 0; |
196 | ctx->cfg.max_repo_count = 50; | 206 | ctx->cfg.max_repo_count = 50; |
197 | ctx->cfg.max_commit_count = 50; | 207 | ctx->cfg.max_commit_count = 50; |
198 | ctx->cfg.max_lock_attempts = 5; | 208 | ctx->cfg.max_lock_attempts = 5; |
199 | ctx->cfg.max_msg_len = 80; | 209 | ctx->cfg.max_msg_len = 80; |
200 | ctx->cfg.max_repodesc_len = 80; | 210 | ctx->cfg.max_repodesc_len = 80; |
201 | ctx->cfg.max_stats = 0; | 211 | ctx->cfg.max_stats = 0; |
202 | ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s"; | 212 | ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s"; |
203 | ctx->cfg.renamelimit = -1; | 213 | ctx->cfg.renamelimit = -1; |
204 | ctx->cfg.robots = "index, nofollow"; | 214 | ctx->cfg.robots = "index, nofollow"; |
205 | ctx->cfg.root_title = "Git repository browser"; | 215 | ctx->cfg.root_title = "Git repository browser"; |
206 | ctx->cfg.root_desc = "a fast webinterface for the git dscm"; | 216 | ctx->cfg.root_desc = "a fast webinterface for the git dscm"; |
207 | ctx->cfg.script_name = CGIT_SCRIPT_NAME; | 217 | ctx->cfg.script_name = CGIT_SCRIPT_NAME; |
208 | ctx->cfg.summary_branches = 10; | 218 | ctx->cfg.summary_branches = 10; |
209 | ctx->cfg.summary_log = 10; | 219 | ctx->cfg.summary_log = 10; |
210 | ctx->cfg.summary_tags = 10; | 220 | ctx->cfg.summary_tags = 10; |
211 | ctx->page.mimetype = "text/html"; | 221 | ctx->page.mimetype = "text/html"; |
212 | ctx->page.charset = PAGE_ENCODING; | 222 | ctx->page.charset = PAGE_ENCODING; |
213 | ctx->page.filename = NULL; | 223 | ctx->page.filename = NULL; |
214 | ctx->page.size = 0; | 224 | ctx->page.size = 0; |
215 | ctx->page.modified = time(NULL); | 225 | ctx->page.modified = time(NULL); |
216 | ctx->page.expires = ctx->page.modified; | 226 | ctx->page.expires = ctx->page.modified; |
217 | ctx->page.etag = NULL; | 227 | ctx->page.etag = NULL; |
228 | memset(&ctx->cfg.mimetypes, 0, sizeof(struct string_list)); | ||
218 | } | 229 | } |
219 | 230 | ||
220 | struct refmatch { | 231 | struct refmatch { |
221 | char *req_ref; | 232 | char *req_ref; |
222 | char *first_ref; | 233 | char *first_ref; |
223 | int match; | 234 | int match; |
224 | }; | 235 | }; |
225 | 236 | ||
226 | int find_current_ref(const char *refname, const unsigned char *sha1, | 237 | int find_current_ref(const char *refname, const unsigned char *sha1, |
227 | int flags, void *cb_data) | 238 | int flags, void *cb_data) |
228 | { | 239 | { |
229 | struct refmatch *info; | 240 | struct refmatch *info; |
230 | 241 | ||
231 | info = (struct refmatch *)cb_data; | 242 | info = (struct refmatch *)cb_data; |
232 | if (!strcmp(refname, info->req_ref)) | 243 | if (!strcmp(refname, info->req_ref)) |
233 | info->match = 1; | 244 | info->match = 1; |
234 | if (!info->first_ref) | 245 | if (!info->first_ref) |
235 | info->first_ref = xstrdup(refname); | 246 | info->first_ref = xstrdup(refname); |
236 | return info->match; | 247 | return info->match; |
237 | } | 248 | } |
238 | 249 | ||
239 | char *find_default_branch(struct cgit_repo *repo) | 250 | char *find_default_branch(struct cgit_repo *repo) |
240 | { | 251 | { |
241 | struct refmatch info; | 252 | struct refmatch info; |
242 | char *ref; | 253 | char *ref; |
243 | 254 | ||
244 | info.req_ref = repo->defbranch; | 255 | info.req_ref = repo->defbranch; |
245 | info.first_ref = NULL; | 256 | info.first_ref = NULL; |
246 | info.match = 0; | 257 | info.match = 0; |
247 | for_each_branch_ref(find_current_ref, &info); | 258 | for_each_branch_ref(find_current_ref, &info); |
248 | if (info.match) | 259 | if (info.match) |
249 | ref = info.req_ref; | 260 | ref = info.req_ref; |
250 | else | 261 | else |
251 | ref = info.first_ref; | 262 | ref = info.first_ref; |
252 | if (ref) | 263 | if (ref) |
253 | ref = xstrdup(ref); | 264 | ref = xstrdup(ref); |
254 | return ref; | 265 | return ref; |
255 | } | 266 | } |
256 | 267 | ||
257 | static int prepare_repo_cmd(struct cgit_context *ctx) | 268 | static int prepare_repo_cmd(struct cgit_context *ctx) |
258 | { | 269 | { |
259 | char *tmp; | 270 | char *tmp; |
260 | unsigned char sha1[20]; | 271 | unsigned char sha1[20]; |
261 | int nongit = 0; | 272 | int nongit = 0; |
262 | 273 | ||
263 | setenv("GIT_DIR", ctx->repo->path, 1); | 274 | setenv("GIT_DIR", ctx->repo->path, 1); |
264 | setup_git_directory_gently(&nongit); | 275 | setup_git_directory_gently(&nongit); |
265 | if (nongit) { | 276 | if (nongit) { |