summaryrefslogtreecommitdiffabout
authorLars Hjemli <hjemli@gmail.com>2007-10-30 09:39:59 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2007-10-30 09:39:59 (UTC)
commit10ac7ad1f30f914dc5ff36ba3651ef6dca11aaf7 (patch) (unidiff)
tree8d185e972d4b235fc46156b9173a3406af2aacf6
parentfc5880fab8b9afc589aaadd1299c34a6ef2a3c2d (diff)
downloadcgit-10ac7ad1f30f914dc5ff36ba3651ef6dca11aaf7.zip
cgit-10ac7ad1f30f914dc5ff36ba3651ef6dca11aaf7.tar.gz
cgit-10ac7ad1f30f914dc5ff36ba3651ef6dca11aaf7.tar.bz2
Add config param 'index-info'
This parameter will be used to include a html file in the upcoming sidebar on the index page. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--cgit.h1
-rw-r--r--shared.c3
2 files changed, 4 insertions, 0 deletions
diff --git a/cgit.h b/cgit.h
index dd83f70..b8af970 100644
--- a/cgit.h
+++ b/cgit.h
@@ -103,48 +103,49 @@ struct refinfo {
103 const char *refname; 103 const char *refname;
104 struct object *object; 104 struct object *object;
105 union { 105 union {
106 struct taginfo *tag; 106 struct taginfo *tag;
107 struct commitinfo *commit; 107 struct commitinfo *commit;
108 }; 108 };
109}; 109};
110 110
111struct reflist { 111struct reflist {
112 struct refinfo **refs; 112 struct refinfo **refs;
113 int alloc; 113 int alloc;
114 int count; 114 int count;
115}; 115};
116 116
117extern const char *cgit_version; 117extern const char *cgit_version;
118 118
119extern struct repolist cgit_repolist; 119extern struct repolist cgit_repolist;
120extern struct repoinfo *cgit_repo; 120extern struct repoinfo *cgit_repo;
121extern int cgit_cmd; 121extern int cgit_cmd;
122 122
123extern char *cgit_root_title; 123extern char *cgit_root_title;
124extern char *cgit_css; 124extern char *cgit_css;
125extern char *cgit_logo; 125extern char *cgit_logo;
126extern char *cgit_index_header; 126extern char *cgit_index_header;
127extern char *cgit_index_info;
127extern char *cgit_logo_link; 128extern char *cgit_logo_link;
128extern char *cgit_module_link; 129extern char *cgit_module_link;
129extern char *cgit_agefile; 130extern char *cgit_agefile;
130extern char *cgit_virtual_root; 131extern char *cgit_virtual_root;
131extern char *cgit_script_name; 132extern char *cgit_script_name;
132extern char *cgit_cache_root; 133extern char *cgit_cache_root;
133extern char *cgit_repo_group; 134extern char *cgit_repo_group;
134 135
135extern int cgit_nocache; 136extern int cgit_nocache;
136extern int cgit_snapshots; 137extern int cgit_snapshots;
137extern int cgit_enable_index_links; 138extern int cgit_enable_index_links;
138extern int cgit_enable_log_filecount; 139extern int cgit_enable_log_filecount;
139extern int cgit_enable_log_linecount; 140extern int cgit_enable_log_linecount;
140extern int cgit_max_lock_attempts; 141extern int cgit_max_lock_attempts;
141extern int cgit_cache_root_ttl; 142extern int cgit_cache_root_ttl;
142extern int cgit_cache_repo_ttl; 143extern int cgit_cache_repo_ttl;
143extern int cgit_cache_dynamic_ttl; 144extern int cgit_cache_dynamic_ttl;
144extern int cgit_cache_static_ttl; 145extern int cgit_cache_static_ttl;
145extern int cgit_cache_max_create_time; 146extern int cgit_cache_max_create_time;
146extern int cgit_summary_log; 147extern int cgit_summary_log;
147extern int cgit_summary_tags; 148extern int cgit_summary_tags;
148extern int cgit_summary_branches; 149extern int cgit_summary_branches;
149 150
150extern int cgit_max_msg_len; 151extern int cgit_max_msg_len;
diff --git a/shared.c b/shared.c
index 4fab1c9..50fe8e1 100644
--- a/shared.c
+++ b/shared.c
@@ -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
11struct repolist cgit_repolist; 11struct repolist cgit_repolist;
12struct repoinfo *cgit_repo; 12struct repoinfo *cgit_repo;
13int cgit_cmd; 13int cgit_cmd;
14 14
15const char *cgit_version = CGIT_VERSION; 15const char *cgit_version = CGIT_VERSION;
16 16
17char *cgit_root_title = "Git repository browser"; 17char *cgit_root_title = "Git repository browser";
18char *cgit_css = "/cgit.css"; 18char *cgit_css = "/cgit.css";
19char *cgit_logo = "/git-logo.png"; 19char *cgit_logo = "/git-logo.png";
20char *cgit_index_header = NULL; 20char *cgit_index_header = NULL;
21char *cgit_index_info = NULL;
21char *cgit_logo_link = "http://www.kernel.org/pub/software/scm/git/docs/"; 22char *cgit_logo_link = "http://www.kernel.org/pub/software/scm/git/docs/";
22char *cgit_module_link = "./?repo=%s&page=commit&id=%s"; 23char *cgit_module_link = "./?repo=%s&page=commit&id=%s";
23char *cgit_agefile = "info/web/last-modified"; 24char *cgit_agefile = "info/web/last-modified";
24char *cgit_virtual_root = NULL; 25char *cgit_virtual_root = NULL;
25char *cgit_script_name = CGIT_SCRIPT_NAME; 26char *cgit_script_name = CGIT_SCRIPT_NAME;
26char *cgit_cache_root = CGIT_CACHE_ROOT; 27char *cgit_cache_root = CGIT_CACHE_ROOT;
27char *cgit_repo_group = NULL; 28char *cgit_repo_group = NULL;
28 29
29int cgit_nocache = 0; 30int cgit_nocache = 0;
30int cgit_snapshots = 0; 31int cgit_snapshots = 0;
31int cgit_enable_index_links = 0; 32int cgit_enable_index_links = 0;
32int cgit_enable_log_filecount = 0; 33int cgit_enable_log_filecount = 0;
33int cgit_enable_log_linecount = 0; 34int cgit_enable_log_linecount = 0;
34int cgit_max_lock_attempts = 5; 35int cgit_max_lock_attempts = 5;
35int cgit_cache_root_ttl = 5; 36int cgit_cache_root_ttl = 5;
36int cgit_cache_repo_ttl = 5; 37int cgit_cache_repo_ttl = 5;
37int cgit_cache_dynamic_ttl = 5; 38int cgit_cache_dynamic_ttl = 5;
38int cgit_cache_static_ttl = -1; 39int cgit_cache_static_ttl = -1;
39int cgit_cache_max_create_time = 5; 40int cgit_cache_max_create_time = 5;
40int cgit_summary_log = 0; 41int cgit_summary_log = 0;
41int cgit_summary_tags = 0; 42int cgit_summary_tags = 0;
42int cgit_summary_branches = 0; 43int cgit_summary_branches = 0;
43int cgit_renamelimit = -1; 44int cgit_renamelimit = -1;
44 45
@@ -129,48 +130,50 @@ struct repoinfo *add_repo(const char *url)
129 130
130struct repoinfo *cgit_get_repoinfo(const char *url) 131struct repoinfo *cgit_get_repoinfo(const char *url)
131{ 132{
132 int i; 133 int i;
133 struct repoinfo *repo; 134 struct repoinfo *repo;
134 135
135 for (i=0; i<cgit_repolist.count; i++) { 136 for (i=0; i<cgit_repolist.count; i++) {
136 repo = &cgit_repolist.repos[i]; 137 repo = &cgit_repolist.repos[i];
137 if (!strcmp(repo->url, url)) 138 if (!strcmp(repo->url, url))
138 return repo; 139 return repo;
139 } 140 }
140 return NULL; 141 return NULL;
141} 142}
142 143
143void cgit_global_config_cb(const char *name, const char *value) 144void cgit_global_config_cb(const char *name, const char *value)
144{ 145{
145 if (!strcmp(name, "root-title")) 146 if (!strcmp(name, "root-title"))
146 cgit_root_title = xstrdup(value); 147 cgit_root_title = xstrdup(value);
147 else if (!strcmp(name, "css")) 148 else if (!strcmp(name, "css"))
148 cgit_css = xstrdup(value); 149 cgit_css = xstrdup(value);
149 else if (!strcmp(name, "logo")) 150 else if (!strcmp(name, "logo"))
150 cgit_logo = xstrdup(value); 151 cgit_logo = xstrdup(value);
151 else if (!strcmp(name, "index-header")) 152 else if (!strcmp(name, "index-header"))
152 cgit_index_header = xstrdup(value); 153 cgit_index_header = xstrdup(value);
154 else if (!strcmp(name, "index-info"))
155 cgit_index_info = xstrdup(value);
153 else if (!strcmp(name, "logo-link")) 156 else if (!strcmp(name, "logo-link"))
154 cgit_logo_link = xstrdup(value); 157 cgit_logo_link = xstrdup(value);
155 else if (!strcmp(name, "module-link")) 158 else if (!strcmp(name, "module-link"))
156 cgit_module_link = xstrdup(value); 159 cgit_module_link = xstrdup(value);
157 else if (!strcmp(name, "virtual-root")) 160 else if (!strcmp(name, "virtual-root"))
158 cgit_virtual_root = trim_end(value, '/'); 161 cgit_virtual_root = trim_end(value, '/');
159 else if (!strcmp(name, "nocache")) 162 else if (!strcmp(name, "nocache"))
160 cgit_nocache = atoi(value); 163 cgit_nocache = atoi(value);
161 else if (!strcmp(name, "snapshots")) 164 else if (!strcmp(name, "snapshots"))
162 cgit_snapshots = cgit_parse_snapshots_mask(value); 165 cgit_snapshots = cgit_parse_snapshots_mask(value);
163 else if (!strcmp(name, "enable-index-links")) 166 else if (!strcmp(name, "enable-index-links"))
164 cgit_enable_index_links = atoi(value); 167 cgit_enable_index_links = atoi(value);
165 else if (!strcmp(name, "enable-log-filecount")) 168 else if (!strcmp(name, "enable-log-filecount"))
166 cgit_enable_log_filecount = atoi(value); 169 cgit_enable_log_filecount = atoi(value);
167 else if (!strcmp(name, "enable-log-linecount")) 170 else if (!strcmp(name, "enable-log-linecount"))
168 cgit_enable_log_linecount = atoi(value); 171 cgit_enable_log_linecount = atoi(value);
169 else if (!strcmp(name, "cache-root")) 172 else if (!strcmp(name, "cache-root"))
170 cgit_cache_root = xstrdup(value); 173 cgit_cache_root = xstrdup(value);
171 else if (!strcmp(name, "cache-root-ttl")) 174 else if (!strcmp(name, "cache-root-ttl"))
172 cgit_cache_root_ttl = atoi(value); 175 cgit_cache_root_ttl = atoi(value);
173 else if (!strcmp(name, "cache-repo-ttl")) 176 else if (!strcmp(name, "cache-repo-ttl"))
174 cgit_cache_repo_ttl = atoi(value); 177 cgit_cache_repo_ttl = atoi(value);
175 else if (!strcmp(name, "cache-static-ttl")) 178 else if (!strcmp(name, "cache-static-ttl"))
176 cgit_cache_static_ttl = atoi(value); 179 cgit_cache_static_ttl = atoi(value);