author | Lars Hjemli <hjemli@gmail.com> | 2007-11-11 20:57:21 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2007-11-11 20:57:21 (UTC) |
commit | d267d88c9cb1fb4a45120b86e410ab604626c6bb (patch) (unidiff) | |
tree | 55ee3a76da83a6272e446f5201928fe1753ea30d /shared.c | |
parent | 1b7c5b2e0b918e9452694aace7c19194683989a8 (diff) | |
download | cgit-d267d88c9cb1fb4a45120b86e410ab604626c6bb.zip cgit-d267d88c9cb1fb4a45120b86e410ab604626c6bb.tar.gz cgit-d267d88c9cb1fb4a45120b86e410ab604626c6bb.tar.bz2 |
Add support for "robots" meta-tag
With this change, cgit will start to generate the "robots" meta-tag, using
a default value of "index, nofollow".
The default value can be modified with a new cgitrc variable, "robots".
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | shared.c | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -1,513 +1,516 @@ | |||
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 | int cgit_cmd; |
14 | 14 | ||
15 | const char *cgit_version = CGIT_VERSION; | 15 | const char *cgit_version = CGIT_VERSION; |
16 | 16 | ||
17 | char *cgit_root_title = "Git repository browser"; | 17 | char *cgit_root_title = "Git repository browser"; |
18 | char *cgit_css = "/cgit.css"; | 18 | char *cgit_css = "/cgit.css"; |
19 | char *cgit_logo = "/git-logo.png"; | 19 | char *cgit_logo = "/git-logo.png"; |
20 | char *cgit_index_header = NULL; | 20 | char *cgit_index_header = NULL; |
21 | char *cgit_index_info = NULL; | 21 | char *cgit_index_info = NULL; |
22 | char *cgit_logo_link = "http://www.kernel.org/pub/software/scm/git/docs/"; | 22 | char *cgit_logo_link = "http://www.kernel.org/pub/software/scm/git/docs/"; |
23 | char *cgit_module_link = "./?repo=%s&page=commit&id=%s"; | 23 | char *cgit_module_link = "./?repo=%s&page=commit&id=%s"; |
24 | char *cgit_agefile = "info/web/last-modified"; | 24 | char *cgit_agefile = "info/web/last-modified"; |
25 | char *cgit_virtual_root = NULL; | 25 | char *cgit_virtual_root = NULL; |
26 | char *cgit_script_name = CGIT_SCRIPT_NAME; | 26 | char *cgit_script_name = CGIT_SCRIPT_NAME; |
27 | char *cgit_cache_root = CGIT_CACHE_ROOT; | 27 | char *cgit_cache_root = CGIT_CACHE_ROOT; |
28 | char *cgit_repo_group = NULL; | 28 | char *cgit_repo_group = NULL; |
29 | char *cgit_robots = "index, nofollow"; | ||
29 | 30 | ||
30 | int cgit_nocache = 0; | 31 | int cgit_nocache = 0; |
31 | int cgit_snapshots = 0; | 32 | int cgit_snapshots = 0; |
32 | int cgit_enable_index_links = 0; | 33 | int cgit_enable_index_links = 0; |
33 | int cgit_enable_log_filecount = 0; | 34 | int cgit_enable_log_filecount = 0; |
34 | int cgit_enable_log_linecount = 0; | 35 | int cgit_enable_log_linecount = 0; |
35 | int cgit_max_lock_attempts = 5; | 36 | int cgit_max_lock_attempts = 5; |
36 | int cgit_cache_root_ttl = 5; | 37 | int cgit_cache_root_ttl = 5; |
37 | int cgit_cache_repo_ttl = 5; | 38 | int cgit_cache_repo_ttl = 5; |
38 | int cgit_cache_dynamic_ttl = 5; | 39 | int cgit_cache_dynamic_ttl = 5; |
39 | int cgit_cache_static_ttl = -1; | 40 | int cgit_cache_static_ttl = -1; |
40 | int cgit_cache_max_create_time = 5; | 41 | int cgit_cache_max_create_time = 5; |
41 | int cgit_summary_log = 0; | 42 | int cgit_summary_log = 0; |
42 | int cgit_summary_tags = 0; | 43 | int cgit_summary_tags = 0; |
43 | int cgit_summary_branches = 0; | 44 | int cgit_summary_branches = 0; |
44 | int cgit_renamelimit = -1; | 45 | int cgit_renamelimit = -1; |
45 | 46 | ||
46 | int cgit_max_msg_len = 60; | 47 | int cgit_max_msg_len = 60; |
47 | int cgit_max_repodesc_len = 60; | 48 | int cgit_max_repodesc_len = 60; |
48 | int cgit_max_commit_count = 50; | 49 | int cgit_max_commit_count = 50; |
49 | 50 | ||
50 | int cgit_query_has_symref = 0; | 51 | int cgit_query_has_symref = 0; |
51 | int cgit_query_has_sha1 = 0; | 52 | int cgit_query_has_sha1 = 0; |
52 | 53 | ||
53 | char *cgit_querystring = NULL; | 54 | char *cgit_querystring = NULL; |
54 | char *cgit_query_repo = NULL; | 55 | char *cgit_query_repo = NULL; |
55 | char *cgit_query_page = NULL; | 56 | char *cgit_query_page = NULL; |
56 | char *cgit_query_head = NULL; | 57 | char *cgit_query_head = NULL; |
57 | char *cgit_query_search = NULL; | 58 | char *cgit_query_search = NULL; |
58 | char *cgit_query_grep = NULL; | 59 | char *cgit_query_grep = NULL; |
59 | char *cgit_query_sha1 = NULL; | 60 | char *cgit_query_sha1 = NULL; |
60 | char *cgit_query_sha2 = NULL; | 61 | char *cgit_query_sha2 = NULL; |
61 | char *cgit_query_path = NULL; | 62 | char *cgit_query_path = NULL; |
62 | char *cgit_query_name = NULL; | 63 | char *cgit_query_name = NULL; |
63 | int cgit_query_ofs = 0; | 64 | int cgit_query_ofs = 0; |
64 | 65 | ||
65 | int htmlfd = 0; | 66 | int htmlfd = 0; |
66 | 67 | ||
67 | 68 | ||
68 | int cgit_get_cmd_index(const char *cmd) | 69 | int cgit_get_cmd_index(const char *cmd) |
69 | { | 70 | { |
70 | static char *cmds[] = {"log", "commit", "diff", "tree", "blob", | 71 | static char *cmds[] = {"log", "commit", "diff", "tree", "blob", |
71 | "snapshot", "tag", "refs", NULL}; | 72 | "snapshot", "tag", "refs", NULL}; |
72 | int i; | 73 | int i; |
73 | 74 | ||
74 | for(i = 0; cmds[i]; i++) | 75 | for(i = 0; cmds[i]; i++) |
75 | if (!strcmp(cmd, cmds[i])) | 76 | if (!strcmp(cmd, cmds[i])) |
76 | return i + 1; | 77 | return i + 1; |
77 | return 0; | 78 | return 0; |
78 | } | 79 | } |
79 | 80 | ||
80 | int chk_zero(int result, char *msg) | 81 | int chk_zero(int result, char *msg) |
81 | { | 82 | { |
82 | if (result != 0) | 83 | if (result != 0) |
83 | die("%s: %s", msg, strerror(errno)); | 84 | die("%s: %s", msg, strerror(errno)); |
84 | return result; | 85 | return result; |
85 | } | 86 | } |
86 | 87 | ||
87 | int chk_positive(int result, char *msg) | 88 | int chk_positive(int result, char *msg) |
88 | { | 89 | { |
89 | if (result <= 0) | 90 | if (result <= 0) |
90 | die("%s: %s", msg, strerror(errno)); | 91 | die("%s: %s", msg, strerror(errno)); |
91 | return result; | 92 | return result; |
92 | } | 93 | } |
93 | 94 | ||
94 | int chk_non_negative(int result, char *msg) | 95 | int chk_non_negative(int result, char *msg) |
95 | { | 96 | { |
96 | if (result < 0) | 97 | if (result < 0) |
97 | die("%s: %s",msg, strerror(errno)); | 98 | die("%s: %s",msg, strerror(errno)); |
98 | return result; | 99 | return result; |
99 | } | 100 | } |
100 | 101 | ||
101 | struct repoinfo *add_repo(const char *url) | 102 | struct repoinfo *add_repo(const char *url) |
102 | { | 103 | { |
103 | struct repoinfo *ret; | 104 | struct repoinfo *ret; |
104 | 105 | ||
105 | if (++cgit_repolist.count > cgit_repolist.length) { | 106 | if (++cgit_repolist.count > cgit_repolist.length) { |
106 | if (cgit_repolist.length == 0) | 107 | if (cgit_repolist.length == 0) |
107 | cgit_repolist.length = 8; | 108 | cgit_repolist.length = 8; |
108 | else | 109 | else |
109 | cgit_repolist.length *= 2; | 110 | cgit_repolist.length *= 2; |
110 | cgit_repolist.repos = xrealloc(cgit_repolist.repos, | 111 | cgit_repolist.repos = xrealloc(cgit_repolist.repos, |
111 | cgit_repolist.length * | 112 | cgit_repolist.length * |
112 | sizeof(struct repoinfo)); | 113 | sizeof(struct repoinfo)); |
113 | } | 114 | } |
114 | 115 | ||
115 | ret = &cgit_repolist.repos[cgit_repolist.count-1]; | 116 | ret = &cgit_repolist.repos[cgit_repolist.count-1]; |
116 | ret->url = trim_end(url, '/'); | 117 | ret->url = trim_end(url, '/'); |
117 | ret->name = ret->url; | 118 | ret->name = ret->url; |
118 | ret->path = NULL; | 119 | ret->path = NULL; |
119 | ret->desc = NULL; | 120 | ret->desc = NULL; |
120 | ret->owner = NULL; | 121 | ret->owner = NULL; |
121 | ret->group = cgit_repo_group; | 122 | ret->group = cgit_repo_group; |
122 | ret->defbranch = "master"; | 123 | ret->defbranch = "master"; |
123 | ret->snapshots = cgit_snapshots; | 124 | ret->snapshots = cgit_snapshots; |
124 | ret->enable_log_filecount = cgit_enable_log_filecount; | 125 | ret->enable_log_filecount = cgit_enable_log_filecount; |
125 | ret->enable_log_linecount = cgit_enable_log_linecount; | 126 | ret->enable_log_linecount = cgit_enable_log_linecount; |
126 | ret->module_link = cgit_module_link; | 127 | ret->module_link = cgit_module_link; |
127 | ret->readme = NULL; | 128 | ret->readme = NULL; |
128 | return ret; | 129 | return ret; |
129 | } | 130 | } |
130 | 131 | ||
131 | struct repoinfo *cgit_get_repoinfo(const char *url) | 132 | struct repoinfo *cgit_get_repoinfo(const char *url) |
132 | { | 133 | { |
133 | int i; | 134 | int i; |
134 | struct repoinfo *repo; | 135 | struct repoinfo *repo; |
135 | 136 | ||
136 | for (i=0; i<cgit_repolist.count; i++) { | 137 | for (i=0; i<cgit_repolist.count; i++) { |
137 | repo = &cgit_repolist.repos[i]; | 138 | repo = &cgit_repolist.repos[i]; |
138 | if (!strcmp(repo->url, url)) | 139 | if (!strcmp(repo->url, url)) |
139 | return repo; | 140 | return repo; |
140 | } | 141 | } |
141 | return NULL; | 142 | return NULL; |
142 | } | 143 | } |
143 | 144 | ||
144 | void cgit_global_config_cb(const char *name, const char *value) | 145 | void cgit_global_config_cb(const char *name, const char *value) |
145 | { | 146 | { |
146 | if (!strcmp(name, "root-title")) | 147 | if (!strcmp(name, "root-title")) |
147 | cgit_root_title = xstrdup(value); | 148 | cgit_root_title = xstrdup(value); |
148 | else if (!strcmp(name, "css")) | 149 | else if (!strcmp(name, "css")) |
149 | cgit_css = xstrdup(value); | 150 | cgit_css = xstrdup(value); |
150 | else if (!strcmp(name, "logo")) | 151 | else if (!strcmp(name, "logo")) |
151 | cgit_logo = xstrdup(value); | 152 | cgit_logo = xstrdup(value); |
152 | else if (!strcmp(name, "index-header")) | 153 | else if (!strcmp(name, "index-header")) |
153 | cgit_index_header = xstrdup(value); | 154 | cgit_index_header = xstrdup(value); |
154 | else if (!strcmp(name, "index-info")) | 155 | else if (!strcmp(name, "index-info")) |
155 | cgit_index_info = xstrdup(value); | 156 | cgit_index_info = xstrdup(value); |
156 | else if (!strcmp(name, "logo-link")) | 157 | else if (!strcmp(name, "logo-link")) |
157 | cgit_logo_link = xstrdup(value); | 158 | cgit_logo_link = xstrdup(value); |
158 | else if (!strcmp(name, "module-link")) | 159 | else if (!strcmp(name, "module-link")) |
159 | cgit_module_link = xstrdup(value); | 160 | cgit_module_link = xstrdup(value); |
160 | else if (!strcmp(name, "virtual-root")) { | 161 | else if (!strcmp(name, "virtual-root")) { |
161 | cgit_virtual_root = trim_end(value, '/'); | 162 | cgit_virtual_root = trim_end(value, '/'); |
162 | if (!cgit_virtual_root && (!strcmp(value, "/"))) | 163 | if (!cgit_virtual_root && (!strcmp(value, "/"))) |
163 | cgit_virtual_root = ""; | 164 | cgit_virtual_root = ""; |
164 | } else if (!strcmp(name, "nocache")) | 165 | } else if (!strcmp(name, "nocache")) |
165 | cgit_nocache = atoi(value); | 166 | cgit_nocache = atoi(value); |
166 | else if (!strcmp(name, "snapshots")) | 167 | else if (!strcmp(name, "snapshots")) |
167 | cgit_snapshots = cgit_parse_snapshots_mask(value); | 168 | cgit_snapshots = cgit_parse_snapshots_mask(value); |
168 | else if (!strcmp(name, "enable-index-links")) | 169 | else if (!strcmp(name, "enable-index-links")) |
169 | cgit_enable_index_links = atoi(value); | 170 | cgit_enable_index_links = atoi(value); |
170 | else if (!strcmp(name, "enable-log-filecount")) | 171 | else if (!strcmp(name, "enable-log-filecount")) |
171 | cgit_enable_log_filecount = atoi(value); | 172 | cgit_enable_log_filecount = atoi(value); |
172 | else if (!strcmp(name, "enable-log-linecount")) | 173 | else if (!strcmp(name, "enable-log-linecount")) |
173 | cgit_enable_log_linecount = atoi(value); | 174 | cgit_enable_log_linecount = atoi(value); |
174 | else if (!strcmp(name, "cache-root")) | 175 | else if (!strcmp(name, "cache-root")) |
175 | cgit_cache_root = xstrdup(value); | 176 | cgit_cache_root = xstrdup(value); |
176 | else if (!strcmp(name, "cache-root-ttl")) | 177 | else if (!strcmp(name, "cache-root-ttl")) |
177 | cgit_cache_root_ttl = atoi(value); | 178 | cgit_cache_root_ttl = atoi(value); |
178 | else if (!strcmp(name, "cache-repo-ttl")) | 179 | else if (!strcmp(name, "cache-repo-ttl")) |
179 | cgit_cache_repo_ttl = atoi(value); | 180 | cgit_cache_repo_ttl = atoi(value); |
180 | else if (!strcmp(name, "cache-static-ttl")) | 181 | else if (!strcmp(name, "cache-static-ttl")) |
181 | cgit_cache_static_ttl = atoi(value); | 182 | cgit_cache_static_ttl = atoi(value); |
182 | else if (!strcmp(name, "cache-dynamic-ttl")) | 183 | else if (!strcmp(name, "cache-dynamic-ttl")) |
183 | cgit_cache_dynamic_ttl = atoi(value); | 184 | cgit_cache_dynamic_ttl = atoi(value); |
184 | else if (!strcmp(name, "max-message-length")) | 185 | else if (!strcmp(name, "max-message-length")) |
185 | cgit_max_msg_len = atoi(value); | 186 | cgit_max_msg_len = atoi(value); |
186 | else if (!strcmp(name, "max-repodesc-length")) | 187 | else if (!strcmp(name, "max-repodesc-length")) |
187 | cgit_max_repodesc_len = atoi(value); | 188 | cgit_max_repodesc_len = atoi(value); |
188 | else if (!strcmp(name, "max-commit-count")) | 189 | else if (!strcmp(name, "max-commit-count")) |
189 | cgit_max_commit_count = atoi(value); | 190 | cgit_max_commit_count = atoi(value); |
190 | else if (!strcmp(name, "summary-log")) | 191 | else if (!strcmp(name, "summary-log")) |
191 | cgit_summary_log = atoi(value); | 192 | cgit_summary_log = atoi(value); |
192 | else if (!strcmp(name, "summary-branches")) | 193 | else if (!strcmp(name, "summary-branches")) |
193 | cgit_summary_branches = atoi(value); | 194 | cgit_summary_branches = atoi(value); |
194 | else if (!strcmp(name, "summary-tags")) | 195 | else if (!strcmp(name, "summary-tags")) |
195 | cgit_summary_tags = atoi(value); | 196 | cgit_summary_tags = atoi(value); |
196 | else if (!strcmp(name, "agefile")) | 197 | else if (!strcmp(name, "agefile")) |
197 | cgit_agefile = xstrdup(value); | 198 | cgit_agefile = xstrdup(value); |
198 | else if (!strcmp(name, "renamelimit")) | 199 | else if (!strcmp(name, "renamelimit")) |
199 | cgit_renamelimit = atoi(value); | 200 | cgit_renamelimit = atoi(value); |
201 | else if (!strcmp(name, "robots")) | ||
202 | cgit_robots = xstrdup(value); | ||
200 | else if (!strcmp(name, "repo.group")) | 203 | else if (!strcmp(name, "repo.group")) |
201 | cgit_repo_group = xstrdup(value); | 204 | cgit_repo_group = xstrdup(value); |
202 | else if (!strcmp(name, "repo.url")) | 205 | else if (!strcmp(name, "repo.url")) |
203 | cgit_repo = add_repo(value); | 206 | cgit_repo = add_repo(value); |
204 | else if (!strcmp(name, "repo.name")) | 207 | else if (!strcmp(name, "repo.name")) |
205 | cgit_repo->name = xstrdup(value); | 208 | cgit_repo->name = xstrdup(value); |
206 | else if (cgit_repo && !strcmp(name, "repo.path")) | 209 | else if (cgit_repo && !strcmp(name, "repo.path")) |
207 | cgit_repo->path = trim_end(value, '/'); | 210 | cgit_repo->path = trim_end(value, '/'); |
208 | else if (cgit_repo && !strcmp(name, "repo.desc")) | 211 | else if (cgit_repo && !strcmp(name, "repo.desc")) |
209 | cgit_repo->desc = xstrdup(value); | 212 | cgit_repo->desc = xstrdup(value); |
210 | else if (cgit_repo && !strcmp(name, "repo.owner")) | 213 | else if (cgit_repo && !strcmp(name, "repo.owner")) |
211 | cgit_repo->owner = xstrdup(value); | 214 | cgit_repo->owner = xstrdup(value); |
212 | else if (cgit_repo && !strcmp(name, "repo.defbranch")) | 215 | else if (cgit_repo && !strcmp(name, "repo.defbranch")) |
213 | cgit_repo->defbranch = xstrdup(value); | 216 | cgit_repo->defbranch = xstrdup(value); |
214 | else if (cgit_repo && !strcmp(name, "repo.snapshots")) | 217 | else if (cgit_repo && !strcmp(name, "repo.snapshots")) |
215 | cgit_repo->snapshots = cgit_snapshots & cgit_parse_snapshots_mask(value); /* XXX: &? */ | 218 | cgit_repo->snapshots = cgit_snapshots & cgit_parse_snapshots_mask(value); /* XXX: &? */ |
216 | else if (cgit_repo && !strcmp(name, "repo.enable-log-filecount")) | 219 | else if (cgit_repo && !strcmp(name, "repo.enable-log-filecount")) |
217 | cgit_repo->enable_log_filecount = cgit_enable_log_filecount * atoi(value); | 220 | cgit_repo->enable_log_filecount = cgit_enable_log_filecount * atoi(value); |
218 | else if (cgit_repo && !strcmp(name, "repo.enable-log-linecount")) | 221 | else if (cgit_repo && !strcmp(name, "repo.enable-log-linecount")) |
219 | cgit_repo->enable_log_linecount = cgit_enable_log_linecount * atoi(value); | 222 | cgit_repo->enable_log_linecount = cgit_enable_log_linecount * atoi(value); |
220 | else if (cgit_repo && !strcmp(name, "repo.module-link")) | 223 | else if (cgit_repo && !strcmp(name, "repo.module-link")) |
221 | cgit_repo->module_link= xstrdup(value); | 224 | cgit_repo->module_link= xstrdup(value); |
222 | else if (cgit_repo && !strcmp(name, "repo.readme") && value != NULL) { | 225 | else if (cgit_repo && !strcmp(name, "repo.readme") && value != NULL) { |
223 | if (*value == '/') | 226 | if (*value == '/') |
224 | cgit_repo->readme = xstrdup(value); | 227 | cgit_repo->readme = xstrdup(value); |
225 | else | 228 | else |
226 | cgit_repo->readme = xstrdup(fmt("%s/%s", cgit_repo->path, value)); | 229 | cgit_repo->readme = xstrdup(fmt("%s/%s", cgit_repo->path, value)); |
227 | } else if (!strcmp(name, "include")) | 230 | } else if (!strcmp(name, "include")) |
228 | cgit_read_config(value, cgit_global_config_cb); | 231 | cgit_read_config(value, cgit_global_config_cb); |
229 | } | 232 | } |
230 | 233 | ||
231 | void cgit_querystring_cb(const char *name, const char *value) | 234 | void cgit_querystring_cb(const char *name, const char *value) |
232 | { | 235 | { |
233 | if (!strcmp(name,"r")) { | 236 | if (!strcmp(name,"r")) { |
234 | cgit_query_repo = xstrdup(value); | 237 | cgit_query_repo = xstrdup(value); |
235 | cgit_repo = cgit_get_repoinfo(value); | 238 | cgit_repo = cgit_get_repoinfo(value); |
236 | } else if (!strcmp(name, "p")) { | 239 | } else if (!strcmp(name, "p")) { |
237 | cgit_query_page = xstrdup(value); | 240 | cgit_query_page = xstrdup(value); |
238 | cgit_cmd = cgit_get_cmd_index(value); | 241 | cgit_cmd = cgit_get_cmd_index(value); |
239 | } else if (!strcmp(name, "url")) { | 242 | } else if (!strcmp(name, "url")) { |
240 | cgit_parse_url(value); | 243 | cgit_parse_url(value); |
241 | } else if (!strcmp(name, "qt")) { | 244 | } else if (!strcmp(name, "qt")) { |
242 | cgit_query_grep = xstrdup(value); | 245 | cgit_query_grep = xstrdup(value); |
243 | } else if (!strcmp(name, "q")) { | 246 | } else if (!strcmp(name, "q")) { |
244 | cgit_query_search = xstrdup(value); | 247 | cgit_query_search = xstrdup(value); |
245 | } else if (!strcmp(name, "h")) { | 248 | } else if (!strcmp(name, "h")) { |
246 | cgit_query_head = xstrdup(value); | 249 | cgit_query_head = xstrdup(value); |
247 | cgit_query_has_symref = 1; | 250 | cgit_query_has_symref = 1; |
248 | } else if (!strcmp(name, "id")) { | 251 | } else if (!strcmp(name, "id")) { |
249 | cgit_query_sha1 = xstrdup(value); | 252 | cgit_query_sha1 = xstrdup(value); |
250 | cgit_query_has_sha1 = 1; | 253 | cgit_query_has_sha1 = 1; |
251 | } else if (!strcmp(name, "id2")) { | 254 | } else if (!strcmp(name, "id2")) { |
252 | cgit_query_sha2 = xstrdup(value); | 255 | cgit_query_sha2 = xstrdup(value); |
253 | cgit_query_has_sha1 = 1; | 256 | cgit_query_has_sha1 = 1; |
254 | } else if (!strcmp(name, "ofs")) { | 257 | } else if (!strcmp(name, "ofs")) { |
255 | cgit_query_ofs = atoi(value); | 258 | cgit_query_ofs = atoi(value); |
256 | } else if (!strcmp(name, "path")) { | 259 | } else if (!strcmp(name, "path")) { |
257 | cgit_query_path = trim_end(value, '/'); | 260 | cgit_query_path = trim_end(value, '/'); |
258 | } else if (!strcmp(name, "name")) { | 261 | } else if (!strcmp(name, "name")) { |
259 | cgit_query_name = xstrdup(value); | 262 | cgit_query_name = xstrdup(value); |
260 | } | 263 | } |
261 | } | 264 | } |
262 | 265 | ||
263 | void *cgit_free_commitinfo(struct commitinfo *info) | 266 | void *cgit_free_commitinfo(struct commitinfo *info) |
264 | { | 267 | { |
265 | free(info->author); | 268 | free(info->author); |
266 | free(info->author_email); | 269 | free(info->author_email); |
267 | free(info->committer); | 270 | free(info->committer); |
268 | free(info->committer_email); | 271 | free(info->committer_email); |
269 | free(info->subject); | 272 | free(info->subject); |
270 | free(info->msg); | 273 | free(info->msg); |
271 | free(info->msg_encoding); | 274 | free(info->msg_encoding); |
272 | free(info); | 275 | free(info); |
273 | return NULL; | 276 | return NULL; |
274 | } | 277 | } |
275 | 278 | ||
276 | int hextoint(char c) | 279 | int hextoint(char c) |
277 | { | 280 | { |
278 | if (c >= 'a' && c <= 'f') | 281 | if (c >= 'a' && c <= 'f') |
279 | return 10 + c - 'a'; | 282 | return 10 + c - 'a'; |
280 | else if (c >= 'A' && c <= 'F') | 283 | else if (c >= 'A' && c <= 'F') |
281 | return 10 + c - 'A'; | 284 | return 10 + c - 'A'; |
282 | else if (c >= '0' && c <= '9') | 285 | else if (c >= '0' && c <= '9') |
283 | return c - '0'; | 286 | return c - '0'; |
284 | else | 287 | else |
285 | return -1; | 288 | return -1; |
286 | } | 289 | } |
287 | 290 | ||
288 | char *trim_end(const char *str, char c) | 291 | char *trim_end(const char *str, char c) |
289 | { | 292 | { |
290 | int len; | 293 | int len; |
291 | char *s, *t; | 294 | char *s, *t; |
292 | 295 | ||
293 | if (str == NULL) | 296 | if (str == NULL) |
294 | return NULL; | 297 | return NULL; |
295 | t = (char *)str; | 298 | t = (char *)str; |
296 | len = strlen(t); | 299 | len = strlen(t); |
297 | while(len > 0 && t[len - 1] == c) | 300 | while(len > 0 && t[len - 1] == c) |
298 | len--; | 301 | len--; |
299 | 302 | ||
300 | if (len == 0) | 303 | if (len == 0) |
301 | return NULL; | 304 | return NULL; |
302 | 305 | ||
303 | c = t[len]; | 306 | c = t[len]; |
304 | t[len] = '\0'; | 307 | t[len] = '\0'; |
305 | s = xstrdup(t); | 308 | s = xstrdup(t); |
306 | t[len] = c; | 309 | t[len] = c; |
307 | return s; | 310 | return s; |
308 | } | 311 | } |
309 | 312 | ||
310 | char *strlpart(char *txt, int maxlen) | 313 | char *strlpart(char *txt, int maxlen) |
311 | { | 314 | { |
312 | char *result; | 315 | char *result; |
313 | 316 | ||
314 | if (!txt) | 317 | if (!txt) |
315 | return txt; | 318 | return txt; |
316 | 319 | ||
317 | if (strlen(txt) <= maxlen) | 320 | if (strlen(txt) <= maxlen) |
318 | return txt; | 321 | return txt; |
319 | result = xmalloc(maxlen + 1); | 322 | result = xmalloc(maxlen + 1); |
320 | memcpy(result, txt, maxlen - 3); | 323 | memcpy(result, txt, maxlen - 3); |
321 | result[maxlen-1] = result[maxlen-2] = result[maxlen-3] = '.'; | 324 | result[maxlen-1] = result[maxlen-2] = result[maxlen-3] = '.'; |
322 | result[maxlen] = '\0'; | 325 | result[maxlen] = '\0'; |
323 | return result; | 326 | return result; |
324 | } | 327 | } |
325 | 328 | ||
326 | char *strrpart(char *txt, int maxlen) | 329 | char *strrpart(char *txt, int maxlen) |
327 | { | 330 | { |
328 | char *result; | 331 | char *result; |
329 | 332 | ||
330 | if (!txt) | 333 | if (!txt) |
331 | return txt; | 334 | return txt; |
332 | 335 | ||
333 | if (strlen(txt) <= maxlen) | 336 | if (strlen(txt) <= maxlen) |
334 | return txt; | 337 | return txt; |
335 | result = xmalloc(maxlen + 1); | 338 | result = xmalloc(maxlen + 1); |
336 | memcpy(result + 3, txt + strlen(txt) - maxlen + 4, maxlen - 3); | 339 | memcpy(result + 3, txt + strlen(txt) - maxlen + 4, maxlen - 3); |
337 | result[0] = result[1] = result[2] = '.'; | 340 | result[0] = result[1] = result[2] = '.'; |
338 | return result; | 341 | return result; |
339 | } | 342 | } |
340 | 343 | ||
341 | void cgit_add_ref(struct reflist *list, struct refinfo *ref) | 344 | void cgit_add_ref(struct reflist *list, struct refinfo *ref) |
342 | { | 345 | { |
343 | size_t size; | 346 | size_t size; |
344 | 347 | ||
345 | if (list->count >= list->alloc) { | 348 | if (list->count >= list->alloc) { |
346 | list->alloc += (list->alloc ? list->alloc : 4); | 349 | list->alloc += (list->alloc ? list->alloc : 4); |
347 | size = list->alloc * sizeof(struct refinfo *); | 350 | size = list->alloc * sizeof(struct refinfo *); |
348 | list->refs = xrealloc(list->refs, size); | 351 | list->refs = xrealloc(list->refs, size); |
349 | } | 352 | } |
350 | list->refs[list->count++] = ref; | 353 | list->refs[list->count++] = ref; |
351 | } | 354 | } |
352 | 355 | ||
353 | struct refinfo *cgit_mk_refinfo(const char *refname, const unsigned char *sha1) | 356 | struct refinfo *cgit_mk_refinfo(const char *refname, const unsigned char *sha1) |
354 | { | 357 | { |
355 | struct refinfo *ref; | 358 | struct refinfo *ref; |
356 | 359 | ||
357 | ref = xmalloc(sizeof (struct refinfo)); | 360 | ref = xmalloc(sizeof (struct refinfo)); |
358 | ref->refname = xstrdup(refname); | 361 | ref->refname = xstrdup(refname); |
359 | ref->object = parse_object(sha1); | 362 | ref->object = parse_object(sha1); |
360 | switch (ref->object->type) { | 363 | switch (ref->object->type) { |
361 | case OBJ_TAG: | 364 | case OBJ_TAG: |
362 | ref->tag = cgit_parse_tag((struct tag *)ref->object); | 365 | ref->tag = cgit_parse_tag((struct tag *)ref->object); |
363 | break; | 366 | break; |
364 | case OBJ_COMMIT: | 367 | case OBJ_COMMIT: |
365 | ref->commit = cgit_parse_commit((struct commit *)ref->object); | 368 | ref->commit = cgit_parse_commit((struct commit *)ref->object); |
366 | break; | 369 | break; |
367 | } | 370 | } |
368 | return ref; | 371 | return ref; |
369 | } | 372 | } |
370 | 373 | ||
371 | int cgit_refs_cb(const char *refname, const unsigned char *sha1, int flags, | 374 | int cgit_refs_cb(const char *refname, const unsigned char *sha1, int flags, |
372 | void *cb_data) | 375 | void *cb_data) |
373 | { | 376 | { |
374 | struct reflist *list = (struct reflist *)cb_data; | 377 | struct reflist *list = (struct reflist *)cb_data; |
375 | struct refinfo *info = cgit_mk_refinfo(refname, sha1); | 378 | struct refinfo *info = cgit_mk_refinfo(refname, sha1); |
376 | 379 | ||
377 | if (info) | 380 | if (info) |
378 | cgit_add_ref(list, info); | 381 | cgit_add_ref(list, info); |
379 | return 0; | 382 | return 0; |
380 | } | 383 | } |
381 | 384 | ||
382 | void cgit_diff_tree_cb(struct diff_queue_struct *q, | 385 | void cgit_diff_tree_cb(struct diff_queue_struct *q, |
383 | struct diff_options *options, void *data) | 386 | struct diff_options *options, void *data) |
384 | { | 387 | { |
385 | int i; | 388 | int i; |
386 | 389 | ||
387 | for (i = 0; i < q->nr; i++) { | 390 | for (i = 0; i < q->nr; i++) { |
388 | if (q->queue[i]->status == 'U') | 391 | if (q->queue[i]->status == 'U') |
389 | continue; | 392 | continue; |
390 | ((filepair_fn)data)(q->queue[i]); | 393 | ((filepair_fn)data)(q->queue[i]); |
391 | } | 394 | } |
392 | } | 395 | } |
393 | 396 | ||
394 | static int load_mmfile(mmfile_t *file, const unsigned char *sha1) | 397 | static int load_mmfile(mmfile_t *file, const unsigned char *sha1) |
395 | { | 398 | { |
396 | enum object_type type; | 399 | enum object_type type; |
397 | 400 | ||
398 | if (is_null_sha1(sha1)) { | 401 | if (is_null_sha1(sha1)) { |
399 | file->ptr = (char *)""; | 402 | file->ptr = (char *)""; |
400 | file->size = 0; | 403 | file->size = 0; |
401 | } else { | 404 | } else { |
402 | file->ptr = read_sha1_file(sha1, &type, | 405 | file->ptr = read_sha1_file(sha1, &type, |
403 | (unsigned long *)&file->size); | 406 | (unsigned long *)&file->size); |
404 | } | 407 | } |
405 | return 1; | 408 | return 1; |
406 | } | 409 | } |
407 | 410 | ||
408 | /* | 411 | /* |
409 | * Receive diff-buffers from xdiff and concatenate them as | 412 | * Receive diff-buffers from xdiff and concatenate them as |
410 | * needed across multiple callbacks. | 413 | * needed across multiple callbacks. |
411 | * | 414 | * |
412 | * This is basically a copy of xdiff-interface.c/xdiff_outf(), | 415 | * This is basically a copy of xdiff-interface.c/xdiff_outf(), |
413 | * ripped from git and modified to use globals instead of | 416 | * ripped from git and modified to use globals instead of |
414 | * a special callback-struct. | 417 | * a special callback-struct. |
415 | */ | 418 | */ |
416 | char *diffbuf = NULL; | 419 | char *diffbuf = NULL; |
417 | int buflen = 0; | 420 | int buflen = 0; |
418 | 421 | ||
419 | int filediff_cb(void *priv, mmbuffer_t *mb, int nbuf) | 422 | int filediff_cb(void *priv, mmbuffer_t *mb, int nbuf) |
420 | { | 423 | { |
421 | int i; | 424 | int i; |
422 | 425 | ||
423 | for (i = 0; i < nbuf; i++) { | 426 | for (i = 0; i < nbuf; i++) { |
424 | if (mb[i].ptr[mb[i].size-1] != '\n') { | 427 | if (mb[i].ptr[mb[i].size-1] != '\n') { |
425 | /* Incomplete line */ | 428 | /* Incomplete line */ |
426 | diffbuf = xrealloc(diffbuf, buflen + mb[i].size); | 429 | diffbuf = xrealloc(diffbuf, buflen + mb[i].size); |
427 | memcpy(diffbuf + buflen, mb[i].ptr, mb[i].size); | 430 | memcpy(diffbuf + buflen, mb[i].ptr, mb[i].size); |
428 | buflen += mb[i].size; | 431 | buflen += mb[i].size; |
429 | continue; | 432 | continue; |
430 | } | 433 | } |
431 | 434 | ||
432 | /* we have a complete line */ | 435 | /* we have a complete line */ |
433 | if (!diffbuf) { | 436 | if (!diffbuf) { |
434 | ((linediff_fn)priv)(mb[i].ptr, mb[i].size); | 437 | ((linediff_fn)priv)(mb[i].ptr, mb[i].size); |
435 | continue; | 438 | continue; |
436 | } | 439 | } |
437 | diffbuf = xrealloc(diffbuf, buflen + mb[i].size); | 440 | diffbuf = xrealloc(diffbuf, buflen + mb[i].size); |
438 | memcpy(diffbuf + buflen, mb[i].ptr, mb[i].size); | 441 | memcpy(diffbuf + buflen, mb[i].ptr, mb[i].size); |
439 | ((linediff_fn)priv)(diffbuf, buflen + mb[i].size); | 442 | ((linediff_fn)priv)(diffbuf, buflen + mb[i].size); |
440 | free(diffbuf); | 443 | free(diffbuf); |
441 | diffbuf = NULL; | 444 | diffbuf = NULL; |
442 | buflen = 0; | 445 | buflen = 0; |
443 | } | 446 | } |
444 | if (diffbuf) { | 447 | if (diffbuf) { |
445 | ((linediff_fn)priv)(diffbuf, buflen); | 448 | ((linediff_fn)priv)(diffbuf, buflen); |
446 | free(diffbuf); | 449 | free(diffbuf); |
447 | diffbuf = NULL; | 450 | diffbuf = NULL; |
448 | buflen = 0; | 451 | buflen = 0; |
449 | } | 452 | } |
450 | return 0; | 453 | return 0; |
451 | } | 454 | } |
452 | 455 | ||
453 | int cgit_diff_files(const unsigned char *old_sha1, | 456 | int cgit_diff_files(const unsigned char *old_sha1, |
454 | const unsigned char *new_sha1, | 457 | const unsigned char *new_sha1, |
455 | linediff_fn fn) | 458 | linediff_fn fn) |
456 | { | 459 | { |
457 | mmfile_t file1, file2; | 460 | mmfile_t file1, file2; |
458 | xpparam_t diff_params; | 461 | xpparam_t diff_params; |
459 | xdemitconf_t emit_params; | 462 | xdemitconf_t emit_params; |
460 | xdemitcb_t emit_cb; | 463 | xdemitcb_t emit_cb; |
461 | 464 | ||
462 | if (!load_mmfile(&file1, old_sha1) || !load_mmfile(&file2, new_sha1)) | 465 | if (!load_mmfile(&file1, old_sha1) || !load_mmfile(&file2, new_sha1)) |
463 | return 1; | 466 | return 1; |
464 | 467 | ||
465 | diff_params.flags = XDF_NEED_MINIMAL; | 468 | diff_params.flags = XDF_NEED_MINIMAL; |
466 | emit_params.ctxlen = 3; | 469 | emit_params.ctxlen = 3; |
467 | emit_params.flags = XDL_EMIT_FUNCNAMES; | 470 | emit_params.flags = XDL_EMIT_FUNCNAMES; |
468 | emit_params.find_func = NULL; | 471 | emit_params.find_func = NULL; |
469 | emit_cb.outf = filediff_cb; | 472 | emit_cb.outf = filediff_cb; |
470 | emit_cb.priv = fn; | 473 | emit_cb.priv = fn; |
471 | xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb); | 474 | xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb); |
472 | return 0; | 475 | return 0; |
473 | } | 476 | } |
474 | 477 | ||
475 | void cgit_diff_tree(const unsigned char *old_sha1, | 478 | void cgit_diff_tree(const unsigned char *old_sha1, |
476 | const unsigned char *new_sha1, | 479 | const unsigned char *new_sha1, |
477 | filepair_fn fn, const char *prefix) | 480 | filepair_fn fn, const char *prefix) |
478 | { | 481 | { |
479 | struct diff_options opt; | 482 | struct diff_options opt; |
480 | int ret; | 483 | int ret; |
481 | int prefixlen; | 484 | int prefixlen; |
482 | 485 | ||
483 | diff_setup(&opt); | 486 | diff_setup(&opt); |
484 | opt.output_format = DIFF_FORMAT_CALLBACK; | 487 | opt.output_format = DIFF_FORMAT_CALLBACK; |
485 | opt.detect_rename = 1; | 488 | opt.detect_rename = 1; |
486 | opt.rename_limit = cgit_renamelimit; | 489 | opt.rename_limit = cgit_renamelimit; |
487 | opt.recursive = 1; | 490 | opt.recursive = 1; |
488 | opt.format_callback = cgit_diff_tree_cb; | 491 | opt.format_callback = cgit_diff_tree_cb; |
489 | opt.format_callback_data = fn; | 492 | opt.format_callback_data = fn; |
490 | if (prefix) { | 493 | if (prefix) { |
491 | opt.nr_paths = 1; | 494 | opt.nr_paths = 1; |
492 | opt.paths = &prefix; | 495 | opt.paths = &prefix; |
493 | prefixlen = strlen(prefix); | 496 | prefixlen = strlen(prefix); |
494 | opt.pathlens = &prefixlen; | 497 | opt.pathlens = &prefixlen; |
495 | } | 498 | } |
496 | diff_setup_done(&opt); | 499 | diff_setup_done(&opt); |
497 | 500 | ||
498 | if (old_sha1 && !is_null_sha1(old_sha1)) | 501 | if (old_sha1 && !is_null_sha1(old_sha1)) |
499 | ret = diff_tree_sha1(old_sha1, new_sha1, "", &opt); | 502 | ret = diff_tree_sha1(old_sha1, new_sha1, "", &opt); |
500 | else | 503 | else |
501 | ret = diff_root_tree_sha1(new_sha1, "", &opt); | 504 | ret = diff_root_tree_sha1(new_sha1, "", &opt); |
502 | diffcore_std(&opt); | 505 | diffcore_std(&opt); |
503 | diff_flush(&opt); | 506 | diff_flush(&opt); |
504 | } | 507 | } |
505 | 508 | ||
506 | void cgit_diff_commit(struct commit *commit, filepair_fn fn) | 509 | void cgit_diff_commit(struct commit *commit, filepair_fn fn) |
507 | { | 510 | { |
508 | unsigned char *old_sha1 = NULL; | 511 | unsigned char *old_sha1 = NULL; |
509 | 512 | ||
510 | if (commit->parents) | 513 | if (commit->parents) |
511 | old_sha1 = commit->parents->item->object.sha1; | 514 | old_sha1 = commit->parents->item->object.sha1; |
512 | cgit_diff_tree(old_sha1, commit->object.sha1, fn, NULL); | 515 | cgit_diff_tree(old_sha1, commit->object.sha1, fn, NULL); |
513 | } | 516 | } |