diff options
| -rw-r--r-- | cgit.c | 64 | ||||
| -rw-r--r-- | cgit.h | 18 | ||||
| -rw-r--r-- | cgitrc | 13 | ||||
| -rw-r--r-- | shared.c | 41 | ||||
| -rw-r--r-- | ui-repolist.c | 39 |
5 files changed, 120 insertions, 55 deletions
diff --git a/cgit.c b/cgit.c index 9535abc..0fa203c 100644 --- a/cgit.c +++ b/cgit.c @@ -10,18 +10,45 @@ const char cgit_version[] = CGIT_VERSION; -static void cgit_prepare_cache(struct cacheitem *item) + +static struct repoinfo *cgit_get_repoinfo(char *url) +{ + int i; + struct repoinfo *repo; + + for (i=0; i<cgit_repolist.count; i++) { + repo = &cgit_repolist.repos[i]; + if (!strcmp(repo->url, url)) + return repo; + } + return NULL; +} + + +static int cgit_prepare_cache(struct cacheitem *item) { if (!cgit_query_repo) { item->name = xstrdup(fmt("%s/index.html", cgit_cache_root)); item->ttl = cgit_cache_root_ttl; - } else if (!cgit_query_page) { + return 1; + } + cgit_repo = cgit_get_repoinfo(cgit_query_repo); + if (!cgit_repo) { + char *title = fmt("%s - %s", cgit_root_title, "Bad request"); + cgit_print_docstart(title, item); + cgit_print_pageheader(title, 0); + cgit_print_error(fmt("Unknown repo: %s", cgit_query_repo)); + cgit_print_docend(); + return 0; + } + + if (!cgit_query_page) { item->name = xstrdup(fmt("%s/%s/index.html", cgit_cache_root, - cgit_query_repo)); + cgit_repo->url)); item->ttl = cgit_cache_repo_ttl; } else { item->name = xstrdup(fmt("%s/%s/%s/%s.html", cgit_cache_root, - cgit_query_repo, cgit_query_page, + cgit_repo->url, cgit_query_page, cache_safe_filename(cgit_querystring))); if (cgit_query_has_symref) item->ttl = cgit_cache_dynamic_ttl; @@ -30,13 +57,16 @@ static void cgit_prepare_cache(struct cacheitem *item) else item->ttl = cgit_cache_repo_ttl; } + return 1; } static void cgit_print_repo_page(struct cacheitem *item) { - if (chdir(fmt("%s/%s", cgit_root, cgit_query_repo)) || - cgit_read_config("info/cgit", cgit_repo_config_cb)) { - char *title = fmt("%s - %s", cgit_root_title, "Bad request"); + char *title; + int show_search; + + if (chdir(cgit_repo->path)) { + title = fmt("%s - %s", cgit_root_title, "Bad request"); cgit_print_docstart(title, item); cgit_print_pageheader(title, 0); cgit_print_error(fmt("Unable to scan repository: %s", @@ -44,9 +74,10 @@ static void cgit_print_repo_page(struct cacheitem *item) cgit_print_docend(); return; } - setenv("GIT_DIR", fmt("%s/%s", cgit_root, cgit_query_repo), 1); - char *title = fmt("%s - %s", cgit_repo_name, cgit_repo_desc); - int show_search = 0; + + title = fmt("%s - %s", cgit_repo->name, cgit_repo->desc); + show_search = 0; + setenv("GIT_DIR", cgit_repo->path, 1); if (cgit_query_page && !strcmp(cgit_query_page, "log")) show_search = 1; cgit_print_docstart(title, item); @@ -131,9 +162,6 @@ static void cgit_parse_args(int argc, const char **argv) int i; for (i = 1; i < argc; i++) { - if (!strncmp(argv[i], "--root=", 7)) { - cgit_root = xstrdup(argv[i]+7); - } if (!strncmp(argv[i], "--cache=", 8)) { cgit_cache_root = xstrdup(argv[i]+8); } @@ -167,13 +195,19 @@ int main(int argc, const char **argv) { struct cacheitem item; + htmlfd = STDOUT_FILENO; + item.st.st_mtime = time(NULL); + cgit_repolist.length = 0; + cgit_repolist.count = 0; + cgit_repolist.repos = NULL; + cgit_read_config("/etc/cgitrc", cgit_global_config_cb); if (getenv("QUERY_STRING")) cgit_querystring = xstrdup(getenv("QUERY_STRING")); cgit_parse_args(argc, argv); cgit_parse_query(cgit_querystring, cgit_querystring_cb); - - cgit_prepare_cache(&item); + if (!cgit_prepare_cache(&item)) + return 0; if (cgit_nocache) { item.fd = STDOUT_FILENO; cgit_fill_cache(&item); diff --git a/cgit.h b/cgit.h index a3b5385..2a3cd5a 100644 --- a/cgit.h +++ b/cgit.h @@ -15,6 +15,20 @@ struct cacheitem { int fd; }; +struct repoinfo { + char *url; + char *name; + char *path; + char *desc; + char *owner; +}; + +struct repolist { + int length; + int count; + struct repoinfo *repos; +}; + struct commitinfo { struct commit *commit; char *author; @@ -36,7 +50,9 @@ struct taginfo { extern const char cgit_version[]; -extern char *cgit_root; +extern struct repolist cgit_repolist; +extern struct repoinfo *cgit_repo; + extern char *cgit_root_title; extern char *cgit_css; extern char *cgit_logo; diff --git a/cgitrc b/cgitrc index 7e7fae5..da3d138 100644 --- a/cgitrc +++ b/cgitrc @@ -3,10 +3,6 @@ ## -## root folder for git repos -#root=/usr/src/git - - ## base for virtual urls. If specified, rewrite rules must be added to ## httpd.conf. Possible rules for /git/ when cgit.cgi is accessed as /cgit.cgi: ## @@ -61,3 +57,12 @@ ## ttl for static pages (addressed by SHA-1) #cache-static-ttl=-1 + + + +## Example repository entry +#repo.url=cgit +#repo.name=cgit +#repo.desc=the caching cgi for git +#repo.path=/pub/git/cgit +#repo.owner=Lars Hjemli diff --git a/shared.c b/shared.c index 8e6df31..6fd70a8 100644 --- a/shared.c +++ b/shared.c @@ -8,7 +8,9 @@ #include "cgit.h" -char *cgit_root = "/usr/src/git"; +struct repolist cgit_repolist; +struct repoinfo *cgit_repo; + char *cgit_root_title = "Git repository browser"; char *cgit_css = "/cgit.css"; char *cgit_logo = "/git-logo.png"; @@ -46,11 +48,32 @@ int cgit_query_ofs = 0; int htmlfd = 0; +struct repoinfo *add_repo(const char *url) +{ + struct repoinfo *ret; + + if (++cgit_repolist.count > cgit_repolist.length) { + if (cgit_repolist.length == 0) + cgit_repolist.length = 8; + else + cgit_repolist.length *= 2; + cgit_repolist.repos = xrealloc(cgit_repolist.repos, + cgit_repolist.length * + sizeof(struct repoinfo)); + } + + ret = &cgit_repolist.repos[cgit_repolist.count-1]; + ret->url = xstrdup(url); + ret->name = ret->url; + ret->path = NULL; + ret->desc = NULL; + ret->owner = NULL; + return ret; +} + void cgit_global_config_cb(const char *name, const char *value) { - if (!strcmp(name, "root")) - cgit_root = xstrdup(value); - else if (!strcmp(name, "root-title")) + if (!strcmp(name, "root-title")) cgit_root_title = xstrdup(value); else if (!strcmp(name, "css")) cgit_css = xstrdup(value); @@ -74,6 +97,16 @@ void cgit_global_config_cb(const char *name, const char *value) cgit_cache_dynamic_ttl = atoi(value); else if (!strcmp(name, "max-message-length")) cgit_max_msg_len = atoi(value); + else if (!strcmp(name, "repo.url")) + cgit_repo = add_repo(value); + else if (!strcmp(name, "repo.name")) + cgit_repo->name = xstrdup(value); + else if (cgit_repo && !strcmp(name, "repo.path")) + cgit_repo->path = xstrdup(value); + else if (cgit_repo && !strcmp(name, "repo.desc")) + cgit_repo->desc = xstrdup(value); + else if (cgit_repo && !strcmp(name, "repo.owner")) + cgit_repo->owner = xstrdup(value); } void cgit_repo_config_cb(const char *name, const char *value) diff --git a/ui-repolist.c b/ui-repolist.c index bd4af59..011ec95 100644 --- a/ui-repolist.c +++ b/ui-repolist.c @@ -10,54 +10,31 @@ void cgit_print_repolist(struct cacheitem *item) { - DIR *d; - struct dirent *de; - struct stat st; - char *name; + struct repoinfo *repo; + int i; - chdir(cgit_root); cgit_print_docstart(cgit_root_title, item); cgit_print_pageheader(cgit_root_title, 0); - if (!(d = opendir("."))) { - cgit_print_error(fmt("Unable to scan repository directory: %s", - strerror(errno))); - cgit_print_docend(); - return; - } - html("<h2>Repositories</h2>\n"); html("<table class='list nowrap'>"); html("<tr class='nohover'>" "<th class='left'>Name</th>" "<th class='left'>Description</th>" "<th class='left'>Owner</th></tr>\n"); - while ((de = readdir(d)) != NULL) { - if (de->d_name[0] == '.') - continue; - if (stat(de->d_name, &st) < 0) - continue; - if (!S_ISDIR(st.st_mode)) - continue; - - cgit_repo_name = cgit_repo_desc = cgit_repo_owner = NULL; - name = fmt("%s/info/cgit", de->d_name); - if (cgit_read_config(name, cgit_repo_config_cb)) - continue; + for (i=0; i<cgit_repolist.count; i++) { + repo = &cgit_repolist.repos[i]; html("<tr><td>"); - html_link_open(cgit_repourl(de->d_name), NULL, NULL); - html_txt(cgit_repo_name); + html_link_open(cgit_repourl(repo->url), NULL, NULL); + html_txt(repo->name); html_link_close(); html("</td><td>"); - html_txt(cgit_repo_desc); + html_txt(repo->desc); html("</td><td>"); - html_txt(cgit_repo_owner); + html_txt(repo->owner); html("</td></tr>\n"); } - closedir(d); html("</table>"); cgit_print_docend(); } - - |