author | Lars Hjemli <hjemli@gmail.com> | 2008-09-14 22:07:12 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2008-09-15 21:35:27 (UTC) |
commit | 93397a765b9d9af11b7d10c114406e303ea4fb1c (patch) (unidiff) | |
tree | fa40c0c8df7549525123359bf817598ae7e9f43d | |
parent | e154edd8078020d6eba41b448afade0a68617f35 (diff) | |
download | cgit-93397a765b9d9af11b7d10c114406e303ea4fb1c.zip cgit-93397a765b9d9af11b7d10c114406e303ea4fb1c.tar.gz cgit-93397a765b9d9af11b7d10c114406e303ea4fb1c.tar.bz2 |
Add support for --scan-tree=<path> option to cgit
This option makes cgit scan a directory tree looking for git repositories,
generating suitable definitions for a cgitrc file on stdout.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | Makefile | 1 | ||||
-rw-r--r-- | cgit.c | 47 | ||||
-rw-r--r-- | scan-tree.c | 136 | ||||
-rw-r--r-- | scan-tree.h | 3 |
4 files changed, 184 insertions, 3 deletions
@@ -1,120 +1,121 @@ | |||
1 | CGIT_VERSION = v0.7.2 | 1 | CGIT_VERSION = v0.7.2 |
2 | CGIT_SCRIPT_NAME = cgit.cgi | 2 | CGIT_SCRIPT_NAME = cgit.cgi |
3 | CGIT_SCRIPT_PATH = /var/www/htdocs/cgit | 3 | CGIT_SCRIPT_PATH = /var/www/htdocs/cgit |
4 | CGIT_CONFIG = /etc/cgitrc | 4 | CGIT_CONFIG = /etc/cgitrc |
5 | CACHE_ROOT = /var/cache/cgit | 5 | CACHE_ROOT = /var/cache/cgit |
6 | SHA1_HEADER = <openssl/sha.h> | 6 | SHA1_HEADER = <openssl/sha.h> |
7 | GIT_VER = 1.6.0.1 | 7 | GIT_VER = 1.6.0.1 |
8 | GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2 | 8 | GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2 |
9 | 9 | ||
10 | # | 10 | # |
11 | # Let the user override the above settings. | 11 | # Let the user override the above settings. |
12 | # | 12 | # |
13 | -include cgit.conf | 13 | -include cgit.conf |
14 | 14 | ||
15 | # | 15 | # |
16 | # Define a way to invoke make in subdirs quietly, shamelessly ripped | 16 | # Define a way to invoke make in subdirs quietly, shamelessly ripped |
17 | # from git.git | 17 | # from git.git |
18 | # | 18 | # |
19 | QUIET_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir | 19 | QUIET_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir |
20 | QUIET_SUBDIR1 = | 20 | QUIET_SUBDIR1 = |
21 | 21 | ||
22 | ifneq ($(findstring $(MAKEFLAGS),w),w) | 22 | ifneq ($(findstring $(MAKEFLAGS),w),w) |
23 | PRINT_DIR = --no-print-directory | 23 | PRINT_DIR = --no-print-directory |
24 | else # "make -w" | 24 | else # "make -w" |
25 | NO_SUBDIR = : | 25 | NO_SUBDIR = : |
26 | endif | 26 | endif |
27 | 27 | ||
28 | ifndef V | 28 | ifndef V |
29 | QUIET_CC = @echo ' ' CC $@; | 29 | QUIET_CC = @echo ' ' CC $@; |
30 | QUIET_MM = @echo ' ' MM $@; | 30 | QUIET_MM = @echo ' ' MM $@; |
31 | QUIET_SUBDIR0 = +@subdir= | 31 | QUIET_SUBDIR0 = +@subdir= |
32 | QUIET_SUBDIR1 = ;$(NO_SUBDIR) echo ' ' SUBDIR $$subdir; \ | 32 | QUIET_SUBDIR1 = ;$(NO_SUBDIR) echo ' ' SUBDIR $$subdir; \ |
33 | $(MAKE) $(PRINT_DIR) -C $$subdir | 33 | $(MAKE) $(PRINT_DIR) -C $$subdir |
34 | endif | 34 | endif |
35 | 35 | ||
36 | # | 36 | # |
37 | # Define a pattern rule for automatic dependency building | 37 | # Define a pattern rule for automatic dependency building |
38 | # | 38 | # |
39 | %.d: %.c | 39 | %.d: %.c |
40 | $(QUIET_MM)$(CC) $(CFLAGS) -MM $< | sed -e 's/\($*\)\.o:/\1.o $@:/g' >$@ | 40 | $(QUIET_MM)$(CC) $(CFLAGS) -MM $< | sed -e 's/\($*\)\.o:/\1.o $@:/g' >$@ |
41 | 41 | ||
42 | # | 42 | # |
43 | # Define a pattern rule for silent object building | 43 | # Define a pattern rule for silent object building |
44 | # | 44 | # |
45 | %.o: %.c | 45 | %.o: %.c |
46 | $(QUIET_CC)$(CC) -o $*.o -c $(CFLAGS) $< | 46 | $(QUIET_CC)$(CC) -o $*.o -c $(CFLAGS) $< |
47 | 47 | ||
48 | 48 | ||
49 | EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto | 49 | EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto |
50 | OBJECTS = | 50 | OBJECTS = |
51 | OBJECTS += cache.o | 51 | OBJECTS += cache.o |
52 | OBJECTS += cgit.o | 52 | OBJECTS += cgit.o |
53 | OBJECTS += cmd.o | 53 | OBJECTS += cmd.o |
54 | OBJECTS += configfile.o | 54 | OBJECTS += configfile.o |
55 | OBJECTS += html.o | 55 | OBJECTS += html.o |
56 | OBJECTS += parsing.o | 56 | OBJECTS += parsing.o |
57 | OBJECTS += scan-tree.o | ||
57 | OBJECTS += shared.o | 58 | OBJECTS += shared.o |
58 | OBJECTS += ui-atom.o | 59 | OBJECTS += ui-atom.o |
59 | OBJECTS += ui-blob.o | 60 | OBJECTS += ui-blob.o |
60 | OBJECTS += ui-clone.o | 61 | OBJECTS += ui-clone.o |
61 | OBJECTS += ui-commit.o | 62 | OBJECTS += ui-commit.o |
62 | OBJECTS += ui-diff.o | 63 | OBJECTS += ui-diff.o |
63 | OBJECTS += ui-log.o | 64 | OBJECTS += ui-log.o |
64 | OBJECTS += ui-patch.o | 65 | OBJECTS += ui-patch.o |
65 | OBJECTS += ui-plain.o | 66 | OBJECTS += ui-plain.o |
66 | OBJECTS += ui-refs.o | 67 | OBJECTS += ui-refs.o |
67 | OBJECTS += ui-repolist.o | 68 | OBJECTS += ui-repolist.o |
68 | OBJECTS += ui-shared.o | 69 | OBJECTS += ui-shared.o |
69 | OBJECTS += ui-snapshot.o | 70 | OBJECTS += ui-snapshot.o |
70 | OBJECTS += ui-summary.o | 71 | OBJECTS += ui-summary.o |
71 | OBJECTS += ui-tag.o | 72 | OBJECTS += ui-tag.o |
72 | OBJECTS += ui-tree.o | 73 | OBJECTS += ui-tree.o |
73 | 74 | ||
74 | ifdef NEEDS_LIBICONV | 75 | ifdef NEEDS_LIBICONV |
75 | EXTLIBS += -liconv | 76 | EXTLIBS += -liconv |
76 | endif | 77 | endif |
77 | 78 | ||
78 | 79 | ||
79 | .PHONY: all libgit test install uninstall clean force-version get-git | 80 | .PHONY: all libgit test install uninstall clean force-version get-git |
80 | 81 | ||
81 | all: cgit | 82 | all: cgit |
82 | 83 | ||
83 | VERSION: force-version | 84 | VERSION: force-version |
84 | @./gen-version.sh "$(CGIT_VERSION)" | 85 | @./gen-version.sh "$(CGIT_VERSION)" |
85 | -include VERSION | 86 | -include VERSION |
86 | 87 | ||
87 | 88 | ||
88 | CFLAGS += -g -Wall -Igit | 89 | CFLAGS += -g -Wall -Igit |
89 | CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)' | 90 | CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)' |
90 | CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"' | 91 | CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"' |
91 | CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"' | 92 | CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"' |
92 | CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"' | 93 | CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"' |
93 | CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"' | 94 | CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"' |
94 | 95 | ||
95 | 96 | ||
96 | cgit: $(OBJECTS) libgit | 97 | cgit: $(OBJECTS) libgit |
97 | $(QUIET_CC)$(CC) $(CFLAGS) -o cgit $(OBJECTS) $(EXTLIBS) | 98 | $(QUIET_CC)$(CC) $(CFLAGS) -o cgit $(OBJECTS) $(EXTLIBS) |
98 | 99 | ||
99 | cgit.o: VERSION | 100 | cgit.o: VERSION |
100 | 101 | ||
101 | -include $(OBJECTS:.o=.d) | 102 | -include $(OBJECTS:.o=.d) |
102 | 103 | ||
103 | libgit: | 104 | libgit: |
104 | $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) libgit.a | 105 | $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) libgit.a |
105 | $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) xdiff/lib.a | 106 | $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) xdiff/lib.a |
106 | 107 | ||
107 | test: all | 108 | test: all |
108 | $(QUIET_SUBDIR0)tests $(QUIET_SUBDIR1) all | 109 | $(QUIET_SUBDIR0)tests $(QUIET_SUBDIR1) all |
109 | 110 | ||
110 | install: all | 111 | install: all |
111 | mkdir -p $(DESTDIR)$(CGIT_SCRIPT_PATH) | 112 | mkdir -p $(DESTDIR)$(CGIT_SCRIPT_PATH) |
112 | install cgit $(DESTDIR)$(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME) | 113 | install cgit $(DESTDIR)$(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME) |
113 | install cgit.css $(DESTDIR)$(CGIT_SCRIPT_PATH)/cgit.css | 114 | install cgit.css $(DESTDIR)$(CGIT_SCRIPT_PATH)/cgit.css |
114 | install cgit.png $(DESTDIR)$(CGIT_SCRIPT_PATH)/cgit.png | 115 | install cgit.png $(DESTDIR)$(CGIT_SCRIPT_PATH)/cgit.png |
115 | 116 | ||
116 | uninstall: | 117 | uninstall: |
117 | rm -f $(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME) | 118 | rm -f $(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME) |
118 | rm -f $(CGIT_SCRIPT_PATH)/cgit.css | 119 | rm -f $(CGIT_SCRIPT_PATH)/cgit.css |
119 | rm -f $(CGIT_SCRIPT_PATH)/cgit.png | 120 | rm -f $(CGIT_SCRIPT_PATH)/cgit.png |
120 | 121 | ||
@@ -1,78 +1,79 @@ | |||
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 "scan-tree.h" | ||
15 | 16 | ||
16 | const char *cgit_version = CGIT_VERSION; | 17 | const char *cgit_version = CGIT_VERSION; |
17 | 18 | ||
18 | void config_cb(const char *name, const char *value) | 19 | void config_cb(const char *name, const char *value) |
19 | { | 20 | { |
20 | if (!strcmp(name, "root-title")) | 21 | if (!strcmp(name, "root-title")) |
21 | ctx.cfg.root_title = xstrdup(value); | 22 | ctx.cfg.root_title = xstrdup(value); |
22 | else if (!strcmp(name, "root-desc")) | 23 | else if (!strcmp(name, "root-desc")) |
23 | ctx.cfg.root_desc = xstrdup(value); | 24 | ctx.cfg.root_desc = xstrdup(value); |
24 | else if (!strcmp(name, "root-readme")) | 25 | else if (!strcmp(name, "root-readme")) |
25 | ctx.cfg.root_readme = xstrdup(value); | 26 | ctx.cfg.root_readme = xstrdup(value); |
26 | else if (!strcmp(name, "css")) | 27 | else if (!strcmp(name, "css")) |
27 | ctx.cfg.css = xstrdup(value); | 28 | ctx.cfg.css = xstrdup(value); |
28 | else if (!strcmp(name, "favicon")) | 29 | else if (!strcmp(name, "favicon")) |
29 | ctx.cfg.favicon = xstrdup(value); | 30 | ctx.cfg.favicon = xstrdup(value); |
30 | else if (!strcmp(name, "footer")) | 31 | else if (!strcmp(name, "footer")) |
31 | ctx.cfg.footer = xstrdup(value); | 32 | ctx.cfg.footer = xstrdup(value); |
32 | else if (!strcmp(name, "logo")) | 33 | else if (!strcmp(name, "logo")) |
33 | ctx.cfg.logo = xstrdup(value); | 34 | ctx.cfg.logo = xstrdup(value); |
34 | else if (!strcmp(name, "index-header")) | 35 | else if (!strcmp(name, "index-header")) |
35 | ctx.cfg.index_header = xstrdup(value); | 36 | ctx.cfg.index_header = xstrdup(value); |
36 | else if (!strcmp(name, "index-info")) | 37 | else if (!strcmp(name, "index-info")) |
37 | ctx.cfg.index_info = xstrdup(value); | 38 | ctx.cfg.index_info = xstrdup(value); |
38 | else if (!strcmp(name, "logo-link")) | 39 | else if (!strcmp(name, "logo-link")) |
39 | ctx.cfg.logo_link = xstrdup(value); | 40 | ctx.cfg.logo_link = xstrdup(value); |
40 | else if (!strcmp(name, "module-link")) | 41 | else if (!strcmp(name, "module-link")) |
41 | ctx.cfg.module_link = xstrdup(value); | 42 | ctx.cfg.module_link = xstrdup(value); |
42 | else if (!strcmp(name, "virtual-root")) { | 43 | else if (!strcmp(name, "virtual-root")) { |
43 | ctx.cfg.virtual_root = trim_end(value, '/'); | 44 | ctx.cfg.virtual_root = trim_end(value, '/'); |
44 | if (!ctx.cfg.virtual_root && (!strcmp(value, "/"))) | 45 | if (!ctx.cfg.virtual_root && (!strcmp(value, "/"))) |
45 | ctx.cfg.virtual_root = ""; | 46 | ctx.cfg.virtual_root = ""; |
46 | } else if (!strcmp(name, "nocache")) | 47 | } else if (!strcmp(name, "nocache")) |
47 | ctx.cfg.nocache = atoi(value); | 48 | ctx.cfg.nocache = atoi(value); |
48 | else if (!strcmp(name, "snapshots")) | 49 | else if (!strcmp(name, "snapshots")) |
49 | ctx.cfg.snapshots = cgit_parse_snapshots_mask(value); | 50 | ctx.cfg.snapshots = cgit_parse_snapshots_mask(value); |
50 | else if (!strcmp(name, "enable-index-links")) | 51 | else if (!strcmp(name, "enable-index-links")) |
51 | ctx.cfg.enable_index_links = atoi(value); | 52 | ctx.cfg.enable_index_links = atoi(value); |
52 | else if (!strcmp(name, "enable-log-filecount")) | 53 | else if (!strcmp(name, "enable-log-filecount")) |
53 | ctx.cfg.enable_log_filecount = atoi(value); | 54 | ctx.cfg.enable_log_filecount = atoi(value); |
54 | else if (!strcmp(name, "enable-log-linecount")) | 55 | else if (!strcmp(name, "enable-log-linecount")) |
55 | ctx.cfg.enable_log_linecount = atoi(value); | 56 | ctx.cfg.enable_log_linecount = atoi(value); |
56 | else if (!strcmp(name, "cache-size")) | 57 | else if (!strcmp(name, "cache-size")) |
57 | ctx.cfg.cache_size = atoi(value); | 58 | ctx.cfg.cache_size = atoi(value); |
58 | else if (!strcmp(name, "cache-root")) | 59 | else if (!strcmp(name, "cache-root")) |
59 | ctx.cfg.cache_root = xstrdup(value); | 60 | ctx.cfg.cache_root = xstrdup(value); |
60 | else if (!strcmp(name, "cache-root-ttl")) | 61 | else if (!strcmp(name, "cache-root-ttl")) |
61 | ctx.cfg.cache_root_ttl = atoi(value); | 62 | ctx.cfg.cache_root_ttl = atoi(value); |
62 | else if (!strcmp(name, "cache-repo-ttl")) | 63 | else if (!strcmp(name, "cache-repo-ttl")) |
63 | ctx.cfg.cache_repo_ttl = atoi(value); | 64 | ctx.cfg.cache_repo_ttl = atoi(value); |
64 | else if (!strcmp(name, "cache-static-ttl")) | 65 | else if (!strcmp(name, "cache-static-ttl")) |
65 | ctx.cfg.cache_static_ttl = atoi(value); | 66 | ctx.cfg.cache_static_ttl = atoi(value); |
66 | else if (!strcmp(name, "cache-dynamic-ttl")) | 67 | else if (!strcmp(name, "cache-dynamic-ttl")) |
67 | ctx.cfg.cache_dynamic_ttl = atoi(value); | 68 | ctx.cfg.cache_dynamic_ttl = atoi(value); |
68 | else if (!strcmp(name, "max-message-length")) | 69 | else if (!strcmp(name, "max-message-length")) |
69 | ctx.cfg.max_msg_len = atoi(value); | 70 | ctx.cfg.max_msg_len = atoi(value); |
70 | else if (!strcmp(name, "max-repodesc-length")) | 71 | else if (!strcmp(name, "max-repodesc-length")) |
71 | ctx.cfg.max_repodesc_len = atoi(value); | 72 | ctx.cfg.max_repodesc_len = atoi(value); |
72 | else if (!strcmp(name, "max-repo-count")) | 73 | else if (!strcmp(name, "max-repo-count")) |
73 | ctx.cfg.max_repo_count = atoi(value); | 74 | ctx.cfg.max_repo_count = atoi(value); |
74 | else if (!strcmp(name, "max-commit-count")) | 75 | else if (!strcmp(name, "max-commit-count")) |
75 | ctx.cfg.max_commit_count = atoi(value); | 76 | ctx.cfg.max_commit_count = atoi(value); |
76 | else if (!strcmp(name, "summary-log")) | 77 | else if (!strcmp(name, "summary-log")) |
77 | ctx.cfg.summary_log = atoi(value); | 78 | ctx.cfg.summary_log = atoi(value); |
78 | else if (!strcmp(name, "summary-branches")) | 79 | else if (!strcmp(name, "summary-branches")) |
@@ -259,172 +260,212 @@ static int prepare_repo_cmd(struct cgit_context *ctx) | |||
259 | 260 | ||
260 | if (!ctx->qry.head) { | 261 | if (!ctx->qry.head) { |
261 | cgit_print_http_headers(ctx); | 262 | cgit_print_http_headers(ctx); |
262 | cgit_print_docstart(ctx); | 263 | cgit_print_docstart(ctx); |
263 | cgit_print_pageheader(ctx); | 264 | cgit_print_pageheader(ctx); |
264 | cgit_print_error("Repository seems to be empty"); | 265 | cgit_print_error("Repository seems to be empty"); |
265 | cgit_print_docend(); | 266 | cgit_print_docend(); |
266 | return 1; | 267 | return 1; |
267 | } | 268 | } |
268 | 269 | ||
269 | if (get_sha1(ctx->qry.head, sha1)) { | 270 | if (get_sha1(ctx->qry.head, sha1)) { |
270 | tmp = xstrdup(ctx->qry.head); | 271 | tmp = xstrdup(ctx->qry.head); |
271 | ctx->qry.head = ctx->repo->defbranch; | 272 | ctx->qry.head = ctx->repo->defbranch; |
272 | cgit_print_http_headers(ctx); | 273 | cgit_print_http_headers(ctx); |
273 | cgit_print_docstart(ctx); | 274 | cgit_print_docstart(ctx); |
274 | cgit_print_pageheader(ctx); | 275 | cgit_print_pageheader(ctx); |
275 | cgit_print_error(fmt("Invalid branch: %s", tmp)); | 276 | cgit_print_error(fmt("Invalid branch: %s", tmp)); |
276 | cgit_print_docend(); | 277 | cgit_print_docend(); |
277 | return 1; | 278 | return 1; |
278 | } | 279 | } |
279 | return 0; | 280 | return 0; |
280 | } | 281 | } |
281 | 282 | ||
282 | static void process_request(void *cbdata) | 283 | static void process_request(void *cbdata) |
283 | { | 284 | { |
284 | struct cgit_context *ctx = cbdata; | 285 | struct cgit_context *ctx = cbdata; |
285 | struct cgit_cmd *cmd; | 286 | struct cgit_cmd *cmd; |
286 | 287 | ||
287 | cmd = cgit_get_cmd(ctx); | 288 | cmd = cgit_get_cmd(ctx); |
288 | if (!cmd) { | 289 | if (!cmd) { |
289 | ctx->page.title = "cgit error"; | 290 | ctx->page.title = "cgit error"; |
290 | ctx->repo = NULL; | 291 | ctx->repo = NULL; |
291 | cgit_print_http_headers(ctx); | 292 | cgit_print_http_headers(ctx); |
292 | cgit_print_docstart(ctx); | 293 | cgit_print_docstart(ctx); |
293 | cgit_print_pageheader(ctx); | 294 | cgit_print_pageheader(ctx); |
294 | cgit_print_error("Invalid request"); | 295 | cgit_print_error("Invalid request"); |
295 | cgit_print_docend(); | 296 | cgit_print_docend(); |
296 | return; | 297 | return; |
297 | } | 298 | } |
298 | 299 | ||
299 | if (cmd->want_repo && !ctx->repo) { | 300 | if (cmd->want_repo && !ctx->repo) { |
300 | cgit_print_http_headers(ctx); | 301 | cgit_print_http_headers(ctx); |
301 | cgit_print_docstart(ctx); | 302 | cgit_print_docstart(ctx); |
302 | cgit_print_pageheader(ctx); | 303 | cgit_print_pageheader(ctx); |
303 | cgit_print_error(fmt("No repository selected")); | 304 | cgit_print_error(fmt("No repository selected")); |
304 | cgit_print_docend(); | 305 | cgit_print_docend(); |
305 | return; | 306 | return; |
306 | } | 307 | } |
307 | 308 | ||
308 | if (ctx->repo && prepare_repo_cmd(ctx)) | 309 | if (ctx->repo && prepare_repo_cmd(ctx)) |
309 | return; | 310 | return; |
310 | 311 | ||
311 | if (cmd->want_layout) { | 312 | if (cmd->want_layout) { |
312 | cgit_print_http_headers(ctx); | 313 | cgit_print_http_headers(ctx); |
313 | cgit_print_docstart(ctx); | 314 | cgit_print_docstart(ctx); |
314 | cgit_print_pageheader(ctx); | 315 | cgit_print_pageheader(ctx); |
315 | } | 316 | } |
316 | 317 | ||
317 | cmd->fn(ctx); | 318 | cmd->fn(ctx); |
318 | 319 | ||
319 | if (cmd->want_layout) | 320 | if (cmd->want_layout) |
320 | cgit_print_docend(); | 321 | cgit_print_docend(); |
321 | } | 322 | } |
322 | 323 | ||
324 | int cmp_repos(const void *a, const void *b) | ||
325 | { | ||
326 | const struct cgit_repo *ra = a, *rb = b; | ||
327 | return strcmp(ra->url, rb->url); | ||
328 | } | ||
329 | |||
330 | void print_repo(struct cgit_repo *repo) | ||
331 | { | ||
332 | printf("repo.url=%s\n", repo->url); | ||
333 | printf("repo.name=%s\n", repo->name); | ||
334 | printf("repo.path=%s\n", repo->path); | ||
335 | if (repo->owner) | ||
336 | printf("repo.owner=%s\n", repo->owner); | ||
337 | if (repo->desc) | ||
338 | printf("repo.desc=%s\n", repo->desc); | ||
339 | if (repo->readme) | ||
340 | printf("repo.readme=%s\n", repo->readme); | ||
341 | printf("\n"); | ||
342 | } | ||
343 | |||
344 | void print_repolist(struct cgit_repolist *list) | ||
345 | { | ||
346 | int i; | ||
347 | |||
348 | for(i = 0; i < list->count; i++) | ||
349 | print_repo(&list->repos[i]); | ||
350 | } | ||
351 | |||
352 | |||
323 | static void cgit_parse_args(int argc, const char **argv) | 353 | static void cgit_parse_args(int argc, const char **argv) |
324 | { | 354 | { |
325 | int i; | 355 | int i; |
356 | int scan = 0; | ||
326 | 357 | ||
327 | for (i = 1; i < argc; i++) { | 358 | for (i = 1; i < argc; i++) { |
328 | if (!strncmp(argv[i], "--cache=", 8)) { | 359 | if (!strncmp(argv[i], "--cache=", 8)) { |
329 | ctx.cfg.cache_root = xstrdup(argv[i]+8); | 360 | ctx.cfg.cache_root = xstrdup(argv[i]+8); |
330 | } | 361 | } |
331 | if (!strcmp(argv[i], "--nocache")) { | 362 | if (!strcmp(argv[i], "--nocache")) { |
332 | ctx.cfg.nocache = 1; | 363 | ctx.cfg.nocache = 1; |
333 | } | 364 | } |
334 | if (!strncmp(argv[i], "--query=", 8)) { | 365 | if (!strncmp(argv[i], "--query=", 8)) { |
335 | ctx.qry.raw = xstrdup(argv[i]+8); | 366 | ctx.qry.raw = xstrdup(argv[i]+8); |
336 | } | 367 | } |
337 | if (!strncmp(argv[i], "--repo=", 7)) { | 368 | if (!strncmp(argv[i], "--repo=", 7)) { |
338 | ctx.qry.repo = xstrdup(argv[i]+7); | 369 | ctx.qry.repo = xstrdup(argv[i]+7); |
339 | } | 370 | } |
340 | if (!strncmp(argv[i], "--page=", 7)) { | 371 | if (!strncmp(argv[i], "--page=", 7)) { |
341 | ctx.qry.page = xstrdup(argv[i]+7); | 372 | ctx.qry.page = xstrdup(argv[i]+7); |
342 | } | 373 | } |
343 | if (!strncmp(argv[i], "--head=", 7)) { | 374 | if (!strncmp(argv[i], "--head=", 7)) { |
344 | ctx.qry.head = xstrdup(argv[i]+7); | 375 | ctx.qry.head = xstrdup(argv[i]+7); |
345 | ctx.qry.has_symref = 1; | 376 | ctx.qry.has_symref = 1; |
346 | } | 377 | } |
347 | if (!strncmp(argv[i], "--sha1=", 7)) { | 378 | if (!strncmp(argv[i], "--sha1=", 7)) { |
348 | ctx.qry.sha1 = xstrdup(argv[i]+7); | 379 | ctx.qry.sha1 = xstrdup(argv[i]+7); |
349 | ctx.qry.has_sha1 = 1; | 380 | ctx.qry.has_sha1 = 1; |
350 | } | 381 | } |
351 | if (!strncmp(argv[i], "--ofs=", 6)) { | 382 | if (!strncmp(argv[i], "--ofs=", 6)) { |
352 | ctx.qry.ofs = atoi(argv[i]+6); | 383 | ctx.qry.ofs = atoi(argv[i]+6); |
353 | } | 384 | } |
385 | if (!strncmp(argv[i], "--scan-tree=", 12)) { | ||
386 | scan++; | ||
387 | scan_tree(argv[i] + 12); | ||
388 | } | ||
389 | } | ||
390 | if (scan) { | ||
391 | qsort(cgit_repolist.repos, cgit_repolist.count, | ||
392 | sizeof(struct cgit_repo), cmp_repos); | ||
393 | print_repolist(&cgit_repolist); | ||
394 | exit(0); | ||
354 | } | 395 | } |
355 | } | 396 | } |
356 | 397 | ||
357 | static int calc_ttl() | 398 | static int calc_ttl() |
358 | { | 399 | { |
359 | if (!ctx.repo) | 400 | if (!ctx.repo) |
360 | return ctx.cfg.cache_root_ttl; | 401 | return ctx.cfg.cache_root_ttl; |
361 | 402 | ||
362 | if (!ctx.qry.page) | 403 | if (!ctx.qry.page) |
363 | return ctx.cfg.cache_repo_ttl; | 404 | return ctx.cfg.cache_repo_ttl; |
364 | 405 | ||
365 | if (ctx.qry.has_symref) | 406 | if (ctx.qry.has_symref) |
366 | return ctx.cfg.cache_dynamic_ttl; | 407 | return ctx.cfg.cache_dynamic_ttl; |
367 | 408 | ||
368 | if (ctx.qry.has_sha1) | 409 | if (ctx.qry.has_sha1) |
369 | return ctx.cfg.cache_static_ttl; | 410 | return ctx.cfg.cache_static_ttl; |
370 | 411 | ||
371 | return ctx.cfg.cache_repo_ttl; | 412 | return ctx.cfg.cache_repo_ttl; |
372 | } | 413 | } |
373 | 414 | ||
374 | int main(int argc, const char **argv) | 415 | int main(int argc, const char **argv) |
375 | { | 416 | { |
376 | const char *cgit_config_env = getenv("CGIT_CONFIG"); | 417 | const char *cgit_config_env = getenv("CGIT_CONFIG"); |
377 | const char *path; | 418 | const char *path; |
378 | char *qry; | 419 | char *qry; |
379 | int err, ttl; | 420 | int err, ttl; |
380 | 421 | ||
381 | prepare_context(&ctx); | 422 | prepare_context(&ctx); |
382 | cgit_repolist.length = 0; | 423 | cgit_repolist.length = 0; |
383 | cgit_repolist.count = 0; | 424 | cgit_repolist.count = 0; |
384 | cgit_repolist.repos = NULL; | 425 | cgit_repolist.repos = NULL; |
385 | 426 | ||
386 | parse_configfile(cgit_config_env ? cgit_config_env : CGIT_CONFIG, | ||
387 | config_cb); | ||
388 | ctx.repo = NULL; | ||
389 | if (getenv("SCRIPT_NAME")) | 427 | if (getenv("SCRIPT_NAME")) |
390 | ctx.cfg.script_name = xstrdup(getenv("SCRIPT_NAME")); | 428 | ctx.cfg.script_name = xstrdup(getenv("SCRIPT_NAME")); |
391 | if (getenv("QUERY_STRING")) | 429 | if (getenv("QUERY_STRING")) |
392 | ctx.qry.raw = xstrdup(getenv("QUERY_STRING")); | 430 | ctx.qry.raw = xstrdup(getenv("QUERY_STRING")); |
393 | cgit_parse_args(argc, argv); | 431 | cgit_parse_args(argc, argv); |
432 | parse_configfile(cgit_config_env ? cgit_config_env : CGIT_CONFIG, | ||
433 | config_cb); | ||
434 | ctx.repo = NULL; | ||
394 | http_parse_querystring(ctx.qry.raw, querystring_cb); | 435 | http_parse_querystring(ctx.qry.raw, querystring_cb); |
395 | 436 | ||
396 | /* If virtual-root isn't specified in cgitrc and no url | 437 | /* If virtual-root isn't specified in cgitrc and no url |
397 | * parameter is specified on the querystring, lets pretend | 438 | * parameter is specified on the querystring, lets pretend |
398 | * that virtualroot equals SCRIPT_NAME and use PATH_INFO as | 439 | * that virtualroot equals SCRIPT_NAME and use PATH_INFO as |
399 | * url. This allows cgit to work with virtual urls without | 440 | * url. This allows cgit to work with virtual urls without |
400 | * the need for rewriterules in the webserver (as long as | 441 | * the need for rewriterules in the webserver (as long as |
401 | * PATH_INFO is included in the cache lookup key). | 442 | * PATH_INFO is included in the cache lookup key). |
402 | */ | 443 | */ |
403 | if (!ctx.cfg.virtual_root && !ctx.qry.url) { | 444 | if (!ctx.cfg.virtual_root && !ctx.qry.url) { |
404 | ctx.cfg.virtual_root = ctx.cfg.script_name; | 445 | ctx.cfg.virtual_root = ctx.cfg.script_name; |
405 | path = getenv("PATH_INFO"); | 446 | path = getenv("PATH_INFO"); |
406 | if (path) { | 447 | if (path) { |
407 | if (path[0] == '/') | 448 | if (path[0] == '/') |
408 | path++; | 449 | path++; |
409 | ctx.qry.url = xstrdup(path); | 450 | ctx.qry.url = xstrdup(path); |
410 | if (ctx.qry.raw) { | 451 | if (ctx.qry.raw) { |
411 | qry = ctx.qry.raw; | 452 | qry = ctx.qry.raw; |
412 | ctx.qry.raw = xstrdup(fmt("%s?%s", path, qry)); | 453 | ctx.qry.raw = xstrdup(fmt("%s?%s", path, qry)); |
413 | free(qry); | 454 | free(qry); |
414 | } else | 455 | } else |
415 | ctx.qry.raw = ctx.qry.url; | 456 | ctx.qry.raw = ctx.qry.url; |
416 | cgit_parse_url(ctx.qry.url); | 457 | cgit_parse_url(ctx.qry.url); |
417 | } | 458 | } |
418 | } | 459 | } |
419 | 460 | ||
420 | ttl = calc_ttl(); | 461 | ttl = calc_ttl(); |
421 | ctx.page.expires += ttl*60; | 462 | ctx.page.expires += ttl*60; |
422 | if (ctx.cfg.nocache) | 463 | if (ctx.cfg.nocache) |
423 | ctx.cfg.cache_size = 0; | 464 | ctx.cfg.cache_size = 0; |
424 | err = cache_process(ctx.cfg.cache_size, ctx.cfg.cache_root, | 465 | err = cache_process(ctx.cfg.cache_size, ctx.cfg.cache_root, |
425 | ctx.qry.raw, ttl, process_request, &ctx); | 466 | ctx.qry.raw, ttl, process_request, &ctx); |
426 | if (err) | 467 | if (err) |
427 | cgit_print_error(fmt("Error processing page: %s (%d)", | 468 | cgit_print_error(fmt("Error processing page: %s (%d)", |
428 | strerror(err), err)); | 469 | strerror(err), err)); |
429 | return err; | 470 | return err; |
430 | } | 471 | } |
diff --git a/scan-tree.c b/scan-tree.c new file mode 100644 index 0000000..cdafb02 --- a/dev/null +++ b/scan-tree.c | |||
@@ -0,0 +1,136 @@ | |||
1 | #include "cgit.h" | ||
2 | #include "html.h" | ||
3 | |||
4 | #define MAX_PATH 4096 | ||
5 | |||
6 | /* return 1 if path contains a objects/ directory and a HEAD file */ | ||
7 | static int is_git_dir(const char *path) | ||
8 | { | ||
9 | struct stat st; | ||
10 | static char buf[MAX_PATH]; | ||
11 | |||
12 | if (snprintf(buf, MAX_PATH, "%s/objects", path) >= MAX_PATH) { | ||
13 | fprintf(stderr, "Insanely long path: %s\n", path); | ||
14 | return 0; | ||
15 | } | ||
16 | if (stat(buf, &st)) { | ||
17 | if (errno != ENOENT) | ||
18 | fprintf(stderr, "Error checking path %s: %s (%d)\n", | ||
19 | path, strerror(errno), errno); | ||
20 | return 0; | ||
21 | } | ||
22 | if (!S_ISDIR(st.st_mode)) | ||
23 | return 0; | ||
24 | |||
25 | sprintf(buf, "%s/HEAD", path); | ||
26 | if (stat(buf, &st)) { | ||
27 | if (errno != ENOENT) | ||
28 | fprintf(stderr, "Error checking path %s: %s (%d)\n", | ||
29 | path, strerror(errno), errno); | ||
30 | return 0; | ||
31 | } | ||
32 | if (!S_ISREG(st.st_mode)) | ||
33 | return 0; | ||
34 | |||
35 | return 1; | ||
36 | } | ||
37 | |||
38 | char *readfile(const char *path) | ||
39 | { | ||
40 | FILE *f; | ||
41 | static char buf[MAX_PATH]; | ||
42 | |||
43 | if (!(f = fopen(path, "r"))) | ||
44 | return NULL; | ||
45 | fgets(buf, MAX_PATH, f); | ||
46 | fclose(f); | ||
47 | return buf; | ||
48 | } | ||
49 | |||
50 | static void add_repo(const char *base, const char *path) | ||
51 | { | ||
52 | struct cgit_repo *repo; | ||
53 | struct stat st; | ||
54 | struct passwd *pwd; | ||
55 | char *p; | ||
56 | |||
57 | if (stat(path, &st)) { | ||
58 | fprintf(stderr, "Error accessing %s: %s (%d)\n", | ||
59 | path, strerror(errno), errno); | ||
60 | return; | ||
61 | } | ||
62 | if ((pwd = getpwuid(st.st_uid)) == NULL) { | ||
63 | fprintf(stderr, "Error reading owner-info for %s: %s (%d)\n", | ||
64 | path, strerror(errno), errno); | ||
65 | return; | ||
66 | } | ||
67 | if (base == path) | ||
68 | p = fmt("%s", path); | ||
69 | else | ||
70 | p = fmt("%s", path + strlen(base) + 1); | ||
71 | |||
72 | if (!strcmp(p + strlen(p) - 5, "/.git")) | ||
73 | p[strlen(p) - 5] = '\0'; | ||
74 | |||
75 | repo = cgit_add_repo(xstrdup(p)); | ||
76 | repo->name = repo->url; | ||
77 | repo->path = xstrdup(path); | ||
78 | repo->owner = (pwd ? xstrdup(pwd->pw_gecos ? pwd->pw_gecos : pwd->pw_name) : ""); | ||
79 | |||
80 | p = fmt("%s/description", path); | ||
81 | if (!stat(p, &st)) | ||
82 | repo->desc = xstrdup(readfile(p)); | ||
83 | |||
84 | p = fmt("%s/README.html", path); | ||
85 | if (!stat(p, &st)) | ||
86 | repo->readme = "README.html"; | ||
87 | } | ||
88 | |||
89 | static void scan_path(const char *base, const char *path) | ||
90 | { | ||
91 | DIR *dir; | ||
92 | struct dirent *ent; | ||
93 | char *buf; | ||
94 | struct stat st; | ||
95 | |||
96 | if (is_git_dir(path)) { | ||
97 | add_repo(base, path); | ||
98 | return; | ||
99 | } | ||
100 | dir = opendir(path); | ||
101 | if (!dir) { | ||
102 | fprintf(stderr, "Error opening directory %s: %s (%d)\n", | ||
103 | path, strerror(errno), errno); | ||
104 | return; | ||
105 | } | ||
106 | while((ent = readdir(dir)) != NULL) { | ||
107 | if (ent->d_name[0] == '.') { | ||
108 | if (ent->d_name[1] == '\0') | ||
109 | continue; | ||
110 | if (ent->d_name[1] == '.' && ent->d_name[2] == '\0') | ||
111 | continue; | ||
112 | } | ||
113 | buf = malloc(strlen(path) + strlen(ent->d_name) + 2); | ||
114 | if (!buf) { | ||
115 | fprintf(stderr, "Alloc error on %s: %s (%d)\n", | ||
116 | path, strerror(errno), errno); | ||
117 | exit(1); | ||
118 | } | ||
119 | sprintf(buf, "%s/%s", path, ent->d_name); | ||
120 | if (stat(buf, &st)) { | ||
121 | fprintf(stderr, "Error checking path %s: %s (%d)\n", | ||
122 | buf, strerror(errno), errno); | ||
123 | free(buf); | ||
124 | continue; | ||
125 | } | ||
126 | if (S_ISDIR(st.st_mode)) | ||
127 | scan_path(base, buf); | ||
128 | free(buf); | ||
129 | } | ||
130 | closedir(dir); | ||
131 | } | ||
132 | |||
133 | void scan_tree(const char *path) | ||
134 | { | ||
135 | scan_path(path, path); | ||
136 | } | ||
diff --git a/scan-tree.h b/scan-tree.h new file mode 100644 index 0000000..b103b16 --- a/dev/null +++ b/scan-tree.h | |||
@@ -0,0 +1,3 @@ | |||
1 | |||
2 | |||
3 | extern void scan_tree(const char *path); | ||