author | Evan Martin <martine@xen.localdomain> | 2007-12-02 22:39:30 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2007-12-02 23:21:44 (UTC) |
commit | 7b346647c9d8cc3b4acccecc3ede526dc4b2fb06 (patch) (unidiff) | |
tree | 0c19269fe65337ee04e960017140c32e65f2d21c | |
parent | fc4c4ba3a99f4fe4bd8a42caca902269d2e0b678 (diff) | |
download | cgit-7b346647c9d8cc3b4acccecc3ede526dc4b2fb06.zip cgit-7b346647c9d8cc3b4acccecc3ede526dc4b2fb06.tar.gz cgit-7b346647c9d8cc3b4acccecc3ede526dc4b2fb06.tar.bz2 |
Default repo description to "[no description]"
Otherwise, when you leave out a description for a repository, the NULL
default causes cgit to print out titles like "cgit - (null)".
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | shared.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1,247 +1,247 @@ | |||
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 | 29 | ||
30 | int cgit_nocache = 0; | 30 | int cgit_nocache = 0; |
31 | int cgit_snapshots = 0; | 31 | int cgit_snapshots = 0; |
32 | int cgit_enable_index_links = 0; | 32 | int cgit_enable_index_links = 0; |
33 | int cgit_enable_log_filecount = 0; | 33 | int cgit_enable_log_filecount = 0; |
34 | int cgit_enable_log_linecount = 0; | 34 | int cgit_enable_log_linecount = 0; |
35 | int cgit_max_lock_attempts = 5; | 35 | int cgit_max_lock_attempts = 5; |
36 | int cgit_cache_root_ttl = 5; | 36 | int cgit_cache_root_ttl = 5; |
37 | int cgit_cache_repo_ttl = 5; | 37 | int cgit_cache_repo_ttl = 5; |
38 | int cgit_cache_dynamic_ttl = 5; | 38 | int cgit_cache_dynamic_ttl = 5; |
39 | int cgit_cache_static_ttl = -1; | 39 | int cgit_cache_static_ttl = -1; |
40 | int cgit_cache_max_create_time = 5; | 40 | int cgit_cache_max_create_time = 5; |
41 | int cgit_summary_log = 0; | 41 | int cgit_summary_log = 0; |
42 | int cgit_summary_tags = 0; | 42 | int cgit_summary_tags = 0; |
43 | int cgit_summary_branches = 0; | 43 | int cgit_summary_branches = 0; |
44 | int cgit_renamelimit = -1; | 44 | int cgit_renamelimit = -1; |
45 | 45 | ||
46 | int cgit_max_msg_len = 60; | 46 | int cgit_max_msg_len = 60; |
47 | int cgit_max_repodesc_len = 60; | 47 | int cgit_max_repodesc_len = 60; |
48 | int cgit_max_commit_count = 50; | 48 | int cgit_max_commit_count = 50; |
49 | 49 | ||
50 | int cgit_query_has_symref = 0; | 50 | int cgit_query_has_symref = 0; |
51 | int cgit_query_has_sha1 = 0; | 51 | int cgit_query_has_sha1 = 0; |
52 | 52 | ||
53 | char *cgit_querystring = NULL; | 53 | char *cgit_querystring = NULL; |
54 | char *cgit_query_repo = NULL; | 54 | char *cgit_query_repo = NULL; |
55 | char *cgit_query_page = NULL; | 55 | char *cgit_query_page = NULL; |
56 | char *cgit_query_head = NULL; | 56 | char *cgit_query_head = NULL; |
57 | char *cgit_query_search = NULL; | 57 | char *cgit_query_search = NULL; |
58 | char *cgit_query_grep = NULL; | 58 | char *cgit_query_grep = NULL; |
59 | char *cgit_query_sha1 = NULL; | 59 | char *cgit_query_sha1 = NULL; |
60 | char *cgit_query_sha2 = NULL; | 60 | char *cgit_query_sha2 = NULL; |
61 | char *cgit_query_path = NULL; | 61 | char *cgit_query_path = NULL; |
62 | char *cgit_query_name = NULL; | 62 | char *cgit_query_name = NULL; |
63 | int cgit_query_ofs = 0; | 63 | int cgit_query_ofs = 0; |
64 | 64 | ||
65 | int htmlfd = 0; | 65 | int htmlfd = 0; |
66 | 66 | ||
67 | 67 | ||
68 | int cgit_get_cmd_index(const char *cmd) | 68 | int cgit_get_cmd_index(const char *cmd) |
69 | { | 69 | { |
70 | static char *cmds[] = {"log", "commit", "diff", "tree", "blob", | 70 | static char *cmds[] = {"log", "commit", "diff", "tree", "blob", |
71 | "snapshot", "tag", "refs", NULL}; | 71 | "snapshot", "tag", "refs", NULL}; |
72 | int i; | 72 | int i; |
73 | 73 | ||
74 | for(i = 0; cmds[i]; i++) | 74 | for(i = 0; cmds[i]; i++) |
75 | if (!strcmp(cmd, cmds[i])) | 75 | if (!strcmp(cmd, cmds[i])) |
76 | return i + 1; | 76 | return i + 1; |
77 | return 0; | 77 | return 0; |
78 | } | 78 | } |
79 | 79 | ||
80 | int chk_zero(int result, char *msg) | 80 | int chk_zero(int result, char *msg) |
81 | { | 81 | { |
82 | if (result != 0) | 82 | if (result != 0) |
83 | die("%s: %s", msg, strerror(errno)); | 83 | die("%s: %s", msg, strerror(errno)); |
84 | return result; | 84 | return result; |
85 | } | 85 | } |
86 | 86 | ||
87 | int chk_positive(int result, char *msg) | 87 | int chk_positive(int result, char *msg) |
88 | { | 88 | { |
89 | if (result <= 0) | 89 | if (result <= 0) |
90 | die("%s: %s", msg, strerror(errno)); | 90 | die("%s: %s", msg, strerror(errno)); |
91 | return result; | 91 | return result; |
92 | } | 92 | } |
93 | 93 | ||
94 | int chk_non_negative(int result, char *msg) | 94 | int chk_non_negative(int result, char *msg) |
95 | { | 95 | { |
96 | if (result < 0) | 96 | if (result < 0) |
97 | die("%s: %s",msg, strerror(errno)); | 97 | die("%s: %s",msg, strerror(errno)); |
98 | return result; | 98 | return result; |
99 | } | 99 | } |
100 | 100 | ||
101 | struct repoinfo *add_repo(const char *url) | 101 | struct repoinfo *add_repo(const char *url) |
102 | { | 102 | { |
103 | struct repoinfo *ret; | 103 | struct repoinfo *ret; |
104 | 104 | ||
105 | if (++cgit_repolist.count > cgit_repolist.length) { | 105 | if (++cgit_repolist.count > cgit_repolist.length) { |
106 | if (cgit_repolist.length == 0) | 106 | if (cgit_repolist.length == 0) |
107 | cgit_repolist.length = 8; | 107 | cgit_repolist.length = 8; |
108 | else | 108 | else |
109 | cgit_repolist.length *= 2; | 109 | cgit_repolist.length *= 2; |
110 | cgit_repolist.repos = xrealloc(cgit_repolist.repos, | 110 | cgit_repolist.repos = xrealloc(cgit_repolist.repos, |
111 | cgit_repolist.length * | 111 | cgit_repolist.length * |
112 | sizeof(struct repoinfo)); | 112 | sizeof(struct repoinfo)); |
113 | } | 113 | } |
114 | 114 | ||
115 | ret = &cgit_repolist.repos[cgit_repolist.count-1]; | 115 | ret = &cgit_repolist.repos[cgit_repolist.count-1]; |
116 | ret->url = trim_end(url, '/'); | 116 | ret->url = trim_end(url, '/'); |
117 | ret->name = ret->url; | 117 | ret->name = ret->url; |
118 | ret->path = NULL; | 118 | ret->path = NULL; |
119 | ret->desc = NULL; | 119 | ret->desc = "[no description]"; |
120 | ret->owner = NULL; | 120 | ret->owner = NULL; |
121 | ret->group = cgit_repo_group; | 121 | ret->group = cgit_repo_group; |
122 | ret->defbranch = "master"; | 122 | ret->defbranch = "master"; |
123 | ret->snapshots = cgit_snapshots; | 123 | ret->snapshots = cgit_snapshots; |
124 | ret->enable_log_filecount = cgit_enable_log_filecount; | 124 | ret->enable_log_filecount = cgit_enable_log_filecount; |
125 | ret->enable_log_linecount = cgit_enable_log_linecount; | 125 | ret->enable_log_linecount = cgit_enable_log_linecount; |
126 | ret->module_link = cgit_module_link; | 126 | ret->module_link = cgit_module_link; |
127 | ret->readme = NULL; | 127 | ret->readme = NULL; |
128 | return ret; | 128 | return ret; |
129 | } | 129 | } |
130 | 130 | ||
131 | struct repoinfo *cgit_get_repoinfo(const char *url) | 131 | struct repoinfo *cgit_get_repoinfo(const char *url) |
132 | { | 132 | { |
133 | int i; | 133 | int i; |
134 | struct repoinfo *repo; | 134 | struct repoinfo *repo; |
135 | 135 | ||
136 | for (i=0; i<cgit_repolist.count; i++) { | 136 | for (i=0; i<cgit_repolist.count; i++) { |
137 | repo = &cgit_repolist.repos[i]; | 137 | repo = &cgit_repolist.repos[i]; |
138 | if (!strcmp(repo->url, url)) | 138 | if (!strcmp(repo->url, url)) |
139 | return repo; | 139 | return repo; |
140 | } | 140 | } |
141 | return NULL; | 141 | return NULL; |
142 | } | 142 | } |
143 | 143 | ||
144 | void cgit_global_config_cb(const char *name, const char *value) | 144 | void cgit_global_config_cb(const char *name, const char *value) |
145 | { | 145 | { |
146 | if (!strcmp(name, "root-title")) | 146 | if (!strcmp(name, "root-title")) |
147 | cgit_root_title = xstrdup(value); | 147 | cgit_root_title = xstrdup(value); |
148 | else if (!strcmp(name, "css")) | 148 | else if (!strcmp(name, "css")) |
149 | cgit_css = xstrdup(value); | 149 | cgit_css = xstrdup(value); |
150 | else if (!strcmp(name, "logo")) | 150 | else if (!strcmp(name, "logo")) |
151 | cgit_logo = xstrdup(value); | 151 | cgit_logo = xstrdup(value); |
152 | else if (!strcmp(name, "index-header")) | 152 | else if (!strcmp(name, "index-header")) |
153 | cgit_index_header = xstrdup(value); | 153 | cgit_index_header = xstrdup(value); |
154 | else if (!strcmp(name, "index-info")) | 154 | else if (!strcmp(name, "index-info")) |
155 | cgit_index_info = xstrdup(value); | 155 | cgit_index_info = xstrdup(value); |
156 | else if (!strcmp(name, "logo-link")) | 156 | else if (!strcmp(name, "logo-link")) |
157 | cgit_logo_link = xstrdup(value); | 157 | cgit_logo_link = xstrdup(value); |
158 | else if (!strcmp(name, "module-link")) | 158 | else if (!strcmp(name, "module-link")) |
159 | cgit_module_link = xstrdup(value); | 159 | cgit_module_link = xstrdup(value); |
160 | else if (!strcmp(name, "virtual-root")) { | 160 | else if (!strcmp(name, "virtual-root")) { |
161 | cgit_virtual_root = trim_end(value, '/'); | 161 | cgit_virtual_root = trim_end(value, '/'); |
162 | if (!cgit_virtual_root && (!strcmp(value, "/"))) | 162 | if (!cgit_virtual_root && (!strcmp(value, "/"))) |
163 | cgit_virtual_root = ""; | 163 | cgit_virtual_root = ""; |
164 | } else if (!strcmp(name, "nocache")) | 164 | } else if (!strcmp(name, "nocache")) |
165 | cgit_nocache = atoi(value); | 165 | cgit_nocache = atoi(value); |
166 | else if (!strcmp(name, "snapshots")) | 166 | else if (!strcmp(name, "snapshots")) |
167 | cgit_snapshots = cgit_parse_snapshots_mask(value); | 167 | cgit_snapshots = cgit_parse_snapshots_mask(value); |
168 | else if (!strcmp(name, "enable-index-links")) | 168 | else if (!strcmp(name, "enable-index-links")) |
169 | cgit_enable_index_links = atoi(value); | 169 | cgit_enable_index_links = atoi(value); |
170 | else if (!strcmp(name, "enable-log-filecount")) | 170 | else if (!strcmp(name, "enable-log-filecount")) |
171 | cgit_enable_log_filecount = atoi(value); | 171 | cgit_enable_log_filecount = atoi(value); |
172 | else if (!strcmp(name, "enable-log-linecount")) | 172 | else if (!strcmp(name, "enable-log-linecount")) |
173 | cgit_enable_log_linecount = atoi(value); | 173 | cgit_enable_log_linecount = atoi(value); |
174 | else if (!strcmp(name, "cache-root")) | 174 | else if (!strcmp(name, "cache-root")) |
175 | cgit_cache_root = xstrdup(value); | 175 | cgit_cache_root = xstrdup(value); |
176 | else if (!strcmp(name, "cache-root-ttl")) | 176 | else if (!strcmp(name, "cache-root-ttl")) |
177 | cgit_cache_root_ttl = atoi(value); | 177 | cgit_cache_root_ttl = atoi(value); |
178 | else if (!strcmp(name, "cache-repo-ttl")) | 178 | else if (!strcmp(name, "cache-repo-ttl")) |
179 | cgit_cache_repo_ttl = atoi(value); | 179 | cgit_cache_repo_ttl = atoi(value); |
180 | else if (!strcmp(name, "cache-static-ttl")) | 180 | else if (!strcmp(name, "cache-static-ttl")) |
181 | cgit_cache_static_ttl = atoi(value); | 181 | cgit_cache_static_ttl = atoi(value); |
182 | else if (!strcmp(name, "cache-dynamic-ttl")) | 182 | else if (!strcmp(name, "cache-dynamic-ttl")) |
183 | cgit_cache_dynamic_ttl = atoi(value); | 183 | cgit_cache_dynamic_ttl = atoi(value); |
184 | else if (!strcmp(name, "max-message-length")) | 184 | else if (!strcmp(name, "max-message-length")) |
185 | cgit_max_msg_len = atoi(value); | 185 | cgit_max_msg_len = atoi(value); |
186 | else if (!strcmp(name, "max-repodesc-length")) | 186 | else if (!strcmp(name, "max-repodesc-length")) |
187 | cgit_max_repodesc_len = atoi(value); | 187 | cgit_max_repodesc_len = atoi(value); |
188 | else if (!strcmp(name, "max-commit-count")) | 188 | else if (!strcmp(name, "max-commit-count")) |
189 | cgit_max_commit_count = atoi(value); | 189 | cgit_max_commit_count = atoi(value); |
190 | else if (!strcmp(name, "summary-log")) | 190 | else if (!strcmp(name, "summary-log")) |
191 | cgit_summary_log = atoi(value); | 191 | cgit_summary_log = atoi(value); |
192 | else if (!strcmp(name, "summary-branches")) | 192 | else if (!strcmp(name, "summary-branches")) |
193 | cgit_summary_branches = atoi(value); | 193 | cgit_summary_branches = atoi(value); |
194 | else if (!strcmp(name, "summary-tags")) | 194 | else if (!strcmp(name, "summary-tags")) |
195 | cgit_summary_tags = atoi(value); | 195 | cgit_summary_tags = atoi(value); |
196 | else if (!strcmp(name, "agefile")) | 196 | else if (!strcmp(name, "agefile")) |
197 | cgit_agefile = xstrdup(value); | 197 | cgit_agefile = xstrdup(value); |
198 | else if (!strcmp(name, "renamelimit")) | 198 | else if (!strcmp(name, "renamelimit")) |
199 | cgit_renamelimit = atoi(value); | 199 | cgit_renamelimit = atoi(value); |
200 | else if (!strcmp(name, "repo.group")) | 200 | else if (!strcmp(name, "repo.group")) |
201 | cgit_repo_group = xstrdup(value); | 201 | cgit_repo_group = xstrdup(value); |
202 | else if (!strcmp(name, "repo.url")) | 202 | else if (!strcmp(name, "repo.url")) |
203 | cgit_repo = add_repo(value); | 203 | cgit_repo = add_repo(value); |
204 | else if (!strcmp(name, "repo.name")) | 204 | else if (!strcmp(name, "repo.name")) |
205 | cgit_repo->name = xstrdup(value); | 205 | cgit_repo->name = xstrdup(value); |
206 | else if (cgit_repo && !strcmp(name, "repo.path")) | 206 | else if (cgit_repo && !strcmp(name, "repo.path")) |
207 | cgit_repo->path = trim_end(value, '/'); | 207 | cgit_repo->path = trim_end(value, '/'); |
208 | else if (cgit_repo && !strcmp(name, "repo.desc")) | 208 | else if (cgit_repo && !strcmp(name, "repo.desc")) |
209 | cgit_repo->desc = xstrdup(value); | 209 | cgit_repo->desc = xstrdup(value); |
210 | else if (cgit_repo && !strcmp(name, "repo.owner")) | 210 | else if (cgit_repo && !strcmp(name, "repo.owner")) |
211 | cgit_repo->owner = xstrdup(value); | 211 | cgit_repo->owner = xstrdup(value); |
212 | else if (cgit_repo && !strcmp(name, "repo.defbranch")) | 212 | else if (cgit_repo && !strcmp(name, "repo.defbranch")) |
213 | cgit_repo->defbranch = xstrdup(value); | 213 | cgit_repo->defbranch = xstrdup(value); |
214 | else if (cgit_repo && !strcmp(name, "repo.snapshots")) | 214 | else if (cgit_repo && !strcmp(name, "repo.snapshots")) |
215 | cgit_repo->snapshots = cgit_snapshots & cgit_parse_snapshots_mask(value); /* XXX: &? */ | 215 | cgit_repo->snapshots = cgit_snapshots & cgit_parse_snapshots_mask(value); /* XXX: &? */ |
216 | else if (cgit_repo && !strcmp(name, "repo.enable-log-filecount")) | 216 | else if (cgit_repo && !strcmp(name, "repo.enable-log-filecount")) |
217 | cgit_repo->enable_log_filecount = cgit_enable_log_filecount * atoi(value); | 217 | cgit_repo->enable_log_filecount = cgit_enable_log_filecount * atoi(value); |
218 | else if (cgit_repo && !strcmp(name, "repo.enable-log-linecount")) | 218 | else if (cgit_repo && !strcmp(name, "repo.enable-log-linecount")) |
219 | cgit_repo->enable_log_linecount = cgit_enable_log_linecount * atoi(value); | 219 | cgit_repo->enable_log_linecount = cgit_enable_log_linecount * atoi(value); |
220 | else if (cgit_repo && !strcmp(name, "repo.module-link")) | 220 | else if (cgit_repo && !strcmp(name, "repo.module-link")) |
221 | cgit_repo->module_link= xstrdup(value); | 221 | cgit_repo->module_link= xstrdup(value); |
222 | else if (cgit_repo && !strcmp(name, "repo.readme") && value != NULL) { | 222 | else if (cgit_repo && !strcmp(name, "repo.readme") && value != NULL) { |
223 | if (*value == '/') | 223 | if (*value == '/') |
224 | cgit_repo->readme = xstrdup(value); | 224 | cgit_repo->readme = xstrdup(value); |
225 | else | 225 | else |
226 | cgit_repo->readme = xstrdup(fmt("%s/%s", cgit_repo->path, value)); | 226 | cgit_repo->readme = xstrdup(fmt("%s/%s", cgit_repo->path, value)); |
227 | } else if (!strcmp(name, "include")) | 227 | } else if (!strcmp(name, "include")) |
228 | cgit_read_config(value, cgit_global_config_cb); | 228 | cgit_read_config(value, cgit_global_config_cb); |
229 | } | 229 | } |
230 | 230 | ||
231 | void cgit_querystring_cb(const char *name, const char *value) | 231 | void cgit_querystring_cb(const char *name, const char *value) |
232 | { | 232 | { |
233 | if (!strcmp(name,"r")) { | 233 | if (!strcmp(name,"r")) { |
234 | cgit_query_repo = xstrdup(value); | 234 | cgit_query_repo = xstrdup(value); |
235 | cgit_repo = cgit_get_repoinfo(value); | 235 | cgit_repo = cgit_get_repoinfo(value); |
236 | } else if (!strcmp(name, "p")) { | 236 | } else if (!strcmp(name, "p")) { |
237 | cgit_query_page = xstrdup(value); | 237 | cgit_query_page = xstrdup(value); |
238 | cgit_cmd = cgit_get_cmd_index(value); | 238 | cgit_cmd = cgit_get_cmd_index(value); |
239 | } else if (!strcmp(name, "url")) { | 239 | } else if (!strcmp(name, "url")) { |
240 | cgit_parse_url(value); | 240 | cgit_parse_url(value); |
241 | } else if (!strcmp(name, "qt")) { | 241 | } else if (!strcmp(name, "qt")) { |
242 | cgit_query_grep = xstrdup(value); | 242 | cgit_query_grep = xstrdup(value); |
243 | } else if (!strcmp(name, "q")) { | 243 | } else if (!strcmp(name, "q")) { |
244 | cgit_query_search = xstrdup(value); | 244 | cgit_query_search = xstrdup(value); |
245 | } else if (!strcmp(name, "h")) { | 245 | } else if (!strcmp(name, "h")) { |
246 | cgit_query_head = xstrdup(value); | 246 | cgit_query_head = xstrdup(value); |
247 | cgit_query_has_symref = 1; | 247 | cgit_query_has_symref = 1; |