author | Lars Hjemli <hjemli@gmail.com> | 2007-05-18 01:00:54 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2007-05-18 20:51:01 (UTC) |
commit | 30ccdcaa74ebc0aab2b7843b0db8251d0ddf56de (patch) (unidiff) | |
tree | efb3eddd091117281d5592c9eab44bc63121edf6 /shared.c | |
parent | 43d40f2b704151d145a1383b2b964210915ecae4 (diff) | |
download | cgit-30ccdcaa74ebc0aab2b7843b0db8251d0ddf56de.zip cgit-30ccdcaa74ebc0aab2b7843b0db8251d0ddf56de.tar.gz cgit-30ccdcaa74ebc0aab2b7843b0db8251d0ddf56de.tar.bz2 |
Enable url=value querystring parameter
This makes is possible to use repo-urls like '/pub/scm/git/git.git' and
even add path specifications, like '/pub/scm/git/git.git/log/documentation'.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | shared.c | 5 |
1 files changed, 5 insertions, 0 deletions
@@ -1,44 +1,45 @@ | |||
1 | /* shared.c: global vars + some callback functions | 1 | /* shared.c: global vars + some callback functions |
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 | 10 | ||
11 | struct repolist cgit_repolist; | 11 | struct repolist cgit_repolist; |
12 | struct repoinfo *cgit_repo; | 12 | struct repoinfo *cgit_repo; |
13 | int cgit_cmd; | ||
13 | 14 | ||
14 | char *cgit_root_title = "Git repository browser"; | 15 | char *cgit_root_title = "Git repository browser"; |
15 | char *cgit_css = "/cgit.css"; | 16 | char *cgit_css = "/cgit.css"; |
16 | char *cgit_logo = "/git-logo.png"; | 17 | char *cgit_logo = "/git-logo.png"; |
17 | char *cgit_logo_link = "http://www.kernel.org/pub/software/scm/git/docs/"; | 18 | char *cgit_logo_link = "http://www.kernel.org/pub/software/scm/git/docs/"; |
18 | char *cgit_module_link = "./?repo=%s&page=commit&id=%s"; | 19 | char *cgit_module_link = "./?repo=%s&page=commit&id=%s"; |
19 | char *cgit_virtual_root = NULL; | 20 | char *cgit_virtual_root = NULL; |
20 | char *cgit_script_name = CGIT_SCRIPT_NAME; | 21 | char *cgit_script_name = CGIT_SCRIPT_NAME; |
21 | char *cgit_cache_root = "/var/cache/cgit"; | 22 | char *cgit_cache_root = "/var/cache/cgit"; |
22 | 23 | ||
23 | int cgit_nocache = 0; | 24 | int cgit_nocache = 0; |
24 | int cgit_snapshots = 0; | 25 | int cgit_snapshots = 0; |
25 | int cgit_enable_log_filecount = 0; | 26 | int cgit_enable_log_filecount = 0; |
26 | int cgit_enable_log_linecount = 0; | 27 | int cgit_enable_log_linecount = 0; |
27 | int cgit_max_lock_attempts = 5; | 28 | int cgit_max_lock_attempts = 5; |
28 | int cgit_cache_root_ttl = 5; | 29 | int cgit_cache_root_ttl = 5; |
29 | int cgit_cache_repo_ttl = 5; | 30 | int cgit_cache_repo_ttl = 5; |
30 | int cgit_cache_dynamic_ttl = 5; | 31 | int cgit_cache_dynamic_ttl = 5; |
31 | int cgit_cache_static_ttl = -1; | 32 | int cgit_cache_static_ttl = -1; |
32 | int cgit_cache_max_create_time = 5; | 33 | int cgit_cache_max_create_time = 5; |
33 | 34 | ||
34 | int cgit_max_msg_len = 60; | 35 | int cgit_max_msg_len = 60; |
35 | int cgit_max_repodesc_len = 60; | 36 | int cgit_max_repodesc_len = 60; |
36 | int cgit_max_commit_count = 50; | 37 | int cgit_max_commit_count = 50; |
37 | 38 | ||
38 | int cgit_query_has_symref = 0; | 39 | int cgit_query_has_symref = 0; |
39 | int cgit_query_has_sha1 = 0; | 40 | int cgit_query_has_sha1 = 0; |
40 | 41 | ||
41 | char *cgit_querystring = NULL; | 42 | char *cgit_querystring = NULL; |
42 | char *cgit_query_repo = NULL; | 43 | char *cgit_query_repo = NULL; |
43 | char *cgit_query_page = NULL; | 44 | char *cgit_query_page = NULL; |
44 | char *cgit_query_head = NULL; | 45 | char *cgit_query_head = NULL; |
@@ -155,66 +156,70 @@ void cgit_global_config_cb(const char *name, const char *value) | |||
155 | else if (!strcmp(name, "max-repodesc-length")) | 156 | else if (!strcmp(name, "max-repodesc-length")) |
156 | cgit_max_repodesc_len = atoi(value); | 157 | cgit_max_repodesc_len = atoi(value); |
157 | else if (!strcmp(name, "max-commit-count")) | 158 | else if (!strcmp(name, "max-commit-count")) |
158 | cgit_max_commit_count = atoi(value); | 159 | cgit_max_commit_count = atoi(value); |
159 | else if (!strcmp(name, "repo.url")) | 160 | else if (!strcmp(name, "repo.url")) |
160 | cgit_repo = add_repo(value); | 161 | cgit_repo = add_repo(value); |
161 | else if (!strcmp(name, "repo.name")) | 162 | else if (!strcmp(name, "repo.name")) |
162 | cgit_repo->name = xstrdup(value); | 163 | cgit_repo->name = xstrdup(value); |
163 | else if (cgit_repo && !strcmp(name, "repo.path")) | 164 | else if (cgit_repo && !strcmp(name, "repo.path")) |
164 | cgit_repo->path = xstrdup(value); | 165 | cgit_repo->path = xstrdup(value); |
165 | else if (cgit_repo && !strcmp(name, "repo.desc")) | 166 | else if (cgit_repo && !strcmp(name, "repo.desc")) |
166 | cgit_repo->desc = xstrdup(value); | 167 | cgit_repo->desc = xstrdup(value); |
167 | else if (cgit_repo && !strcmp(name, "repo.owner")) | 168 | else if (cgit_repo && !strcmp(name, "repo.owner")) |
168 | cgit_repo->owner = xstrdup(value); | 169 | cgit_repo->owner = xstrdup(value); |
169 | else if (cgit_repo && !strcmp(name, "repo.defbranch")) | 170 | else if (cgit_repo && !strcmp(name, "repo.defbranch")) |
170 | cgit_repo->defbranch = xstrdup(value); | 171 | cgit_repo->defbranch = xstrdup(value); |
171 | else if (cgit_repo && !strcmp(name, "repo.snapshots")) | 172 | else if (cgit_repo && !strcmp(name, "repo.snapshots")) |
172 | cgit_repo->snapshots = cgit_snapshots * atoi(value); | 173 | cgit_repo->snapshots = cgit_snapshots * atoi(value); |
173 | else if (cgit_repo && !strcmp(name, "repo.enable-log-filecount")) | 174 | else if (cgit_repo && !strcmp(name, "repo.enable-log-filecount")) |
174 | cgit_repo->enable_log_filecount = cgit_enable_log_filecount * atoi(value); | 175 | cgit_repo->enable_log_filecount = cgit_enable_log_filecount * atoi(value); |
175 | else if (cgit_repo && !strcmp(name, "repo.enable-log-linecount")) | 176 | else if (cgit_repo && !strcmp(name, "repo.enable-log-linecount")) |
176 | cgit_repo->enable_log_linecount = cgit_enable_log_linecount * atoi(value); | 177 | cgit_repo->enable_log_linecount = cgit_enable_log_linecount * atoi(value); |
177 | else if (cgit_repo && !strcmp(name, "repo.module-link")) | 178 | else if (cgit_repo && !strcmp(name, "repo.module-link")) |
178 | cgit_repo->module_link= xstrdup(value); | 179 | cgit_repo->module_link= xstrdup(value); |
179 | else if (!strcmp(name, "include")) | 180 | else if (!strcmp(name, "include")) |
180 | cgit_read_config(value, cgit_global_config_cb); | 181 | cgit_read_config(value, cgit_global_config_cb); |
181 | } | 182 | } |
182 | 183 | ||
183 | void cgit_querystring_cb(const char *name, const char *value) | 184 | void cgit_querystring_cb(const char *name, const char *value) |
184 | { | 185 | { |
185 | if (!strcmp(name,"r")) { | 186 | if (!strcmp(name,"r")) { |
186 | cgit_query_repo = xstrdup(value); | 187 | cgit_query_repo = xstrdup(value); |
188 | cgit_repo = cgit_get_repoinfo(value); | ||
187 | } else if (!strcmp(name, "p")) { | 189 | } else if (!strcmp(name, "p")) { |
188 | cgit_query_page = xstrdup(value); | 190 | cgit_query_page = xstrdup(value); |
191 | cgit_cmd = cgit_get_cmd_index(value); | ||
192 | } else if (!strcmp(name, "url")) { | ||
193 | cgit_parse_url(value); | ||
189 | } else if (!strcmp(name, "q")) { | 194 | } else if (!strcmp(name, "q")) { |
190 | cgit_query_search = xstrdup(value); | 195 | cgit_query_search = xstrdup(value); |
191 | } else if (!strcmp(name, "h")) { | 196 | } else if (!strcmp(name, "h")) { |
192 | cgit_query_head = xstrdup(value); | 197 | cgit_query_head = xstrdup(value); |
193 | cgit_query_has_symref = 1; | 198 | cgit_query_has_symref = 1; |
194 | } else if (!strcmp(name, "id")) { | 199 | } else if (!strcmp(name, "id")) { |
195 | cgit_query_sha1 = xstrdup(value); | 200 | cgit_query_sha1 = xstrdup(value); |
196 | cgit_query_has_sha1 = 1; | 201 | cgit_query_has_sha1 = 1; |
197 | } else if (!strcmp(name, "id2")) { | 202 | } else if (!strcmp(name, "id2")) { |
198 | cgit_query_sha2 = xstrdup(value); | 203 | cgit_query_sha2 = xstrdup(value); |
199 | cgit_query_has_sha1 = 1; | 204 | cgit_query_has_sha1 = 1; |
200 | } else if (!strcmp(name, "ofs")) { | 205 | } else if (!strcmp(name, "ofs")) { |
201 | cgit_query_ofs = atoi(value); | 206 | cgit_query_ofs = atoi(value); |
202 | } else if (!strcmp(name, "path")) { | 207 | } else if (!strcmp(name, "path")) { |
203 | cgit_query_path = xstrdup(value); | 208 | cgit_query_path = xstrdup(value); |
204 | } else if (!strcmp(name, "name")) { | 209 | } else if (!strcmp(name, "name")) { |
205 | cgit_query_name = xstrdup(value); | 210 | cgit_query_name = xstrdup(value); |
206 | } | 211 | } |
207 | } | 212 | } |
208 | 213 | ||
209 | void *cgit_free_commitinfo(struct commitinfo *info) | 214 | void *cgit_free_commitinfo(struct commitinfo *info) |
210 | { | 215 | { |
211 | free(info->author); | 216 | free(info->author); |
212 | free(info->author_email); | 217 | free(info->author_email); |
213 | free(info->committer); | 218 | free(info->committer); |
214 | free(info->committer_email); | 219 | free(info->committer_email); |
215 | free(info->subject); | 220 | free(info->subject); |
216 | free(info); | 221 | free(info); |
217 | return NULL; | 222 | return NULL; |
218 | } | 223 | } |
219 | 224 | ||
220 | int hextoint(char c) | 225 | int hextoint(char c) |