author | Lars Hjemli <hjemli@gmail.com> | 2007-05-20 20:09:55 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2007-05-20 20:09:55 (UTC) |
commit | dc3ac3f76077c5d612d42e8beb4878e43acfc58a (patch) (unidiff) | |
tree | dfb996c0ce9833841578e1f0accbb5a387c01237 /shared.c | |
parent | 977a0b173df6fe1a4d362fe4c70f9badff1fd46c (diff) | |
parent | 3de63b264c36888dfd42dfdf3fc0aad4ce0c2b5c (diff) | |
download | cgit-dc3ac3f76077c5d612d42e8beb4878e43acfc58a.zip cgit-dc3ac3f76077c5d612d42e8beb4878e43acfc58a.tar.gz cgit-dc3ac3f76077c5d612d42e8beb4878e43acfc58a.tar.bz2 |
Merge branch 'virtual-url'
* virtual-url:
Don't be fooled by trailing '/' in url-parameter
cache_safe_filename() needs more buffers
Enable url=value querystring parameter
Add lookup-function for valid repo commands
Move cgit_get_repoinfo into shared.c
-rw-r--r-- | shared.c | 30 |
1 files changed, 30 insertions, 0 deletions
@@ -1,120 +1,146 @@ | |||
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_index_header = NULL; | 18 | char *cgit_index_header = NULL; |
18 | char *cgit_logo_link = "http://www.kernel.org/pub/software/scm/git/docs/"; | 19 | char *cgit_logo_link = "http://www.kernel.org/pub/software/scm/git/docs/"; |
19 | char *cgit_module_link = "./?repo=%s&page=commit&id=%s"; | 20 | char *cgit_module_link = "./?repo=%s&page=commit&id=%s"; |
20 | char *cgit_virtual_root = NULL; | 21 | char *cgit_virtual_root = NULL; |
21 | char *cgit_script_name = CGIT_SCRIPT_NAME; | 22 | char *cgit_script_name = CGIT_SCRIPT_NAME; |
22 | char *cgit_cache_root = "/var/cache/cgit"; | 23 | char *cgit_cache_root = "/var/cache/cgit"; |
23 | 24 | ||
24 | int cgit_nocache = 0; | 25 | int cgit_nocache = 0; |
25 | int cgit_snapshots = 0; | 26 | int cgit_snapshots = 0; |
26 | int cgit_enable_log_filecount = 0; | 27 | int cgit_enable_log_filecount = 0; |
27 | int cgit_enable_log_linecount = 0; | 28 | int cgit_enable_log_linecount = 0; |
28 | int cgit_max_lock_attempts = 5; | 29 | int cgit_max_lock_attempts = 5; |
29 | int cgit_cache_root_ttl = 5; | 30 | int cgit_cache_root_ttl = 5; |
30 | int cgit_cache_repo_ttl = 5; | 31 | int cgit_cache_repo_ttl = 5; |
31 | int cgit_cache_dynamic_ttl = 5; | 32 | int cgit_cache_dynamic_ttl = 5; |
32 | int cgit_cache_static_ttl = -1; | 33 | int cgit_cache_static_ttl = -1; |
33 | int cgit_cache_max_create_time = 5; | 34 | int cgit_cache_max_create_time = 5; |
34 | 35 | ||
35 | int cgit_max_msg_len = 60; | 36 | int cgit_max_msg_len = 60; |
36 | int cgit_max_repodesc_len = 60; | 37 | int cgit_max_repodesc_len = 60; |
37 | int cgit_max_commit_count = 50; | 38 | int cgit_max_commit_count = 50; |
38 | 39 | ||
39 | int cgit_query_has_symref = 0; | 40 | int cgit_query_has_symref = 0; |
40 | int cgit_query_has_sha1 = 0; | 41 | int cgit_query_has_sha1 = 0; |
41 | 42 | ||
42 | char *cgit_querystring = NULL; | 43 | char *cgit_querystring = NULL; |
43 | char *cgit_query_repo = NULL; | 44 | char *cgit_query_repo = NULL; |
44 | char *cgit_query_page = NULL; | 45 | char *cgit_query_page = NULL; |
45 | char *cgit_query_head = NULL; | 46 | char *cgit_query_head = NULL; |
46 | char *cgit_query_search = NULL; | 47 | char *cgit_query_search = NULL; |
47 | char *cgit_query_sha1 = NULL; | 48 | char *cgit_query_sha1 = NULL; |
48 | char *cgit_query_sha2 = NULL; | 49 | char *cgit_query_sha2 = NULL; |
49 | char *cgit_query_path = NULL; | 50 | char *cgit_query_path = NULL; |
50 | char *cgit_query_name = NULL; | 51 | char *cgit_query_name = NULL; |
51 | int cgit_query_ofs = 0; | 52 | int cgit_query_ofs = 0; |
52 | 53 | ||
53 | int htmlfd = 0; | 54 | int htmlfd = 0; |
54 | 55 | ||
56 | |||
57 | int cgit_get_cmd_index(const char *cmd) | ||
58 | { | ||
59 | static char *cmds[] = {"log", "commit", "diff", "tree", "view", "blob", "snapshot", NULL}; | ||
60 | int i; | ||
61 | |||
62 | for(i = 0; cmds[i]; i++) | ||
63 | if (!strcmp(cmd, cmds[i])) | ||
64 | return i + 1; | ||
65 | return 0; | ||
66 | } | ||
67 | |||
55 | int chk_zero(int result, char *msg) | 68 | int chk_zero(int result, char *msg) |
56 | { | 69 | { |
57 | if (result != 0) | 70 | if (result != 0) |
58 | die("%s: %s", msg, strerror(errno)); | 71 | die("%s: %s", msg, strerror(errno)); |
59 | return result; | 72 | return result; |
60 | } | 73 | } |
61 | 74 | ||
62 | int chk_positive(int result, char *msg) | 75 | int chk_positive(int result, char *msg) |
63 | { | 76 | { |
64 | if (result <= 0) | 77 | if (result <= 0) |
65 | die("%s: %s", msg, strerror(errno)); | 78 | die("%s: %s", msg, strerror(errno)); |
66 | return result; | 79 | return result; |
67 | } | 80 | } |
68 | 81 | ||
69 | struct repoinfo *add_repo(const char *url) | 82 | struct repoinfo *add_repo(const char *url) |
70 | { | 83 | { |
71 | struct repoinfo *ret; | 84 | struct repoinfo *ret; |
72 | 85 | ||
73 | if (++cgit_repolist.count > cgit_repolist.length) { | 86 | if (++cgit_repolist.count > cgit_repolist.length) { |
74 | if (cgit_repolist.length == 0) | 87 | if (cgit_repolist.length == 0) |
75 | cgit_repolist.length = 8; | 88 | cgit_repolist.length = 8; |
76 | else | 89 | else |
77 | cgit_repolist.length *= 2; | 90 | cgit_repolist.length *= 2; |
78 | cgit_repolist.repos = xrealloc(cgit_repolist.repos, | 91 | cgit_repolist.repos = xrealloc(cgit_repolist.repos, |
79 | cgit_repolist.length * | 92 | cgit_repolist.length * |
80 | sizeof(struct repoinfo)); | 93 | sizeof(struct repoinfo)); |
81 | } | 94 | } |
82 | 95 | ||
83 | ret = &cgit_repolist.repos[cgit_repolist.count-1]; | 96 | ret = &cgit_repolist.repos[cgit_repolist.count-1]; |
84 | ret->url = xstrdup(url); | 97 | ret->url = xstrdup(url); |
85 | ret->name = ret->url; | 98 | ret->name = ret->url; |
86 | ret->path = NULL; | 99 | ret->path = NULL; |
87 | ret->desc = NULL; | 100 | ret->desc = NULL; |
88 | ret->owner = NULL; | 101 | ret->owner = NULL; |
89 | ret->defbranch = "master"; | 102 | ret->defbranch = "master"; |
90 | ret->snapshots = cgit_snapshots; | 103 | ret->snapshots = cgit_snapshots; |
91 | ret->enable_log_filecount = cgit_enable_log_filecount; | 104 | ret->enable_log_filecount = cgit_enable_log_filecount; |
92 | ret->enable_log_linecount = cgit_enable_log_linecount; | 105 | ret->enable_log_linecount = cgit_enable_log_linecount; |
93 | ret->module_link = cgit_module_link; | 106 | ret->module_link = cgit_module_link; |
94 | return ret; | 107 | return ret; |
95 | } | 108 | } |
96 | 109 | ||
110 | struct repoinfo *cgit_get_repoinfo(const char *url) | ||
111 | { | ||
112 | int i; | ||
113 | struct repoinfo *repo; | ||
114 | |||
115 | for (i=0; i<cgit_repolist.count; i++) { | ||
116 | repo = &cgit_repolist.repos[i]; | ||
117 | if (!strcmp(repo->url, url)) | ||
118 | return repo; | ||
119 | } | ||
120 | return NULL; | ||
121 | } | ||
122 | |||
97 | void cgit_global_config_cb(const char *name, const char *value) | 123 | void cgit_global_config_cb(const char *name, const char *value) |
98 | { | 124 | { |
99 | if (!strcmp(name, "root-title")) | 125 | if (!strcmp(name, "root-title")) |
100 | cgit_root_title = xstrdup(value); | 126 | cgit_root_title = xstrdup(value); |
101 | else if (!strcmp(name, "css")) | 127 | else if (!strcmp(name, "css")) |
102 | cgit_css = xstrdup(value); | 128 | cgit_css = xstrdup(value); |
103 | else if (!strcmp(name, "logo")) | 129 | else if (!strcmp(name, "logo")) |
104 | cgit_logo = xstrdup(value); | 130 | cgit_logo = xstrdup(value); |
105 | else if (!strcmp(name, "index-header")) | 131 | else if (!strcmp(name, "index-header")) |
106 | cgit_index_header = xstrdup(value); | 132 | cgit_index_header = xstrdup(value); |
107 | else if (!strcmp(name, "logo-link")) | 133 | else if (!strcmp(name, "logo-link")) |
108 | cgit_logo_link = xstrdup(value); | 134 | cgit_logo_link = xstrdup(value); |
109 | else if (!strcmp(name, "module-link")) | 135 | else if (!strcmp(name, "module-link")) |
110 | cgit_module_link = xstrdup(value); | 136 | cgit_module_link = xstrdup(value); |
111 | else if (!strcmp(name, "virtual-root")) | 137 | else if (!strcmp(name, "virtual-root")) |
112 | cgit_virtual_root = xstrdup(value); | 138 | cgit_virtual_root = xstrdup(value); |
113 | else if (!strcmp(name, "nocache")) | 139 | else if (!strcmp(name, "nocache")) |
114 | cgit_nocache = atoi(value); | 140 | cgit_nocache = atoi(value); |
115 | else if (!strcmp(name, "snapshots")) | 141 | else if (!strcmp(name, "snapshots")) |
116 | cgit_snapshots = atoi(value); | 142 | cgit_snapshots = atoi(value); |
117 | else if (!strcmp(name, "enable-log-filecount")) | 143 | else if (!strcmp(name, "enable-log-filecount")) |
118 | cgit_enable_log_filecount = atoi(value); | 144 | cgit_enable_log_filecount = atoi(value); |
119 | else if (!strcmp(name, "enable-log-linecount")) | 145 | else if (!strcmp(name, "enable-log-linecount")) |
120 | cgit_enable_log_linecount = atoi(value); | 146 | cgit_enable_log_linecount = atoi(value); |
@@ -141,50 +167,54 @@ void cgit_global_config_cb(const char *name, const char *value) | |||
141 | else if (cgit_repo && !strcmp(name, "repo.path")) | 167 | else if (cgit_repo && !strcmp(name, "repo.path")) |
142 | cgit_repo->path = xstrdup(value); | 168 | cgit_repo->path = xstrdup(value); |
143 | else if (cgit_repo && !strcmp(name, "repo.desc")) | 169 | else if (cgit_repo && !strcmp(name, "repo.desc")) |
144 | cgit_repo->desc = xstrdup(value); | 170 | cgit_repo->desc = xstrdup(value); |
145 | else if (cgit_repo && !strcmp(name, "repo.owner")) | 171 | else if (cgit_repo && !strcmp(name, "repo.owner")) |
146 | cgit_repo->owner = xstrdup(value); | 172 | cgit_repo->owner = xstrdup(value); |
147 | else if (cgit_repo && !strcmp(name, "repo.defbranch")) | 173 | else if (cgit_repo && !strcmp(name, "repo.defbranch")) |
148 | cgit_repo->defbranch = xstrdup(value); | 174 | cgit_repo->defbranch = xstrdup(value); |
149 | else if (cgit_repo && !strcmp(name, "repo.snapshots")) | 175 | else if (cgit_repo && !strcmp(name, "repo.snapshots")) |
150 | cgit_repo->snapshots = cgit_snapshots * atoi(value); | 176 | cgit_repo->snapshots = cgit_snapshots * atoi(value); |
151 | else if (cgit_repo && !strcmp(name, "repo.enable-log-filecount")) | 177 | else if (cgit_repo && !strcmp(name, "repo.enable-log-filecount")) |
152 | cgit_repo->enable_log_filecount = cgit_enable_log_filecount * atoi(value); | 178 | cgit_repo->enable_log_filecount = cgit_enable_log_filecount * atoi(value); |
153 | else if (cgit_repo && !strcmp(name, "repo.enable-log-linecount")) | 179 | else if (cgit_repo && !strcmp(name, "repo.enable-log-linecount")) |
154 | cgit_repo->enable_log_linecount = cgit_enable_log_linecount * atoi(value); | 180 | cgit_repo->enable_log_linecount = cgit_enable_log_linecount * atoi(value); |
155 | else if (cgit_repo && !strcmp(name, "repo.module-link")) | 181 | else if (cgit_repo && !strcmp(name, "repo.module-link")) |
156 | cgit_repo->module_link= xstrdup(value); | 182 | cgit_repo->module_link= xstrdup(value); |
157 | else if (!strcmp(name, "include")) | 183 | else if (!strcmp(name, "include")) |
158 | cgit_read_config(value, cgit_global_config_cb); | 184 | cgit_read_config(value, cgit_global_config_cb); |
159 | } | 185 | } |
160 | 186 | ||
161 | void cgit_querystring_cb(const char *name, const char *value) | 187 | void cgit_querystring_cb(const char *name, const char *value) |
162 | { | 188 | { |
163 | if (!strcmp(name,"r")) { | 189 | if (!strcmp(name,"r")) { |
164 | cgit_query_repo = xstrdup(value); | 190 | cgit_query_repo = xstrdup(value); |
191 | cgit_repo = cgit_get_repoinfo(value); | ||
165 | } else if (!strcmp(name, "p")) { | 192 | } else if (!strcmp(name, "p")) { |
166 | cgit_query_page = xstrdup(value); | 193 | cgit_query_page = xstrdup(value); |
194 | cgit_cmd = cgit_get_cmd_index(value); | ||
195 | } else if (!strcmp(name, "url")) { | ||
196 | cgit_parse_url(value); | ||
167 | } else if (!strcmp(name, "q")) { | 197 | } else if (!strcmp(name, "q")) { |
168 | cgit_query_search = xstrdup(value); | 198 | cgit_query_search = xstrdup(value); |
169 | } else if (!strcmp(name, "h")) { | 199 | } else if (!strcmp(name, "h")) { |
170 | cgit_query_head = xstrdup(value); | 200 | cgit_query_head = xstrdup(value); |
171 | cgit_query_has_symref = 1; | 201 | cgit_query_has_symref = 1; |
172 | } else if (!strcmp(name, "id")) { | 202 | } else if (!strcmp(name, "id")) { |
173 | cgit_query_sha1 = xstrdup(value); | 203 | cgit_query_sha1 = xstrdup(value); |
174 | cgit_query_has_sha1 = 1; | 204 | cgit_query_has_sha1 = 1; |
175 | } else if (!strcmp(name, "id2")) { | 205 | } else if (!strcmp(name, "id2")) { |
176 | cgit_query_sha2 = xstrdup(value); | 206 | cgit_query_sha2 = xstrdup(value); |
177 | cgit_query_has_sha1 = 1; | 207 | cgit_query_has_sha1 = 1; |
178 | } else if (!strcmp(name, "ofs")) { | 208 | } else if (!strcmp(name, "ofs")) { |
179 | cgit_query_ofs = atoi(value); | 209 | cgit_query_ofs = atoi(value); |
180 | } else if (!strcmp(name, "path")) { | 210 | } else if (!strcmp(name, "path")) { |
181 | cgit_query_path = xstrdup(value); | 211 | cgit_query_path = xstrdup(value); |
182 | } else if (!strcmp(name, "name")) { | 212 | } else if (!strcmp(name, "name")) { |
183 | cgit_query_name = xstrdup(value); | 213 | cgit_query_name = xstrdup(value); |
184 | } | 214 | } |
185 | } | 215 | } |
186 | 216 | ||
187 | void *cgit_free_commitinfo(struct commitinfo *info) | 217 | void *cgit_free_commitinfo(struct commitinfo *info) |
188 | { | 218 | { |
189 | free(info->author); | 219 | free(info->author); |
190 | free(info->author_email); | 220 | free(info->author_email); |