| Date | Message | Author |
|---|
");
- html_txt(buf);
- html("");
+ if (get_sha1(ctx->qry.head, sha1)) {
+ tmp = xstrdup(ctx->qry.head);
+ ctx->qry.head = ctx->repo->defbranch;
+ cgit_print_http_headers(ctx);
+ cgit_print_docstart(ctx);
+ cgit_print_pageheader(ctx);
+ cgit_print_error(fmt("Invalid branch: %s", tmp));
+ cgit_print_docend();
+ return 1;
+ }
+ return 0;
}
-static void cgit_print_repo_page(struct cacheitem *item)
+static void process_request(struct cgit_context *ctx)
{
- 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");
- cgit_print_docstart(title, item);
- cgit_print_pageheader(title);
- cgit_print_error(fmt("Unable to scan repository: %s",
- strerror(errno)));
+ struct cgit_cmd *cmd;
+
+ cmd = cgit_get_cmd(ctx);
+ if (!cmd) {
+ ctx->page.title = "cgit error";
+ ctx->repo = NULL;
+ cgit_print_http_headers(ctx);
+ cgit_print_docstart(ctx);
+ cgit_print_pageheader(ctx);
+ cgit_print_error("Invalid request");
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);
- cgit_print_docstart(title, item);
- cgit_print_pageheader(title);
- if (!cgit_query_page)
- cgit_print_repo_summary();
- else if (!strcmp(cgit_query_page, "log")) {
- cgit_print_log(cgit_query_head, 0, 100);
- } else if (!strcmp(cgit_query_page, "view")) {
- cgit_print_object(cgit_query_sha1);
+
+ if (cmd->want_repo && prepare_repo_cmd(ctx))
+ return;
+
+ if (cmd->want_layout) {
+ cgit_print_http_headers(ctx);
+ cgit_print_docstart(ctx);
+ cgit_print_pageheader(ctx);
}
- cgit_print_docend();
+
+ cmd->fn(ctx);
+
+ if (cmd->want_layout)
+ cgit_print_docend();
}
-static void cgit_fill_cache(struct cacheitem *item)
+static long ttl_seconds(long ttl)
{
- htmlfd = item->fd;
- item->st.st_mtime = time(NULL);
- if (cgit_query_repo)
- cgit_print_repo_page(item);
+ if (ttl<0)
+ return 60 * 60 * 24 * 365;
else
- cgit_print_repolist(item);
+ return ttl * 60;
}
-static void cgit_refresh_cache(struct cacheitem *item)
+static void cgit_fill_cache(struct cacheitem *item, int use_cache)
+{
+ int stdout2;
+
+ if (use_cache) {
+ stdout2 = chk_positive(dup(STDOUT_FILENO),
+ "Preserving STDOUT");
+ chk_zero(close(STDOUT_FILENO), "Closing STDOUT");
+ chk_positive(dup2(item->fd, STDOUT_FILENO), "Dup2(cachefile)");
+ }
+
+ ctx.page.modified = time(NULL);
+ ctx.page.expires = ctx.page.modified + ttl_seconds(item->ttl);
+ process_request(&ctx);
+
+ if (use_cache) {
+ chk_zero(close(STDOUT_FILENO), "Close redirected STDOUT");
+ chk_positive(dup2(stdout2, STDOUT_FILENO),
+ "Restoring original STDOUT");
+ chk_zero(close(stdout2), "Closing temporary STDOUT");
+ }
+}
+
+static void cgit_check_cache(struct cacheitem *item)
{
int i = 0;
- cache_prepare(item);
top:
- if (++i > cgit_max_lock_attempts) {
+ if (++i > ctx.cfg.max_lock_attempts) {
die("cgit_refresh_cache: unable to lock %s: %s",
item->name, strerror(errno));
}
@@ -272,13 +206,19 @@ static void cgit_refresh_cache(struct cacheitem *item)
sleep(1);
goto top;
}
- if (!cache_exist(item))
- cgit_fill_cache(item);
- cache_unlock(item);
+ if (!cache_exist(item)) {
+ cgit_fill_cache(item, 1);
+ cache_unlock(item);
+ } else {
+ cache_cancel_lock(item);
+ }
} else if (cache_expired(item) && cache_lock(item)) {
- if (cache_expired(item))
- cgit_fill_cache(item);
- cache_unlock(item);
+ if (cache_expired(item)) {
+ cgit_fill_cache(item, 1);
+ cache_unlock(item);
+ } else {
+ cache_cancel_lock(item);
+ }
}
}
@@ -297,12 +237,66 @@ static void cgit_print_cache(struct cacheitem *item)
close(fd);
}
+static void cgit_parse_args(int argc, const char **argv)
+{
+ int i;
+
+ for (i = 1; i < argc; i++) {
+ if (!strncmp(argv[i], "--cache=", 8)) {
+ ctx.cfg.cache_root = xstrdup(argv[i]+8);
+ }
+ if (!strcmp(argv[i], "--nocache")) {
+ ctx.cfg.nocache = 1;
+ }
+ if (!strncmp(argv[i], "--query=", 8)) {
+ ctx.qry.raw = xstrdup(argv[i]+8);
+ }
+ if (!strncmp(argv[i], "--repo=", 7)) {
+ ctx.qry.repo = xstrdup(argv[i]+7);
+ }
+ if (!strncmp(argv[i], "--page=", 7)) {
+ ctx.qry.page = xstrdup(argv[i]+7);
+ }
+ if (!strncmp(argv[i], "--head=", 7)) {
+ ctx.qry.head = xstrdup(argv[i]+7);
+ ctx.qry.has_symref = 1;
+ }
+ if (!strncmp(argv[i], "--sha1=", 7)) {
+ ctx.qry.sha1 = xstrdup(argv[i]+7);
+ ctx.qry.has_sha1 = 1;
+ }
+ if (!strncmp(argv[i], "--ofs=", 6)) {
+ ctx.qry.ofs = atoi(argv[i]+6);
+ }
+ }
+}
+
int main(int argc, const char **argv)
{
- cgit_read_config("/etc/cgitrc", cgit_global_config_cb);
- cgit_querystring = xstrdup(getenv("QUERY_STRING"));
- cgit_parse_query(cgit_querystring, cgit_querystring_cb);
- cgit_refresh_cache(&cacheitem);
- cgit_print_cache(&cacheitem);
+ struct cacheitem item;
+ const char *cgit_config_env = getenv("CGIT_CONFIG");
+
+ cgit_prepare_context(&ctx);
+ item.st.st_mtime = time(NULL);
+ cgit_repolist.length = 0;
+ cgit_repolist.count = 0;
+ cgit_repolist.repos = NULL;
+
+ cgit_read_config(cgit_config_env ? cgit_config_env : CGIT_CONFIG,
+ cgit_global_config_cb);
+ if (getenv("SCRIPT_NAME"))
+ ctx.cfg.script_name = xstrdup(getenv("SCRIPT_NAME"));
+ if (getenv("QUERY_STRING"))
+ ctx.qry.raw = xstrdup(getenv("QUERY_STRING"));
+ cgit_parse_args(argc, argv);
+ cgit_parse_query(ctx.qry.raw, cgit_querystring_cb);
+ if (!cgit_prepare_cache(&item))
+ return 0;
+ if (ctx.cfg.nocache) {
+ cgit_fill_cache(&item, 0);
+ } else {
+ cgit_check_cache(&item);
+ cgit_print_cache(&item);
+ }
return 0;
}