|
diff --git a/cgit.c b/cgit.c index 64d95f9..5301840 100644 --- a/ cgit.c+++ b/ cgit.c |
|
@@ -87,96 +87,99 @@ void config_cb(const char *name, const char *value) |
87 | ctx.cfg.summary_tags = atoi(value); |
87 | ctx.cfg.summary_tags = atoi(value); |
88 | else if (!strcmp(name, "agefile")) |
88 | else if (!strcmp(name, "agefile")) |
89 | ctx.cfg.agefile = xstrdup(value); |
89 | ctx.cfg.agefile = xstrdup(value); |
90 | else if (!strcmp(name, "renamelimit")) |
90 | else if (!strcmp(name, "renamelimit")) |
91 | ctx.cfg.renamelimit = atoi(value); |
91 | ctx.cfg.renamelimit = atoi(value); |
92 | else if (!strcmp(name, "robots")) |
92 | else if (!strcmp(name, "robots")) |
93 | ctx.cfg.robots = xstrdup(value); |
93 | ctx.cfg.robots = xstrdup(value); |
94 | else if (!strcmp(name, "clone-prefix")) |
94 | else if (!strcmp(name, "clone-prefix")) |
95 | ctx.cfg.clone_prefix = xstrdup(value); |
95 | ctx.cfg.clone_prefix = xstrdup(value); |
96 | else if (!strcmp(name, "local-time")) |
96 | else if (!strcmp(name, "local-time")) |
97 | ctx.cfg.local_time = atoi(value); |
97 | ctx.cfg.local_time = atoi(value); |
98 | else if (!strcmp(name, "repo.group")) |
98 | else if (!strcmp(name, "repo.group")) |
99 | ctx.cfg.repo_group = xstrdup(value); |
99 | ctx.cfg.repo_group = xstrdup(value); |
100 | else if (!strcmp(name, "repo.url")) |
100 | else if (!strcmp(name, "repo.url")) |
101 | ctx.repo = cgit_add_repo(value); |
101 | ctx.repo = cgit_add_repo(value); |
102 | else if (!strcmp(name, "repo.name")) |
102 | else if (!strcmp(name, "repo.name")) |
103 | ctx.repo->name = xstrdup(value); |
103 | ctx.repo->name = xstrdup(value); |
104 | else if (ctx.repo && !strcmp(name, "repo.path")) |
104 | else if (ctx.repo && !strcmp(name, "repo.path")) |
105 | ctx.repo->path = trim_end(value, '/'); |
105 | ctx.repo->path = trim_end(value, '/'); |
106 | else if (ctx.repo && !strcmp(name, "repo.clone-url")) |
106 | else if (ctx.repo && !strcmp(name, "repo.clone-url")) |
107 | ctx.repo->clone_url = xstrdup(value); |
107 | ctx.repo->clone_url = xstrdup(value); |
108 | else if (ctx.repo && !strcmp(name, "repo.desc")) |
108 | else if (ctx.repo && !strcmp(name, "repo.desc")) |
109 | ctx.repo->desc = xstrdup(value); |
109 | ctx.repo->desc = xstrdup(value); |
110 | else if (ctx.repo && !strcmp(name, "repo.owner")) |
110 | else if (ctx.repo && !strcmp(name, "repo.owner")) |
111 | ctx.repo->owner = xstrdup(value); |
111 | ctx.repo->owner = xstrdup(value); |
112 | else if (ctx.repo && !strcmp(name, "repo.defbranch")) |
112 | else if (ctx.repo && !strcmp(name, "repo.defbranch")) |
113 | ctx.repo->defbranch = xstrdup(value); |
113 | ctx.repo->defbranch = xstrdup(value); |
114 | else if (ctx.repo && !strcmp(name, "repo.snapshots")) |
114 | else if (ctx.repo && !strcmp(name, "repo.snapshots")) |
115 | ctx.repo->snapshots = ctx.cfg.snapshots & cgit_parse_snapshots_mask(value); /* XXX: &? */ |
115 | ctx.repo->snapshots = ctx.cfg.snapshots & cgit_parse_snapshots_mask(value); /* XXX: &? */ |
116 | else if (ctx.repo && !strcmp(name, "repo.enable-log-filecount")) |
116 | else if (ctx.repo && !strcmp(name, "repo.enable-log-filecount")) |
117 | ctx.repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value); |
117 | ctx.repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value); |
118 | else if (ctx.repo && !strcmp(name, "repo.enable-log-linecount")) |
118 | else if (ctx.repo && !strcmp(name, "repo.enable-log-linecount")) |
119 | ctx.repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value); |
119 | ctx.repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value); |
120 | else if (ctx.repo && !strcmp(name, "repo.max-stats")) |
120 | else if (ctx.repo && !strcmp(name, "repo.max-stats")) |
121 | ctx.repo->max_stats = cgit_find_stats_period(value, NULL); |
121 | ctx.repo->max_stats = cgit_find_stats_period(value, NULL); |
122 | else if (ctx.repo && !strcmp(name, "repo.module-link")) |
122 | else if (ctx.repo && !strcmp(name, "repo.module-link")) |
123 | ctx.repo->module_link= xstrdup(value); |
123 | ctx.repo->module_link= xstrdup(value); |
124 | else if (ctx.repo && !strcmp(name, "repo.readme") && value != NULL) { |
124 | else if (ctx.repo && !strcmp(name, "repo.readme") && value != NULL) { |
125 | if (*value == '/') |
125 | if (*value == '/') |
126 | ctx.repo->readme = xstrdup(value); |
126 | ctx.repo->readme = xstrdup(value); |
127 | else |
127 | else |
128 | ctx.repo->readme = xstrdup(fmt("%s/%s", ctx.repo->path, value)); |
128 | ctx.repo->readme = xstrdup(fmt("%s/%s", ctx.repo->path, value)); |
129 | } else if (!strcmp(name, "include")) |
129 | } else if (!strcmp(name, "include")) |
130 | parse_configfile(value, config_cb); |
130 | parse_configfile(value, config_cb); |
131 | } |
131 | } |
132 | |
132 | |
133 | static void querystring_cb(const char *name, const char *value) |
133 | static void querystring_cb(const char *name, const char *value) |
134 | { |
134 | { |
| |
135 | if (!value) |
| |
136 | value = ""; |
| |
137 | |
135 | if (!strcmp(name,"r")) { |
138 | if (!strcmp(name,"r")) { |
136 | ctx.qry.repo = xstrdup(value); |
139 | ctx.qry.repo = xstrdup(value); |
137 | ctx.repo = cgit_get_repoinfo(value); |
140 | ctx.repo = cgit_get_repoinfo(value); |
138 | } else if (!strcmp(name, "p")) { |
141 | } else if (!strcmp(name, "p")) { |
139 | ctx.qry.page = xstrdup(value); |
142 | ctx.qry.page = xstrdup(value); |
140 | } else if (!strcmp(name, "url")) { |
143 | } else if (!strcmp(name, "url")) { |
141 | ctx.qry.url = xstrdup(value); |
144 | ctx.qry.url = xstrdup(value); |
142 | cgit_parse_url(value); |
145 | cgit_parse_url(value); |
143 | } else if (!strcmp(name, "qt")) { |
146 | } else if (!strcmp(name, "qt")) { |
144 | ctx.qry.grep = xstrdup(value); |
147 | ctx.qry.grep = xstrdup(value); |
145 | } else if (!strcmp(name, "q")) { |
148 | } else if (!strcmp(name, "q")) { |
146 | ctx.qry.search = xstrdup(value); |
149 | ctx.qry.search = xstrdup(value); |
147 | } else if (!strcmp(name, "h")) { |
150 | } else if (!strcmp(name, "h")) { |
148 | ctx.qry.head = xstrdup(value); |
151 | ctx.qry.head = xstrdup(value); |
149 | ctx.qry.has_symref = 1; |
152 | ctx.qry.has_symref = 1; |
150 | } else if (!strcmp(name, "id")) { |
153 | } else if (!strcmp(name, "id")) { |
151 | ctx.qry.sha1 = xstrdup(value); |
154 | ctx.qry.sha1 = xstrdup(value); |
152 | ctx.qry.has_sha1 = 1; |
155 | ctx.qry.has_sha1 = 1; |
153 | } else if (!strcmp(name, "id2")) { |
156 | } else if (!strcmp(name, "id2")) { |
154 | ctx.qry.sha2 = xstrdup(value); |
157 | ctx.qry.sha2 = xstrdup(value); |
155 | ctx.qry.has_sha1 = 1; |
158 | ctx.qry.has_sha1 = 1; |
156 | } else if (!strcmp(name, "ofs")) { |
159 | } else if (!strcmp(name, "ofs")) { |
157 | ctx.qry.ofs = atoi(value); |
160 | ctx.qry.ofs = atoi(value); |
158 | } else if (!strcmp(name, "path")) { |
161 | } else if (!strcmp(name, "path")) { |
159 | ctx.qry.path = trim_end(value, '/'); |
162 | ctx.qry.path = trim_end(value, '/'); |
160 | } else if (!strcmp(name, "name")) { |
163 | } else if (!strcmp(name, "name")) { |
161 | ctx.qry.name = xstrdup(value); |
164 | ctx.qry.name = xstrdup(value); |
162 | } else if (!strcmp(name, "mimetype")) { |
165 | } else if (!strcmp(name, "mimetype")) { |
163 | ctx.qry.mimetype = xstrdup(value); |
166 | ctx.qry.mimetype = xstrdup(value); |
164 | } else if (!strcmp(name, "s")){ |
167 | } else if (!strcmp(name, "s")){ |
165 | ctx.qry.sort = xstrdup(value); |
168 | ctx.qry.sort = xstrdup(value); |
166 | } else if (!strcmp(name, "showmsg")) { |
169 | } else if (!strcmp(name, "showmsg")) { |
167 | ctx.qry.showmsg = atoi(value); |
170 | ctx.qry.showmsg = atoi(value); |
168 | } else if (!strcmp(name, "period")) { |
171 | } else if (!strcmp(name, "period")) { |
169 | ctx.qry.period = xstrdup(value); |
172 | ctx.qry.period = xstrdup(value); |
170 | } |
173 | } |
171 | } |
174 | } |
172 | |
175 | |
173 | static void prepare_context(struct cgit_context *ctx) |
176 | static void prepare_context(struct cgit_context *ctx) |
174 | { |
177 | { |
175 | memset(ctx, 0, sizeof(ctx)); |
178 | memset(ctx, 0, sizeof(ctx)); |
176 | ctx->cfg.agefile = "info/web/last-modified"; |
179 | ctx->cfg.agefile = "info/web/last-modified"; |
177 | ctx->cfg.nocache = 0; |
180 | ctx->cfg.nocache = 0; |
178 | ctx->cfg.cache_size = 0; |
181 | ctx->cfg.cache_size = 0; |
179 | ctx->cfg.cache_dynamic_ttl = 5; |
182 | ctx->cfg.cache_dynamic_ttl = 5; |
180 | ctx->cfg.cache_max_create_time = 5; |
183 | ctx->cfg.cache_max_create_time = 5; |
181 | ctx->cfg.cache_repo_ttl = 5; |
184 | ctx->cfg.cache_repo_ttl = 5; |
182 | ctx->cfg.cache_root = CGIT_CACHE_ROOT; |
185 | ctx->cfg.cache_root = CGIT_CACHE_ROOT; |
|