author | Lars Hjemli <hjemli@gmail.com> | 2011-02-19 13:25:55 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2011-02-19 13:25:55 (UTC) |
commit | fb9e6d1594a24fe4e551fd57a9c91fd18b14806e (patch) (unidiff) | |
tree | bc0b99adcce3a19f127e6eb2509585ed9486831e /cgit.h | |
parent | 31e1f9af1d46bd7dfdb3b2ac580c0d0cc8dbaa63 (diff) | |
parent | df522794c38934be3229a11e0e2432a1f2a3bc8d (diff) | |
download | cgit-fb9e6d1594a24fe4e551fd57a9c91fd18b14806e.zip cgit-fb9e6d1594a24fe4e551fd57a9c91fd18b14806e.tar.gz cgit-fb9e6d1594a24fe4e551fd57a9c91fd18b14806e.tar.bz2 |
Merge branch 'jh/scan-path'
* jh/scan-path:
scan_path(): Do not recurse into hidden directories by default
scan_path(): Improve handling of inaccessible directories
-rw-r--r-- | cgit.h | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -117,192 +117,193 @@ struct refinfo { | |||
117 | const char *refname; | 117 | const char *refname; |
118 | struct object *object; | 118 | struct object *object; |
119 | union { | 119 | union { |
120 | struct taginfo *tag; | 120 | struct taginfo *tag; |
121 | struct commitinfo *commit; | 121 | struct commitinfo *commit; |
122 | }; | 122 | }; |
123 | }; | 123 | }; |
124 | 124 | ||
125 | struct reflist { | 125 | struct reflist { |
126 | struct refinfo **refs; | 126 | struct refinfo **refs; |
127 | int alloc; | 127 | int alloc; |
128 | int count; | 128 | int count; |
129 | }; | 129 | }; |
130 | 130 | ||
131 | struct cgit_query { | 131 | struct cgit_query { |
132 | int has_symref; | 132 | int has_symref; |
133 | int has_sha1; | 133 | int has_sha1; |
134 | char *raw; | 134 | char *raw; |
135 | char *repo; | 135 | char *repo; |
136 | char *page; | 136 | char *page; |
137 | char *search; | 137 | char *search; |
138 | char *grep; | 138 | char *grep; |
139 | char *head; | 139 | char *head; |
140 | char *sha1; | 140 | char *sha1; |
141 | char *sha2; | 141 | char *sha2; |
142 | char *path; | 142 | char *path; |
143 | char *name; | 143 | char *name; |
144 | char *mimetype; | 144 | char *mimetype; |
145 | char *url; | 145 | char *url; |
146 | char *period; | 146 | char *period; |
147 | int ofs; | 147 | int ofs; |
148 | int nohead; | 148 | int nohead; |
149 | char *sort; | 149 | char *sort; |
150 | int showmsg; | 150 | int showmsg; |
151 | int ssdiff; | 151 | int ssdiff; |
152 | int show_all; | 152 | int show_all; |
153 | int context; | 153 | int context; |
154 | int ignorews; | 154 | int ignorews; |
155 | char *vpath; | 155 | char *vpath; |
156 | }; | 156 | }; |
157 | 157 | ||
158 | struct cgit_config { | 158 | struct cgit_config { |
159 | char *agefile; | 159 | char *agefile; |
160 | char *cache_root; | 160 | char *cache_root; |
161 | char *clone_prefix; | 161 | char *clone_prefix; |
162 | char *css; | 162 | char *css; |
163 | char *favicon; | 163 | char *favicon; |
164 | char *footer; | 164 | char *footer; |
165 | char *head_include; | 165 | char *head_include; |
166 | char *header; | 166 | char *header; |
167 | char *index_header; | 167 | char *index_header; |
168 | char *index_info; | 168 | char *index_info; |
169 | char *logo; | 169 | char *logo; |
170 | char *logo_link; | 170 | char *logo_link; |
171 | char *module_link; | 171 | char *module_link; |
172 | char *project_list; | 172 | char *project_list; |
173 | char *readme; | 173 | char *readme; |
174 | char *robots; | 174 | char *robots; |
175 | char *root_title; | 175 | char *root_title; |
176 | char *root_desc; | 176 | char *root_desc; |
177 | char *root_readme; | 177 | char *root_readme; |
178 | char *script_name; | 178 | char *script_name; |
179 | char *section; | 179 | char *section; |
180 | char *virtual_root; | 180 | char *virtual_root; |
181 | char *strict_export; | 181 | char *strict_export; |
182 | int cache_size; | 182 | int cache_size; |
183 | int cache_dynamic_ttl; | 183 | int cache_dynamic_ttl; |
184 | int cache_max_create_time; | 184 | int cache_max_create_time; |
185 | int cache_repo_ttl; | 185 | int cache_repo_ttl; |
186 | int cache_root_ttl; | 186 | int cache_root_ttl; |
187 | int cache_scanrc_ttl; | 187 | int cache_scanrc_ttl; |
188 | int cache_static_ttl; | 188 | int cache_static_ttl; |
189 | int embedded; | 189 | int embedded; |
190 | int enable_filter_overrides; | 190 | int enable_filter_overrides; |
191 | int enable_gitweb_owner; | 191 | int enable_gitweb_owner; |
192 | int enable_index_links; | 192 | int enable_index_links; |
193 | int enable_commit_graph; | 193 | int enable_commit_graph; |
194 | int enable_log_filecount; | 194 | int enable_log_filecount; |
195 | int enable_log_linecount; | 195 | int enable_log_linecount; |
196 | int enable_remote_branches; | 196 | int enable_remote_branches; |
197 | int enable_subject_links; | 197 | int enable_subject_links; |
198 | int enable_tree_linenumbers; | 198 | int enable_tree_linenumbers; |
199 | int local_time; | 199 | int local_time; |
200 | int max_atom_items; | 200 | int max_atom_items; |
201 | int max_repo_count; | 201 | int max_repo_count; |
202 | int max_commit_count; | 202 | int max_commit_count; |
203 | int max_lock_attempts; | 203 | int max_lock_attempts; |
204 | int max_msg_len; | 204 | int max_msg_len; |
205 | int max_repodesc_len; | 205 | int max_repodesc_len; |
206 | int max_blob_size; | 206 | int max_blob_size; |
207 | int max_stats; | 207 | int max_stats; |
208 | int nocache; | 208 | int nocache; |
209 | int noplainemail; | 209 | int noplainemail; |
210 | int noheader; | 210 | int noheader; |
211 | int renamelimit; | 211 | int renamelimit; |
212 | int remove_suffix; | 212 | int remove_suffix; |
213 | int scan_hidden_path; | ||
213 | int section_from_path; | 214 | int section_from_path; |
214 | int snapshots; | 215 | int snapshots; |
215 | int summary_branches; | 216 | int summary_branches; |
216 | int summary_log; | 217 | int summary_log; |
217 | int summary_tags; | 218 | int summary_tags; |
218 | int ssdiff; | 219 | int ssdiff; |
219 | struct string_list mimetypes; | 220 | struct string_list mimetypes; |
220 | struct cgit_filter *about_filter; | 221 | struct cgit_filter *about_filter; |
221 | struct cgit_filter *commit_filter; | 222 | struct cgit_filter *commit_filter; |
222 | struct cgit_filter *source_filter; | 223 | struct cgit_filter *source_filter; |
223 | }; | 224 | }; |
224 | 225 | ||
225 | struct cgit_page { | 226 | struct cgit_page { |
226 | time_t modified; | 227 | time_t modified; |
227 | time_t expires; | 228 | time_t expires; |
228 | size_t size; | 229 | size_t size; |
229 | char *mimetype; | 230 | char *mimetype; |
230 | char *charset; | 231 | char *charset; |
231 | char *filename; | 232 | char *filename; |
232 | char *etag; | 233 | char *etag; |
233 | char *title; | 234 | char *title; |
234 | int status; | 235 | int status; |
235 | char *statusmsg; | 236 | char *statusmsg; |
236 | }; | 237 | }; |
237 | 238 | ||
238 | struct cgit_environment { | 239 | struct cgit_environment { |
239 | char *cgit_config; | 240 | char *cgit_config; |
240 | char *http_host; | 241 | char *http_host; |
241 | char *https; | 242 | char *https; |
242 | char *no_http; | 243 | char *no_http; |
243 | char *path_info; | 244 | char *path_info; |
244 | char *query_string; | 245 | char *query_string; |
245 | char *request_method; | 246 | char *request_method; |
246 | char *script_name; | 247 | char *script_name; |
247 | char *server_name; | 248 | char *server_name; |
248 | char *server_port; | 249 | char *server_port; |
249 | }; | 250 | }; |
250 | 251 | ||
251 | struct cgit_context { | 252 | struct cgit_context { |
252 | struct cgit_environment env; | 253 | struct cgit_environment env; |
253 | struct cgit_query qry; | 254 | struct cgit_query qry; |
254 | struct cgit_config cfg; | 255 | struct cgit_config cfg; |
255 | struct cgit_repo *repo; | 256 | struct cgit_repo *repo; |
256 | struct cgit_page page; | 257 | struct cgit_page page; |
257 | }; | 258 | }; |
258 | 259 | ||
259 | struct cgit_snapshot_format { | 260 | struct cgit_snapshot_format { |
260 | const char *suffix; | 261 | const char *suffix; |
261 | const char *mimetype; | 262 | const char *mimetype; |
262 | write_archive_fn_t write_func; | 263 | write_archive_fn_t write_func; |
263 | int bit; | 264 | int bit; |
264 | }; | 265 | }; |
265 | 266 | ||
266 | extern const char *cgit_version; | 267 | extern const char *cgit_version; |
267 | 268 | ||
268 | extern struct cgit_repolist cgit_repolist; | 269 | extern struct cgit_repolist cgit_repolist; |
269 | extern struct cgit_context ctx; | 270 | extern struct cgit_context ctx; |
270 | extern const struct cgit_snapshot_format cgit_snapshot_formats[]; | 271 | extern const struct cgit_snapshot_format cgit_snapshot_formats[]; |
271 | 272 | ||
272 | extern struct cgit_repo *cgit_add_repo(const char *url); | 273 | extern struct cgit_repo *cgit_add_repo(const char *url); |
273 | extern struct cgit_repo *cgit_get_repoinfo(const char *url); | 274 | extern struct cgit_repo *cgit_get_repoinfo(const char *url); |
274 | extern void cgit_repo_config_cb(const char *name, const char *value); | 275 | extern void cgit_repo_config_cb(const char *name, const char *value); |
275 | 276 | ||
276 | extern int chk_zero(int result, char *msg); | 277 | extern int chk_zero(int result, char *msg); |
277 | extern int chk_positive(int result, char *msg); | 278 | extern int chk_positive(int result, char *msg); |
278 | extern int chk_non_negative(int result, char *msg); | 279 | extern int chk_non_negative(int result, char *msg); |
279 | 280 | ||
280 | extern char *trim_end(const char *str, char c); | 281 | extern char *trim_end(const char *str, char c); |
281 | extern char *strlpart(char *txt, int maxlen); | 282 | extern char *strlpart(char *txt, int maxlen); |
282 | extern char *strrpart(char *txt, int maxlen); | 283 | extern char *strrpart(char *txt, int maxlen); |
283 | 284 | ||
284 | extern void cgit_add_ref(struct reflist *list, struct refinfo *ref); | 285 | extern void cgit_add_ref(struct reflist *list, struct refinfo *ref); |
285 | extern int cgit_refs_cb(const char *refname, const unsigned char *sha1, | 286 | extern int cgit_refs_cb(const char *refname, const unsigned char *sha1, |
286 | int flags, void *cb_data); | 287 | int flags, void *cb_data); |
287 | 288 | ||
288 | extern void *cgit_free_commitinfo(struct commitinfo *info); | 289 | extern void *cgit_free_commitinfo(struct commitinfo *info); |
289 | 290 | ||
290 | extern int cgit_diff_files(const unsigned char *old_sha1, | 291 | extern int cgit_diff_files(const unsigned char *old_sha1, |
291 | const unsigned char *new_sha1, | 292 | const unsigned char *new_sha1, |
292 | unsigned long *old_size, unsigned long *new_size, | 293 | unsigned long *old_size, unsigned long *new_size, |
293 | int *binary, int context, int ignorews, | 294 | int *binary, int context, int ignorews, |
294 | linediff_fn fn); | 295 | linediff_fn fn); |
295 | 296 | ||
296 | extern void cgit_diff_tree(const unsigned char *old_sha1, | 297 | extern void cgit_diff_tree(const unsigned char *old_sha1, |
297 | const unsigned char *new_sha1, | 298 | const unsigned char *new_sha1, |
298 | filepair_fn fn, const char *prefix, int ignorews); | 299 | filepair_fn fn, const char *prefix, int ignorews); |
299 | 300 | ||
300 | extern void cgit_diff_commit(struct commit *commit, filepair_fn fn, | 301 | extern void cgit_diff_commit(struct commit *commit, filepair_fn fn, |
301 | const char *prefix); | 302 | const char *prefix); |
302 | 303 | ||
303 | __attribute__((format (printf,1,2))) | 304 | __attribute__((format (printf,1,2))) |
304 | extern char *fmt(const char *format,...); | 305 | extern char *fmt(const char *format,...); |
305 | 306 | ||
306 | extern struct commitinfo *cgit_parse_commit(struct commit *commit); | 307 | extern struct commitinfo *cgit_parse_commit(struct commit *commit); |
307 | extern struct taginfo *cgit_parse_tag(struct tag *tag); | 308 | extern struct taginfo *cgit_parse_tag(struct tag *tag); |
308 | extern void cgit_parse_url(const char *url); | 309 | extern void cgit_parse_url(const char *url); |