summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--cgit.c11
-rw-r--r--cgit.h2
-rw-r--r--cgitrc.5.txt17
-rw-r--r--ui-plain.c20
4 files changed, 45 insertions, 5 deletions
diff --git a/cgit.c b/cgit.c
index 2039ab1..4f414c3 100644
--- a/cgit.c
+++ b/cgit.c
@@ -1,151 +1,161 @@
1/* cgit.c: cgi for the git scm 1/* cgit.c: cgi for the git scm
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#include "cache.h" 10#include "cache.h"
11#include "cmd.h" 11#include "cmd.h"
12#include "configfile.h" 12#include "configfile.h"
13#include "html.h" 13#include "html.h"
14#include "ui-shared.h" 14#include "ui-shared.h"
15#include "ui-stats.h" 15#include "ui-stats.h"
16#include "scan-tree.h" 16#include "scan-tree.h"
17 17
18const char *cgit_version = CGIT_VERSION; 18const char *cgit_version = CGIT_VERSION;
19 19
20void add_mimetype(const char *name, const char *value)
21{
22 struct string_list_item *item;
23
24 item = string_list_insert(xstrdup(name), &ctx.cfg.mimetypes);
25 item->util = xstrdup(value);
26}
27
20void config_cb(const char *name, const char *value) 28void config_cb(const char *name, const char *value)
21{ 29{
22 if (!strcmp(name, "root-title")) 30 if (!strcmp(name, "root-title"))
23 ctx.cfg.root_title = xstrdup(value); 31 ctx.cfg.root_title = xstrdup(value);
24 else if (!strcmp(name, "root-desc")) 32 else if (!strcmp(name, "root-desc"))
25 ctx.cfg.root_desc = xstrdup(value); 33 ctx.cfg.root_desc = xstrdup(value);
26 else if (!strcmp(name, "root-readme")) 34 else if (!strcmp(name, "root-readme"))
27 ctx.cfg.root_readme = xstrdup(value); 35 ctx.cfg.root_readme = xstrdup(value);
28 else if (!strcmp(name, "css")) 36 else if (!strcmp(name, "css"))
29 ctx.cfg.css = xstrdup(value); 37 ctx.cfg.css = xstrdup(value);
30 else if (!strcmp(name, "favicon")) 38 else if (!strcmp(name, "favicon"))
31 ctx.cfg.favicon = xstrdup(value); 39 ctx.cfg.favicon = xstrdup(value);
32 else if (!strcmp(name, "footer")) 40 else if (!strcmp(name, "footer"))
33 ctx.cfg.footer = xstrdup(value); 41 ctx.cfg.footer = xstrdup(value);
34 else if (!strcmp(name, "head-include")) 42 else if (!strcmp(name, "head-include"))
35 ctx.cfg.head_include = xstrdup(value); 43 ctx.cfg.head_include = xstrdup(value);
36 else if (!strcmp(name, "header")) 44 else if (!strcmp(name, "header"))
37 ctx.cfg.header = xstrdup(value); 45 ctx.cfg.header = xstrdup(value);
38 else if (!strcmp(name, "logo")) 46 else if (!strcmp(name, "logo"))
39 ctx.cfg.logo = xstrdup(value); 47 ctx.cfg.logo = xstrdup(value);
40 else if (!strcmp(name, "index-header")) 48 else if (!strcmp(name, "index-header"))
41 ctx.cfg.index_header = xstrdup(value); 49 ctx.cfg.index_header = xstrdup(value);
42 else if (!strcmp(name, "index-info")) 50 else if (!strcmp(name, "index-info"))
43 ctx.cfg.index_info = xstrdup(value); 51 ctx.cfg.index_info = xstrdup(value);
44 else if (!strcmp(name, "logo-link")) 52 else if (!strcmp(name, "logo-link"))
45 ctx.cfg.logo_link = xstrdup(value); 53 ctx.cfg.logo_link = xstrdup(value);
46 else if (!strcmp(name, "module-link")) 54 else if (!strcmp(name, "module-link"))
47 ctx.cfg.module_link = xstrdup(value); 55 ctx.cfg.module_link = xstrdup(value);
48 else if (!strcmp(name, "virtual-root")) { 56 else if (!strcmp(name, "virtual-root")) {
49 ctx.cfg.virtual_root = trim_end(value, '/'); 57 ctx.cfg.virtual_root = trim_end(value, '/');
50 if (!ctx.cfg.virtual_root && (!strcmp(value, "/"))) 58 if (!ctx.cfg.virtual_root && (!strcmp(value, "/")))
51 ctx.cfg.virtual_root = ""; 59 ctx.cfg.virtual_root = "";
52 } else if (!strcmp(name, "nocache")) 60 } else if (!strcmp(name, "nocache"))
53 ctx.cfg.nocache = atoi(value); 61 ctx.cfg.nocache = atoi(value);
54 else if (!strcmp(name, "noheader")) 62 else if (!strcmp(name, "noheader"))
55 ctx.cfg.noheader = atoi(value); 63 ctx.cfg.noheader = atoi(value);
56 else if (!strcmp(name, "snapshots")) 64 else if (!strcmp(name, "snapshots"))
57 ctx.cfg.snapshots = cgit_parse_snapshots_mask(value); 65 ctx.cfg.snapshots = cgit_parse_snapshots_mask(value);
58 else if (!strcmp(name, "enable-index-links")) 66 else if (!strcmp(name, "enable-index-links"))
59 ctx.cfg.enable_index_links = atoi(value); 67 ctx.cfg.enable_index_links = atoi(value);
60 else if (!strcmp(name, "enable-log-filecount")) 68 else if (!strcmp(name, "enable-log-filecount"))
61 ctx.cfg.enable_log_filecount = atoi(value); 69 ctx.cfg.enable_log_filecount = atoi(value);
62 else if (!strcmp(name, "enable-log-linecount")) 70 else if (!strcmp(name, "enable-log-linecount"))
63 ctx.cfg.enable_log_linecount = atoi(value); 71 ctx.cfg.enable_log_linecount = atoi(value);
64 else if (!strcmp(name, "max-stats")) 72 else if (!strcmp(name, "max-stats"))
65 ctx.cfg.max_stats = cgit_find_stats_period(value, NULL); 73 ctx.cfg.max_stats = cgit_find_stats_period(value, NULL);
66 else if (!strcmp(name, "cache-size")) 74 else if (!strcmp(name, "cache-size"))
67 ctx.cfg.cache_size = atoi(value); 75 ctx.cfg.cache_size = atoi(value);
68 else if (!strcmp(name, "cache-root")) 76 else if (!strcmp(name, "cache-root"))
69 ctx.cfg.cache_root = xstrdup(value); 77 ctx.cfg.cache_root = xstrdup(value);
70 else if (!strcmp(name, "cache-root-ttl")) 78 else if (!strcmp(name, "cache-root-ttl"))
71 ctx.cfg.cache_root_ttl = atoi(value); 79 ctx.cfg.cache_root_ttl = atoi(value);
72 else if (!strcmp(name, "cache-repo-ttl")) 80 else if (!strcmp(name, "cache-repo-ttl"))
73 ctx.cfg.cache_repo_ttl = atoi(value); 81 ctx.cfg.cache_repo_ttl = atoi(value);
74 else if (!strcmp(name, "cache-static-ttl")) 82 else if (!strcmp(name, "cache-static-ttl"))
75 ctx.cfg.cache_static_ttl = atoi(value); 83 ctx.cfg.cache_static_ttl = atoi(value);
76 else if (!strcmp(name, "cache-dynamic-ttl")) 84 else if (!strcmp(name, "cache-dynamic-ttl"))
77 ctx.cfg.cache_dynamic_ttl = atoi(value); 85 ctx.cfg.cache_dynamic_ttl = atoi(value);
78 else if (!strcmp(name, "embedded")) 86 else if (!strcmp(name, "embedded"))
79 ctx.cfg.embedded = atoi(value); 87 ctx.cfg.embedded = atoi(value);
80 else if (!strcmp(name, "max-message-length")) 88 else if (!strcmp(name, "max-message-length"))
81 ctx.cfg.max_msg_len = atoi(value); 89 ctx.cfg.max_msg_len = atoi(value);
82 else if (!strcmp(name, "max-repodesc-length")) 90 else if (!strcmp(name, "max-repodesc-length"))
83 ctx.cfg.max_repodesc_len = atoi(value); 91 ctx.cfg.max_repodesc_len = atoi(value);
84 else if (!strcmp(name, "max-repo-count")) 92 else if (!strcmp(name, "max-repo-count"))
85 ctx.cfg.max_repo_count = atoi(value); 93 ctx.cfg.max_repo_count = atoi(value);
86 else if (!strcmp(name, "max-commit-count")) 94 else if (!strcmp(name, "max-commit-count"))
87 ctx.cfg.max_commit_count = atoi(value); 95 ctx.cfg.max_commit_count = atoi(value);
88 else if (!strcmp(name, "summary-log")) 96 else if (!strcmp(name, "summary-log"))
89 ctx.cfg.summary_log = atoi(value); 97 ctx.cfg.summary_log = atoi(value);
90 else if (!strcmp(name, "summary-branches")) 98 else if (!strcmp(name, "summary-branches"))
91 ctx.cfg.summary_branches = atoi(value); 99 ctx.cfg.summary_branches = atoi(value);
92 else if (!strcmp(name, "summary-tags")) 100 else if (!strcmp(name, "summary-tags"))
93 ctx.cfg.summary_tags = atoi(value); 101 ctx.cfg.summary_tags = atoi(value);
94 else if (!strcmp(name, "agefile")) 102 else if (!strcmp(name, "agefile"))
95 ctx.cfg.agefile = xstrdup(value); 103 ctx.cfg.agefile = xstrdup(value);
96 else if (!strcmp(name, "renamelimit")) 104 else if (!strcmp(name, "renamelimit"))
97 ctx.cfg.renamelimit = atoi(value); 105 ctx.cfg.renamelimit = atoi(value);
98 else if (!strcmp(name, "robots")) 106 else if (!strcmp(name, "robots"))
99 ctx.cfg.robots = xstrdup(value); 107 ctx.cfg.robots = xstrdup(value);
100 else if (!strcmp(name, "clone-prefix")) 108 else if (!strcmp(name, "clone-prefix"))
101 ctx.cfg.clone_prefix = xstrdup(value); 109 ctx.cfg.clone_prefix = xstrdup(value);
102 else if (!strcmp(name, "local-time")) 110 else if (!strcmp(name, "local-time"))
103 ctx.cfg.local_time = atoi(value); 111 ctx.cfg.local_time = atoi(value);
112 else if (!prefixcmp(name, "mimetype."))
113 add_mimetype(name + 9, value);
104 else if (!strcmp(name, "repo.group")) 114 else if (!strcmp(name, "repo.group"))
105 ctx.cfg.repo_group = xstrdup(value); 115 ctx.cfg.repo_group = xstrdup(value);
106 else if (!strcmp(name, "repo.url")) 116 else if (!strcmp(name, "repo.url"))
107 ctx.repo = cgit_add_repo(value); 117 ctx.repo = cgit_add_repo(value);
108 else if (!strcmp(name, "repo.name")) 118 else if (!strcmp(name, "repo.name"))
109 ctx.repo->name = xstrdup(value); 119 ctx.repo->name = xstrdup(value);
110 else if (ctx.repo && !strcmp(name, "repo.path")) 120 else if (ctx.repo && !strcmp(name, "repo.path"))
111 ctx.repo->path = trim_end(value, '/'); 121 ctx.repo->path = trim_end(value, '/');
112 else if (ctx.repo && !strcmp(name, "repo.clone-url")) 122 else if (ctx.repo && !strcmp(name, "repo.clone-url"))
113 ctx.repo->clone_url = xstrdup(value); 123 ctx.repo->clone_url = xstrdup(value);
114 else if (ctx.repo && !strcmp(name, "repo.desc")) 124 else if (ctx.repo && !strcmp(name, "repo.desc"))
115 ctx.repo->desc = xstrdup(value); 125 ctx.repo->desc = xstrdup(value);
116 else if (ctx.repo && !strcmp(name, "repo.owner")) 126 else if (ctx.repo && !strcmp(name, "repo.owner"))
117 ctx.repo->owner = xstrdup(value); 127 ctx.repo->owner = xstrdup(value);
118 else if (ctx.repo && !strcmp(name, "repo.defbranch")) 128 else if (ctx.repo && !strcmp(name, "repo.defbranch"))
119 ctx.repo->defbranch = xstrdup(value); 129 ctx.repo->defbranch = xstrdup(value);
120 else if (ctx.repo && !strcmp(name, "repo.snapshots")) 130 else if (ctx.repo && !strcmp(name, "repo.snapshots"))
121 ctx.repo->snapshots = ctx.cfg.snapshots & cgit_parse_snapshots_mask(value); /* XXX: &? */ 131 ctx.repo->snapshots = ctx.cfg.snapshots & cgit_parse_snapshots_mask(value); /* XXX: &? */
122 else if (ctx.repo && !strcmp(name, "repo.enable-log-filecount")) 132 else if (ctx.repo && !strcmp(name, "repo.enable-log-filecount"))
123 ctx.repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value); 133 ctx.repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value);
124 else if (ctx.repo && !strcmp(name, "repo.enable-log-linecount")) 134 else if (ctx.repo && !strcmp(name, "repo.enable-log-linecount"))
125 ctx.repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value); 135 ctx.repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value);
126 else if (ctx.repo && !strcmp(name, "repo.max-stats")) 136 else if (ctx.repo && !strcmp(name, "repo.max-stats"))
127 ctx.repo->max_stats = cgit_find_stats_period(value, NULL); 137 ctx.repo->max_stats = cgit_find_stats_period(value, NULL);
128 else if (ctx.repo && !strcmp(name, "repo.module-link")) 138 else if (ctx.repo && !strcmp(name, "repo.module-link"))
129 ctx.repo->module_link= xstrdup(value); 139 ctx.repo->module_link= xstrdup(value);
130 else if (ctx.repo && !strcmp(name, "repo.readme") && value != NULL) { 140 else if (ctx.repo && !strcmp(name, "repo.readme") && value != NULL) {
131 if (*value == '/') 141 if (*value == '/')
132 ctx.repo->readme = xstrdup(value); 142 ctx.repo->readme = xstrdup(value);
133 else 143 else
134 ctx.repo->readme = xstrdup(fmt("%s/%s", ctx.repo->path, value)); 144 ctx.repo->readme = xstrdup(fmt("%s/%s", ctx.repo->path, value));
135 } else if (!strcmp(name, "include")) 145 } else if (!strcmp(name, "include"))
136 parse_configfile(value, config_cb); 146 parse_configfile(value, config_cb);
137} 147}
138 148
139static void querystring_cb(const char *name, const char *value) 149static void querystring_cb(const char *name, const char *value)
140{ 150{
141 if (!strcmp(name,"r")) { 151 if (!strcmp(name,"r")) {
142 ctx.qry.repo = xstrdup(value); 152 ctx.qry.repo = xstrdup(value);
143 ctx.repo = cgit_get_repoinfo(value); 153 ctx.repo = cgit_get_repoinfo(value);
144 } else if (!strcmp(name, "p")) { 154 } else if (!strcmp(name, "p")) {
145 ctx.qry.page = xstrdup(value); 155 ctx.qry.page = xstrdup(value);
146 } else if (!strcmp(name, "url")) { 156 } else if (!strcmp(name, "url")) {
147 ctx.qry.url = xstrdup(value); 157 ctx.qry.url = xstrdup(value);
148 cgit_parse_url(value); 158 cgit_parse_url(value);
149 } else if (!strcmp(name, "qt")) { 159 } else if (!strcmp(name, "qt")) {
150 ctx.qry.grep = xstrdup(value); 160 ctx.qry.grep = xstrdup(value);
151 } else if (!strcmp(name, "q")) { 161 } else if (!strcmp(name, "q")) {
@@ -168,96 +178,97 @@ static void querystring_cb(const char *name, const char *value)
168 } else if (!strcmp(name, "mimetype")) { 178 } else if (!strcmp(name, "mimetype")) {
169 ctx.qry.mimetype = xstrdup(value); 179 ctx.qry.mimetype = xstrdup(value);
170 } else if (!strcmp(name, "s")){ 180 } else if (!strcmp(name, "s")){
171 ctx.qry.sort = xstrdup(value); 181 ctx.qry.sort = xstrdup(value);
172 } else if (!strcmp(name, "showmsg")) { 182 } else if (!strcmp(name, "showmsg")) {
173 ctx.qry.showmsg = atoi(value); 183 ctx.qry.showmsg = atoi(value);
174 } else if (!strcmp(name, "period")) { 184 } else if (!strcmp(name, "period")) {
175 ctx.qry.period = xstrdup(value); 185 ctx.qry.period = xstrdup(value);
176 } 186 }
177} 187}
178 188
179static void prepare_context(struct cgit_context *ctx) 189static void prepare_context(struct cgit_context *ctx)
180{ 190{
181 memset(ctx, 0, sizeof(ctx)); 191 memset(ctx, 0, sizeof(ctx));
182 ctx->cfg.agefile = "info/web/last-modified"; 192 ctx->cfg.agefile = "info/web/last-modified";
183 ctx->cfg.nocache = 0; 193 ctx->cfg.nocache = 0;
184 ctx->cfg.cache_size = 0; 194 ctx->cfg.cache_size = 0;
185 ctx->cfg.cache_dynamic_ttl = 5; 195 ctx->cfg.cache_dynamic_ttl = 5;
186 ctx->cfg.cache_max_create_time = 5; 196 ctx->cfg.cache_max_create_time = 5;
187 ctx->cfg.cache_repo_ttl = 5; 197 ctx->cfg.cache_repo_ttl = 5;
188 ctx->cfg.cache_root = CGIT_CACHE_ROOT; 198 ctx->cfg.cache_root = CGIT_CACHE_ROOT;
189 ctx->cfg.cache_root_ttl = 5; 199 ctx->cfg.cache_root_ttl = 5;
190 ctx->cfg.cache_static_ttl = -1; 200 ctx->cfg.cache_static_ttl = -1;
191 ctx->cfg.css = "/cgit.css"; 201 ctx->cfg.css = "/cgit.css";
192 ctx->cfg.logo = "/git-logo.png"; 202 ctx->cfg.logo = "/git-logo.png";
193 ctx->cfg.local_time = 0; 203 ctx->cfg.local_time = 0;
194 ctx->cfg.max_repo_count = 50; 204 ctx->cfg.max_repo_count = 50;
195 ctx->cfg.max_commit_count = 50; 205 ctx->cfg.max_commit_count = 50;
196 ctx->cfg.max_lock_attempts = 5; 206 ctx->cfg.max_lock_attempts = 5;
197 ctx->cfg.max_msg_len = 80; 207 ctx->cfg.max_msg_len = 80;
198 ctx->cfg.max_repodesc_len = 80; 208 ctx->cfg.max_repodesc_len = 80;
199 ctx->cfg.max_stats = 0; 209 ctx->cfg.max_stats = 0;
200 ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s"; 210 ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s";
201 ctx->cfg.renamelimit = -1; 211 ctx->cfg.renamelimit = -1;
202 ctx->cfg.robots = "index, nofollow"; 212 ctx->cfg.robots = "index, nofollow";
203 ctx->cfg.root_title = "Git repository browser"; 213 ctx->cfg.root_title = "Git repository browser";
204 ctx->cfg.root_desc = "a fast webinterface for the git dscm"; 214 ctx->cfg.root_desc = "a fast webinterface for the git dscm";
205 ctx->cfg.script_name = CGIT_SCRIPT_NAME; 215 ctx->cfg.script_name = CGIT_SCRIPT_NAME;
206 ctx->cfg.summary_branches = 10; 216 ctx->cfg.summary_branches = 10;
207 ctx->cfg.summary_log = 10; 217 ctx->cfg.summary_log = 10;
208 ctx->cfg.summary_tags = 10; 218 ctx->cfg.summary_tags = 10;
209 ctx->page.mimetype = "text/html"; 219 ctx->page.mimetype = "text/html";
210 ctx->page.charset = PAGE_ENCODING; 220 ctx->page.charset = PAGE_ENCODING;
211 ctx->page.filename = NULL; 221 ctx->page.filename = NULL;
212 ctx->page.size = 0; 222 ctx->page.size = 0;
213 ctx->page.modified = time(NULL); 223 ctx->page.modified = time(NULL);
214 ctx->page.expires = ctx->page.modified; 224 ctx->page.expires = ctx->page.modified;
215 ctx->page.etag = NULL; 225 ctx->page.etag = NULL;
226 memset(&ctx->cfg.mimetypes, 0, sizeof(struct string_list));
216} 227}
217 228
218struct refmatch { 229struct refmatch {
219 char *req_ref; 230 char *req_ref;
220 char *first_ref; 231 char *first_ref;
221 int match; 232 int match;
222}; 233};
223 234
224int find_current_ref(const char *refname, const unsigned char *sha1, 235int find_current_ref(const char *refname, const unsigned char *sha1,
225 int flags, void *cb_data) 236 int flags, void *cb_data)
226{ 237{
227 struct refmatch *info; 238 struct refmatch *info;
228 239
229 info = (struct refmatch *)cb_data; 240 info = (struct refmatch *)cb_data;
230 if (!strcmp(refname, info->req_ref)) 241 if (!strcmp(refname, info->req_ref))
231 info->match = 1; 242 info->match = 1;
232 if (!info->first_ref) 243 if (!info->first_ref)
233 info->first_ref = xstrdup(refname); 244 info->first_ref = xstrdup(refname);
234 return info->match; 245 return info->match;
235} 246}
236 247
237char *find_default_branch(struct cgit_repo *repo) 248char *find_default_branch(struct cgit_repo *repo)
238{ 249{
239 struct refmatch info; 250 struct refmatch info;
240 char *ref; 251 char *ref;
241 252
242 info.req_ref = repo->defbranch; 253 info.req_ref = repo->defbranch;
243 info.first_ref = NULL; 254 info.first_ref = NULL;
244 info.match = 0; 255 info.match = 0;
245 for_each_branch_ref(find_current_ref, &info); 256 for_each_branch_ref(find_current_ref, &info);
246 if (info.match) 257 if (info.match)
247 ref = info.req_ref; 258 ref = info.req_ref;
248 else 259 else
249 ref = info.first_ref; 260 ref = info.first_ref;
250 if (ref) 261 if (ref)
251 ref = xstrdup(ref); 262 ref = xstrdup(ref);
252 return ref; 263 return ref;
253} 264}
254 265
255static int prepare_repo_cmd(struct cgit_context *ctx) 266static int prepare_repo_cmd(struct cgit_context *ctx)
256{ 267{
257 char *tmp; 268 char *tmp;
258 unsigned char sha1[20]; 269 unsigned char sha1[20];
259 int nongit = 0; 270 int nongit = 0;
260 271
261 setenv("GIT_DIR", ctx->repo->path, 1); 272 setenv("GIT_DIR", ctx->repo->path, 1);
262 setup_git_directory_gently(&nongit); 273 setup_git_directory_gently(&nongit);
263 if (nongit) { 274 if (nongit) {
diff --git a/cgit.h b/cgit.h
index 8c64efe..9259f33 100644
--- a/cgit.h
+++ b/cgit.h
@@ -1,65 +1,66 @@
1#ifndef CGIT_H 1#ifndef CGIT_H
2#define CGIT_H 2#define CGIT_H
3 3
4 4
5#include <git-compat-util.h> 5#include <git-compat-util.h>
6#include <cache.h> 6#include <cache.h>
7#include <grep.h> 7#include <grep.h>
8#include <object.h> 8#include <object.h>
9#include <tree.h> 9#include <tree.h>
10#include <commit.h> 10#include <commit.h>
11#include <tag.h> 11#include <tag.h>
12#include <diff.h> 12#include <diff.h>
13#include <diffcore.h> 13#include <diffcore.h>
14#include <refs.h> 14#include <refs.h>
15#include <revision.h> 15#include <revision.h>
16#include <log-tree.h> 16#include <log-tree.h>
17#include <archive.h> 17#include <archive.h>
18#include <string-list.h>
18#include <xdiff-interface.h> 19#include <xdiff-interface.h>
19#include <xdiff/xdiff.h> 20#include <xdiff/xdiff.h>
20#include <utf8.h> 21#include <utf8.h>
21 22
22 23
23/* 24/*
24 * Dateformats used on misc. pages 25 * Dateformats used on misc. pages
25 */ 26 */
26#define FMT_LONGDATE "%Y-%m-%d %H:%M:%S (%Z)" 27#define FMT_LONGDATE "%Y-%m-%d %H:%M:%S (%Z)"
27#define FMT_SHORTDATE "%Y-%m-%d" 28#define FMT_SHORTDATE "%Y-%m-%d"
28#define FMT_ATOMDATE "%Y-%m-%dT%H:%M:%SZ" 29#define FMT_ATOMDATE "%Y-%m-%dT%H:%M:%SZ"
29 30
30 31
31/* 32/*
32 * Limits used for relative dates 33 * Limits used for relative dates
33 */ 34 */
34#define TM_MIN 60 35#define TM_MIN 60
35#define TM_HOUR (TM_MIN * 60) 36#define TM_HOUR (TM_MIN * 60)
36#define TM_DAY (TM_HOUR * 24) 37#define TM_DAY (TM_HOUR * 24)
37#define TM_WEEK (TM_DAY * 7) 38#define TM_WEEK (TM_DAY * 7)
38#define TM_YEAR (TM_DAY * 365) 39#define TM_YEAR (TM_DAY * 365)
39#define TM_MONTH (TM_YEAR / 12.0) 40#define TM_MONTH (TM_YEAR / 12.0)
40 41
41 42
42/* 43/*
43 * Default encoding 44 * Default encoding
44 */ 45 */
45#define PAGE_ENCODING "UTF-8" 46#define PAGE_ENCODING "UTF-8"
46 47
47typedef void (*configfn)(const char *name, const char *value); 48typedef void (*configfn)(const char *name, const char *value);
48typedef void (*filepair_fn)(struct diff_filepair *pair); 49typedef void (*filepair_fn)(struct diff_filepair *pair);
49typedef void (*linediff_fn)(char *line, int len); 50typedef void (*linediff_fn)(char *line, int len);
50 51
51struct cgit_repo { 52struct cgit_repo {
52 char *url; 53 char *url;
53 char *name; 54 char *name;
54 char *path; 55 char *path;
55 char *desc; 56 char *desc;
56 char *owner; 57 char *owner;
57 char *defbranch; 58 char *defbranch;
58 char *group; 59 char *group;
59 char *module_link; 60 char *module_link;
60 char *readme; 61 char *readme;
61 char *clone_url; 62 char *clone_url;
62 int snapshots; 63 int snapshots;
63 int enable_log_filecount; 64 int enable_log_filecount;
64 int enable_log_linecount; 65 int enable_log_linecount;
65 int max_stats; 66 int max_stats;
@@ -129,96 +130,97 @@ struct cgit_query {
129 int showmsg; 130 int showmsg;
130}; 131};
131 132
132struct cgit_config { 133struct cgit_config {
133 char *agefile; 134 char *agefile;
134 char *cache_root; 135 char *cache_root;
135 char *clone_prefix; 136 char *clone_prefix;
136 char *css; 137 char *css;
137 char *favicon; 138 char *favicon;
138 char *footer; 139 char *footer;
139 char *head_include; 140 char *head_include;
140 char *header; 141 char *header;
141 char *index_header; 142 char *index_header;
142 char *index_info; 143 char *index_info;
143 char *logo; 144 char *logo;
144 char *logo_link; 145 char *logo_link;
145 char *module_link; 146 char *module_link;
146 char *repo_group; 147 char *repo_group;
147 char *robots; 148 char *robots;
148 char *root_title; 149 char *root_title;
149 char *root_desc; 150 char *root_desc;
150 char *root_readme; 151 char *root_readme;
151 char *script_name; 152 char *script_name;
152 char *virtual_root; 153 char *virtual_root;
153 int cache_size; 154 int cache_size;
154 int cache_dynamic_ttl; 155 int cache_dynamic_ttl;
155 int cache_max_create_time; 156 int cache_max_create_time;
156 int cache_repo_ttl; 157 int cache_repo_ttl;
157 int cache_root_ttl; 158 int cache_root_ttl;
158 int cache_static_ttl; 159 int cache_static_ttl;
159 int embedded; 160 int embedded;
160 int enable_index_links; 161 int enable_index_links;
161 int enable_log_filecount; 162 int enable_log_filecount;
162 int enable_log_linecount; 163 int enable_log_linecount;
163 int local_time; 164 int local_time;
164 int max_repo_count; 165 int max_repo_count;
165 int max_commit_count; 166 int max_commit_count;
166 int max_lock_attempts; 167 int max_lock_attempts;
167 int max_msg_len; 168 int max_msg_len;
168 int max_repodesc_len; 169 int max_repodesc_len;
169 int max_stats; 170 int max_stats;
170 int nocache; 171 int nocache;
171 int noheader; 172 int noheader;
172 int renamelimit; 173 int renamelimit;
173 int snapshots; 174 int snapshots;
174 int summary_branches; 175 int summary_branches;
175 int summary_log; 176 int summary_log;
176 int summary_tags; 177 int summary_tags;
178 struct string_list mimetypes;
177}; 179};
178 180
179struct cgit_page { 181struct cgit_page {
180 time_t modified; 182 time_t modified;
181 time_t expires; 183 time_t expires;
182 size_t size; 184 size_t size;
183 char *mimetype; 185 char *mimetype;
184 char *charset; 186 char *charset;
185 char *filename; 187 char *filename;
186 char *etag; 188 char *etag;
187 char *title; 189 char *title;
188 int status; 190 int status;
189 char *statusmsg; 191 char *statusmsg;
190}; 192};
191 193
192struct cgit_context { 194struct cgit_context {
193 struct cgit_query qry; 195 struct cgit_query qry;
194 struct cgit_config cfg; 196 struct cgit_config cfg;
195 struct cgit_repo *repo; 197 struct cgit_repo *repo;
196 struct cgit_page page; 198 struct cgit_page page;
197}; 199};
198 200
199struct cgit_snapshot_format { 201struct cgit_snapshot_format {
200 const char *suffix; 202 const char *suffix;
201 const char *mimetype; 203 const char *mimetype;
202 write_archive_fn_t write_func; 204 write_archive_fn_t write_func;
203 int bit; 205 int bit;
204}; 206};
205 207
206extern const char *cgit_version; 208extern const char *cgit_version;
207 209
208extern struct cgit_repolist cgit_repolist; 210extern struct cgit_repolist cgit_repolist;
209extern struct cgit_context ctx; 211extern struct cgit_context ctx;
210extern const struct cgit_snapshot_format cgit_snapshot_formats[]; 212extern const struct cgit_snapshot_format cgit_snapshot_formats[];
211 213
212extern struct cgit_repo *cgit_add_repo(const char *url); 214extern struct cgit_repo *cgit_add_repo(const char *url);
213extern struct cgit_repo *cgit_get_repoinfo(const char *url); 215extern struct cgit_repo *cgit_get_repoinfo(const char *url);
214extern void cgit_repo_config_cb(const char *name, const char *value); 216extern void cgit_repo_config_cb(const char *name, const char *value);
215 217
216extern int chk_zero(int result, char *msg); 218extern int chk_zero(int result, char *msg);
217extern int chk_positive(int result, char *msg); 219extern int chk_positive(int result, char *msg);
218extern int chk_non_negative(int result, char *msg); 220extern int chk_non_negative(int result, char *msg);
219 221
220extern char *trim_end(const char *str, char c); 222extern char *trim_end(const char *str, char c);
221extern char *strlpart(char *txt, int maxlen); 223extern char *strlpart(char *txt, int maxlen);
222extern char *strrpart(char *txt, int maxlen); 224extern char *strrpart(char *txt, int maxlen);
223 225
224extern void cgit_add_ref(struct reflist *list, struct refinfo *ref); 226extern void cgit_add_ref(struct reflist *list, struct refinfo *ref);
diff --git a/cgitrc.5.txt b/cgitrc.5.txt
index a207fe0..7256ec0 100644
--- a/cgitrc.5.txt
+++ b/cgitrc.5.txt
@@ -102,96 +102,100 @@ include::
102 file is parsed. Default value: none. 102 file is parsed. Default value: none.
103 103
104index-header:: 104index-header::
105 The content of the file specified with this option will be included 105 The content of the file specified with this option will be included
106 verbatim above the repository index. This setting is deprecated, and 106 verbatim above the repository index. This setting is deprecated, and
107 will not be supported by cgit-1.0 (use root-readme instead). Default 107 will not be supported by cgit-1.0 (use root-readme instead). Default
108 value: none. 108 value: none.
109 109
110index-info:: 110index-info::
111 The content of the file specified with this option will be included 111 The content of the file specified with this option will be included
112 verbatim below the heading on the repository index page. This setting 112 verbatim below the heading on the repository index page. This setting
113 is deprecated, and will not be supported by cgit-1.0 (use root-desc 113 is deprecated, and will not be supported by cgit-1.0 (use root-desc
114 instead). Default value: none. 114 instead). Default value: none.
115 115
116local-time:: 116local-time::
117 Flag which, if set to "1", makes cgit print commit and tag times in the 117 Flag which, if set to "1", makes cgit print commit and tag times in the
118 servers timezone. Default value: "0". 118 servers timezone. Default value: "0".
119 119
120logo:: 120logo::
121 Url which specifies the source of an image which will be used as a logo 121 Url which specifies the source of an image which will be used as a logo
122 on all cgit pages. 122 on all cgit pages.
123 123
124logo-link:: 124logo-link::
125 Url loaded when clicking on the cgit logo image. If unspecified the 125 Url loaded when clicking on the cgit logo image. If unspecified the
126 calculated url of the repository index page will be used. Default 126 calculated url of the repository index page will be used. Default
127 value: none. 127 value: none.
128 128
129max-commit-count:: 129max-commit-count::
130 Specifies the number of entries to list per page in "log" view. Default 130 Specifies the number of entries to list per page in "log" view. Default
131 value: "50". 131 value: "50".
132 132
133max-message-length:: 133max-message-length::
134 Specifies the maximum number of commit message characters to display in 134 Specifies the maximum number of commit message characters to display in
135 "log" view. Default value: "80". 135 "log" view. Default value: "80".
136 136
137max-repo-count:: 137max-repo-count::
138 Specifies the number of entries to list per page on therepository 138 Specifies the number of entries to list per page on therepository
139 index page. Default value: "50". 139 index page. Default value: "50".
140 140
141max-repodesc-length:: 141max-repodesc-length::
142 Specifies the maximum number of repo description characters to display 142 Specifies the maximum number of repo description characters to display
143 on the repository index page. Default value: "80". 143 on the repository index page. Default value: "80".
144 144
145max-stats:: 145max-stats::
146 Set the default maximum statistics period. Valid values are "week", 146 Set the default maximum statistics period. Valid values are "week",
147 "month", "quarter" and "year". If unspecified, statistics are 147 "month", "quarter" and "year". If unspecified, statistics are
148 disabled. Default value: none. See also: "repo.max-stats". 148 disabled. Default value: none. See also: "repo.max-stats".
149 149
150mimetype.<ext>::
151 Set the mimetype for the specified filename extension. This is used
152 by the `plain` command when returning blob content.
153
150module-link:: 154module-link::
151 Text which will be used as the formatstring for a hyperlink when a 155 Text which will be used as the formatstring for a hyperlink when a
152 submodule is printed in a directory listing. The arguments for the 156 submodule is printed in a directory listing. The arguments for the
153 formatstring are the path and SHA1 of the submodule commit. Default 157 formatstring are the path and SHA1 of the submodule commit. Default
154 value: "./?repo=%s&page=commit&id=%s" 158 value: "./?repo=%s&page=commit&id=%s"
155 159
156nocache:: 160nocache::
157 If set to the value "1" caching will be disabled. This settings is 161 If set to the value "1" caching will be disabled. This settings is
158 deprecated, and will not be honored starting with cgit-1.0. Default 162 deprecated, and will not be honored starting with cgit-1.0. Default
159 value: "0". 163 value: "0".
160 164
161noheader:: 165noheader::
162 Flag which, when set to "1", will make cgit omit the standard header 166 Flag which, when set to "1", will make cgit omit the standard header
163 on all pages. Default value: none. See also: "embedded". 167 on all pages. Default value: none. See also: "embedded".
164 168
165renamelimit:: 169renamelimit::
166 Maximum number of files to consider when detecting renames. The value 170 Maximum number of files to consider when detecting renames. The value
167 "-1" uses the compiletime value in git (for further info, look at 171 "-1" uses the compiletime value in git (for further info, look at
168 `man git-diff`). Default value: "-1". 172 `man git-diff`). Default value: "-1".
169 173
170repo.group:: 174repo.group::
171 A value for the current repository group, which all repositories 175 A value for the current repository group, which all repositories
172 specified after this setting will inherit. Default value: none. 176 specified after this setting will inherit. Default value: none.
173 177
174robots:: 178robots::
175 Text used as content for the "robots" meta-tag. Default value: 179 Text used as content for the "robots" meta-tag. Default value:
176 "index, nofollow". 180 "index, nofollow".
177 181
178root-desc:: 182root-desc::
179 Text printed below the heading on the repository index page. Default 183 Text printed below the heading on the repository index page. Default
180 value: "a fast webinterface for the git dscm". 184 value: "a fast webinterface for the git dscm".
181 185
182root-readme:: 186root-readme::
183 The content of the file specified with this option will be included 187 The content of the file specified with this option will be included
184 verbatim below the "about" link on the repository index page. Default 188 verbatim below the "about" link on the repository index page. Default
185 value: none. 189 value: none.
186 190
187root-title:: 191root-title::
188 Text printed as heading on the repository index page. Default value: 192 Text printed as heading on the repository index page. Default value:
189 "Git Repository Browser". 193 "Git Repository Browser".
190 194
191snapshots:: 195snapshots::
192 Text which specifies the default (and allowed) set of snapshot formats 196 Text which specifies the default (and allowed) set of snapshot formats
193 supported by cgit. The value is a space-separated list of zero or more 197 supported by cgit. The value is a space-separated list of zero or more
194 of the following values: 198 of the following values:
195 "tar" uncompressed tar-file 199 "tar" uncompressed tar-file
196 "tar.gz"gzip-compressed tar-file 200 "tar.gz"gzip-compressed tar-file
197 "tar.bz2"bzip-compressed tar-file 201 "tar.bz2"bzip-compressed tar-file
@@ -280,96 +284,109 @@ cache-size=1000
280# Specify some default clone prefixes 284# Specify some default clone prefixes
281clone-prefix=git://foobar.com ssh://foobar.com/pub/git http://foobar.com/git 285clone-prefix=git://foobar.com ssh://foobar.com/pub/git http://foobar.com/git
282 286
283# Specify the css url 287# Specify the css url
284css=/css/cgit.css 288css=/css/cgit.css
285 289
286 290
287# Show extra links for each repository on the index page 291# Show extra links for each repository on the index page
288enable-index-links=1 292enable-index-links=1
289 293
290 294
291# Show number of affected files per commit on the log pages 295# Show number of affected files per commit on the log pages
292enable-log-filecount=1 296enable-log-filecount=1
293 297
294 298
295# Show number of added/removed lines per commit on the log pages 299# Show number of added/removed lines per commit on the log pages
296enable-log-linecount=1 300enable-log-linecount=1
297 301
298 302
299# Add a cgit favicon 303# Add a cgit favicon
300favicon=/favicon.ico 304favicon=/favicon.ico
301 305
302 306
303# Use a custom logo 307# Use a custom logo
304logo=/img/mylogo.png 308logo=/img/mylogo.png
305 309
306 310
307# Enable statistics per week, month and quarter 311# Enable statistics per week, month and quarter
308max-stats=quarter 312max-stats=quarter
309 313
310 314
311# Set the title and heading of the repository index page 315# Set the title and heading of the repository index page
312root-title=foobar.com git repositories 316root-title=foobar.com git repositories
313 317
314 318
315# Set a subheading for the repository index page 319# Set a subheading for the repository index page
316root-desc=tracking the foobar development 320root-desc=tracking the foobar development
317 321
318 322
319# Include some more info about foobar.com on the index page 323# Include some more info about foobar.com on the index page
320root-readme=/var/www/htdocs/about.html 324root-readme=/var/www/htdocs/about.html
321 325
322 326
323# Allow download of tar.gz, tar.bz2 and zip-files 327# Allow download of tar.gz, tar.bz2 and zip-files
324snapshots=tar.gz tar.bz2 zip 328snapshots=tar.gz tar.bz2 zip
325 329
326 330
327## 331##
332## List of common mimetypes
333##
334
335mimetype.git=image/git
336mimetype.html=text/html
337mimetype.jpg=image/jpeg
338mimetype.jpeg=image/jpeg
339mimetype.pdf=application/pdf
340mimetype.png=image/png
341mimetype.svg=image/svg+xml
342
343
344##
328## List of repositories. 345## List of repositories.
329## PS: Any repositories listed when repo.group is unset will not be 346## PS: Any repositories listed when repo.group is unset will not be
330## displayed under a group heading 347## displayed under a group heading
331## PPS: This list could be kept in a different file (e.g. '/etc/cgitrepos') 348## PPS: This list could be kept in a different file (e.g. '/etc/cgitrepos')
332## and included like this: 349## and included like this:
333## include=/etc/cgitrepos 350## include=/etc/cgitrepos
334## 351##
335 352
336 353
337repo.url=foo 354repo.url=foo
338repo.path=/pub/git/foo.git 355repo.path=/pub/git/foo.git
339repo.desc=the master foo repository 356repo.desc=the master foo repository
340repo.owner=fooman@foobar.com 357repo.owner=fooman@foobar.com
341repo.readme=info/web/about.html 358repo.readme=info/web/about.html
342 359
343 360
344repo.url=bar 361repo.url=bar
345repo.path=/pub/git/bar.git 362repo.path=/pub/git/bar.git
346repo.desc=the bars for your foo 363repo.desc=the bars for your foo
347repo.owner=barman@foobar.com 364repo.owner=barman@foobar.com
348repo.readme=info/web/about.html 365repo.readme=info/web/about.html
349 366
350 367
351# The next repositories will be displayed under the 'extras' heading 368# The next repositories will be displayed under the 'extras' heading
352repo.group=extras 369repo.group=extras
353 370
354 371
355repo.url=baz 372repo.url=baz
356repo.path=/pub/git/baz.git 373repo.path=/pub/git/baz.git
357repo.desc=a set of extensions for bar users 374repo.desc=a set of extensions for bar users
358 375
359repo.url=wiz 376repo.url=wiz
360repo.path=/pub/git/wiz.git 377repo.path=/pub/git/wiz.git
361repo.desc=the wizard of foo 378repo.desc=the wizard of foo
362 379
363 380
364# Add some mirrored repositories 381# Add some mirrored repositories
365repo.group=mirrors 382repo.group=mirrors
366 383
367 384
368repo.url=git 385repo.url=git
369repo.path=/pub/git/git.git 386repo.path=/pub/git/git.git
370repo.desc=the dscm 387repo.desc=the dscm
371 388
372 389
373repo.url=linux 390repo.url=linux
374repo.path=/pub/git/linux.git 391repo.path=/pub/git/linux.git
375repo.desc=the kernel 392repo.desc=the kernel
diff --git a/ui-plain.c b/ui-plain.c
index 93a3a05..27c6dae 100644
--- a/ui-plain.c
+++ b/ui-plain.c
@@ -1,83 +1,93 @@
1/* ui-plain.c: functions for output of plain blobs by path 1/* ui-plain.c: functions for output of plain blobs by path
2 * 2 *
3 * Copyright (C) 2008 Lars Hjemli 3 * Copyright (C) 2008 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#include "html.h" 10#include "html.h"
11#include "ui-shared.h" 11#include "ui-shared.h"
12 12
13char *curr_rev; 13char *curr_rev;
14char *match_path; 14char *match_path;
15int match; 15int match;
16 16
17static void print_object(const unsigned char *sha1, const char *path) 17static void print_object(const unsigned char *sha1, const char *path)
18{ 18{
19 enum object_type type; 19 enum object_type type;
20 char *buf; 20 char *buf, *ext;
21 unsigned long size; 21 unsigned long size;
22 struct string_list_item *mime;
22 23
23 type = sha1_object_info(sha1, &size); 24 type = sha1_object_info(sha1, &size);
24 if (type == OBJ_BAD) { 25 if (type == OBJ_BAD) {
25 html_status(404, "Not found", 0); 26 html_status(404, "Not found", 0);
26 return; 27 return;
27 } 28 }
28 29
29 buf = read_sha1_file(sha1, &type, &size); 30 buf = read_sha1_file(sha1, &type, &size);
30 if (!buf) { 31 if (!buf) {
31 html_status(404, "Not found", 0); 32 html_status(404, "Not found", 0);
32 return; 33 return;
33 } 34 }
34 if (buffer_is_binary(buf, size)) 35 ctx.page.mimetype = NULL;
35 ctx.page.mimetype = "application/octet-stream"; 36 ext = strrchr(path, '.');
36 else 37 if (ext && *(++ext)) {
37 ctx.page.mimetype = "text/plain"; 38 mime = string_list_lookup(ext, &ctx.cfg.mimetypes);
39 if (mime)
40 ctx.page.mimetype = (char *)mime->util;
41 }
42 if (!ctx.page.mimetype) {
43 if (buffer_is_binary(buf, size))
44 ctx.page.mimetype = "application/octet-stream";
45 else
46 ctx.page.mimetype = "text/plain";
47 }
38 ctx.page.filename = fmt("%s", path); 48 ctx.page.filename = fmt("%s", path);
39 ctx.page.size = size; 49 ctx.page.size = size;
40 ctx.page.etag = sha1_to_hex(sha1); 50 ctx.page.etag = sha1_to_hex(sha1);
41 cgit_print_http_headers(&ctx); 51 cgit_print_http_headers(&ctx);
42 html_raw(buf, size); 52 html_raw(buf, size);
43 match = 1; 53 match = 1;
44} 54}
45 55
46static int walk_tree(const unsigned char *sha1, const char *base, int baselen, 56static int walk_tree(const unsigned char *sha1, const char *base, int baselen,
47 const char *pathname, unsigned mode, int stage, 57 const char *pathname, unsigned mode, int stage,
48 void *cbdata) 58 void *cbdata)
49{ 59{
50 if (S_ISDIR(mode)) 60 if (S_ISDIR(mode))
51 return READ_TREE_RECURSIVE; 61 return READ_TREE_RECURSIVE;
52 62
53 if (S_ISREG(mode)) 63 if (S_ISREG(mode))
54 print_object(sha1, pathname); 64 print_object(sha1, pathname);
55 65
56 return 0; 66 return 0;
57} 67}
58 68
59void cgit_print_plain(struct cgit_context *ctx) 69void cgit_print_plain(struct cgit_context *ctx)
60{ 70{
61 const char *rev = ctx->qry.sha1; 71 const char *rev = ctx->qry.sha1;
62 unsigned char sha1[20]; 72 unsigned char sha1[20];
63 struct commit *commit; 73 struct commit *commit;
64 const char *paths[] = {ctx->qry.path, NULL}; 74 const char *paths[] = {ctx->qry.path, NULL};
65 75
66 if (!rev) 76 if (!rev)
67 rev = ctx->qry.head; 77 rev = ctx->qry.head;
68 78
69 curr_rev = xstrdup(rev); 79 curr_rev = xstrdup(rev);
70 if (get_sha1(rev, sha1)) { 80 if (get_sha1(rev, sha1)) {
71 html_status(404, "Not found", 0); 81 html_status(404, "Not found", 0);
72 return; 82 return;
73 } 83 }
74 commit = lookup_commit_reference(sha1); 84 commit = lookup_commit_reference(sha1);
75 if (!commit || parse_commit(commit)) { 85 if (!commit || parse_commit(commit)) {
76 html_status(404, "Not found", 0); 86 html_status(404, "Not found", 0);
77 return; 87 return;
78 } 88 }
79 match_path = ctx->qry.path; 89 match_path = ctx->qry.path;
80 read_tree_recursive(commit->tree, NULL, 0, 0, paths, walk_tree, NULL); 90 read_tree_recursive(commit->tree, NULL, 0, 0, paths, walk_tree, NULL);
81 if (!match) 91 if (!match)
82 html_status(404, "Not found", 0); 92 html_status(404, "Not found", 0);
83} 93}