Add struct cgit_page to cgit_context

[ps-cgit] / cgit.c

diff --git a/cgit.c b/cgit.c
index 8a30c3c8a22246b7ca357f18241ad82b04628770..d0f69058f41b55de9a6b040c5cd3f527ece94be8 100644 (file)
--- a/cgit.c
+++ b/cgit.c
@@ -7,40 +7,43 @@
  */
 
 #include "cgit.h"
  */
 
 #include "cgit.h"

+#include "cmd.h"

 
 static int cgit_prepare_cache(struct cacheitem *item)
 {
 
 static int cgit_prepare_cache(struct cacheitem *item)
 {

-       if (!cgit_repo && ctx.qry.repo) {
-               char *title = fmt("%s - %s", cgit_root_title, "Bad request");
-               cgit_print_docstart(title, item);
-               cgit_print_pageheader(title, 0);
+       if (!ctx.repo && ctx.qry.repo) {
+               ctx.page.title = fmt("%s - %s", ctx.cfg.root_title,
+                                     "Bad request");
+               cgit_print_http_headers(&ctx);
+               cgit_print_docstart(&ctx);
+               cgit_print_pageheader(&ctx);

                cgit_print_error(fmt("Unknown repo: %s", ctx.qry.repo));
                cgit_print_docend();
                return 0;
        }
 
                cgit_print_error(fmt("Unknown repo: %s", ctx.qry.repo));
                cgit_print_docend();
                return 0;
        }
 

-       if (!cgit_repo) {
-               item->name = xstrdup(fmt("%s/index.html", cgit_cache_root));
-               item->ttl = cgit_cache_root_ttl;
+       if (!ctx.repo) {
+               item->name = xstrdup(fmt("%s/index.html", ctx.cfg.cache_root));
+               item->ttl = ctx.cfg.cache_root_ttl;

                return 1;
        }
 
        if (!cgit_cmd) {
                return 1;
        }
 
        if (!cgit_cmd) {

-               item->name = xstrdup(fmt("%s/%s/index.%s.html", cgit_cache_root,
-                                        cache_safe_filename(cgit_repo->url),
+               item->name = xstrdup(fmt("%s/%s/index.%s.html", ctx.cfg.cache_root,
+                                        cache_safe_filename(ctx.repo->url),

                                         cache_safe_filename(ctx.qry.raw)));
                                         cache_safe_filename(ctx.qry.raw)));

-               item->ttl = cgit_cache_repo_ttl;
+               item->ttl = ctx.cfg.cache_repo_ttl;

        } else {
        } else {

-               item->name = xstrdup(fmt("%s/%s/%s/%s.html", cgit_cache_root,
-                                        cache_safe_filename(cgit_repo->url),
+               item->name = xstrdup(fmt("%s/%s/%s/%s.html", ctx.cfg.cache_root,
+                                        cache_safe_filename(ctx.repo->url),

                                         ctx.qry.page,
                                         cache_safe_filename(ctx.qry.raw)));
                if (ctx.qry.has_symref)
                                         ctx.qry.page,
                                         cache_safe_filename(ctx.qry.raw)));
                if (ctx.qry.has_symref)

-                       item->ttl = cgit_cache_dynamic_ttl;
+                       item->ttl = ctx.cfg.cache_dynamic_ttl;

                else if (ctx.qry.has_sha1)
                else if (ctx.qry.has_sha1)

-                       item->ttl = cgit_cache_static_ttl;
+                       item->ttl = ctx.cfg.cache_static_ttl;

                else
                else

-                       item->ttl = cgit_cache_repo_ttl;
+                       item->ttl = ctx.cfg.cache_repo_ttl;

        }
        return 1;
 }
        }
        return 1;
 }


@@ -64,7 +67,7 @@ int find_current_ref(const char *refname, const unsigned char *sha1,
        return info->match;
 }
 
        return info->match;
 }
 

-char *find_default_branch(struct repoinfo *repo)
+char *find_default_branch(struct cgit_repo *repo)

 {
        struct refmatch info;
 
 {
        struct refmatch info;
 


@@ -80,32 +83,38 @@ char *find_default_branch(struct repoinfo *repo)
 
 static void cgit_print_repo_page(struct cacheitem *item)
 {
 
 static void cgit_print_repo_page(struct cacheitem *item)
 {

-       char *title, *tmp;
+       char *tmp;

        int show_search;
        unsigned char sha1[20];
        int show_search;
        unsigned char sha1[20];

-
-       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",
-                                    strerror(errno)));
+       int nongit = 0;
+
+       setenv("GIT_DIR", ctx.repo->path, 1);
+       setup_git_directory_gently(&nongit);
+       if (nongit) {
+               ctx.page.title = fmt("%s - %s", ctx.cfg.root_title,
+                                    "config error");
+               tmp = fmt("Not a git repository: '%s'", ctx.repo->path);
+               ctx.repo = NULL;
+               cgit_print_http_headers(&ctx);
+               cgit_print_docstart(&ctx);
+               cgit_print_pageheader(&ctx);
+               cgit_print_error(tmp);

                cgit_print_docend();
                return;
        }
 
                cgit_print_docend();
                return;
        }
 

-       title = fmt("%s - %s", cgit_repo->name, cgit_repo->desc);
+       ctx.page.title = fmt("%s - %s", ctx.repo->name, ctx.repo->desc);

        show_search = 0;
        show_search = 0;

-       setenv("GIT_DIR", cgit_repo->path, 1);

 
        if (!ctx.qry.head) {
 
        if (!ctx.qry.head) {

-               ctx.qry.head = xstrdup(find_default_branch(cgit_repo));
-               cgit_repo->defbranch = ctx.qry.head;
+               ctx.qry.head = xstrdup(find_default_branch(ctx.repo));
+               ctx.repo->defbranch = ctx.qry.head;

        }
 
        if (!ctx.qry.head) {
        }
 
        if (!ctx.qry.head) {

-               cgit_print_docstart(title, item);
-               cgit_print_pageheader(title, 0);
+               cgit_print_http_headers(&ctx);
+               cgit_print_docstart(&ctx);
+               cgit_print_pageheader(&ctx);

                cgit_print_error("Repository seems to be empty");
                cgit_print_docend();
                return;
                cgit_print_error("Repository seems to be empty");
                cgit_print_docend();
                return;


@@ -113,19 +122,20 @@ static void cgit_print_repo_page(struct cacheitem *item)
 
        if (get_sha1(ctx.qry.head, sha1)) {
                tmp = xstrdup(ctx.qry.head);
 
        if (get_sha1(ctx.qry.head, sha1)) {
                tmp = xstrdup(ctx.qry.head);

-               ctx.qry.head = cgit_repo->defbranch;
-               cgit_print_docstart(title, item);
-               cgit_print_pageheader(title, 0);
+               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;
        }
 
                cgit_print_error(fmt("Invalid branch: %s", tmp));
                cgit_print_docend();
                return;
        }
 

-       if ((cgit_cmd == CMD_SNAPSHOT) && cgit_repo->snapshots) {
+       if ((cgit_cmd == CMD_SNAPSHOT) && ctx.repo->snapshots) {

                cgit_print_snapshot(item, ctx.qry.head, ctx.qry.sha1,
                cgit_print_snapshot(item, ctx.qry.head, ctx.qry.sha1,

-                                   cgit_repobasename(cgit_repo->url),
+                                   cgit_repobasename(ctx.repo->url),

                                    ctx.qry.path,
                                    ctx.qry.path,

-                                   cgit_repo->snapshots );
+                                   ctx.repo->snapshots );

                return;
        }
 
                return;
        }
 


@@ -140,20 +150,21 @@ static void cgit_print_repo_page(struct cacheitem *item)
        }
 
        show_search = (cgit_cmd == CMD_LOG);
        }
 
        show_search = (cgit_cmd == CMD_LOG);

-       cgit_print_docstart(title, item);
+       cgit_print_http_headers(&ctx);
+       cgit_print_docstart(&ctx);

        if (!cgit_cmd) {
        if (!cgit_cmd) {

-               cgit_print_pageheader("summary", show_search);
+               cgit_print_pageheader(&ctx);

                cgit_print_summary();
                cgit_print_docend();
                return;
        }
 
                cgit_print_summary();
                cgit_print_docend();
                return;
        }
 

-       cgit_print_pageheader(ctx.qry.page, show_search);
+       cgit_print_pageheader(&ctx);

 
        switch(cgit_cmd) {
        case CMD_LOG:
                cgit_print_log(ctx.qry.sha1, ctx.qry.ofs,
 
        switch(cgit_cmd) {
        case CMD_LOG:
                cgit_print_log(ctx.qry.sha1, ctx.qry.ofs,

-                              cgit_max_commit_count, ctx.qry.grep, ctx.qry.search,
+                              ctx.cfg.max_commit_count, ctx.qry.grep, ctx.qry.search,

                               ctx.qry.path, 1);
                break;
        case CMD_TREE:
                               ctx.qry.path, 1);
                break;
        case CMD_TREE:


@@ -177,14 +188,18 @@ static void cgit_print_repo_page(struct cacheitem *item)
        cgit_print_docend();
 }
 
        cgit_print_docend();
 }
 

+static long ttl_seconds(long ttl)
+{
+       if (ttl<0)
+               return 60 * 60 * 24 * 365;
+       else
+               return ttl * 60;
+}
+

 static void cgit_fill_cache(struct cacheitem *item, int use_cache)
 {
 static void cgit_fill_cache(struct cacheitem *item, int use_cache)
 {

-       static char buf[PATH_MAX];

        int stdout2;
 
        int stdout2;
 

-       getcwd(buf, sizeof(buf));
-       item->st.st_mtime = time(NULL);
-

        if (use_cache) {
                stdout2 = chk_positive(dup(STDOUT_FILENO),
                                       "Preserving STDOUT");
        if (use_cache) {
                stdout2 = chk_positive(dup(STDOUT_FILENO),
                                       "Preserving STDOUT");


@@ -192,7 +207,9 @@ static void cgit_fill_cache(struct cacheitem *item, int use_cache)
                chk_positive(dup2(item->fd, STDOUT_FILENO), "Dup2(cachefile)");
        }
 
                chk_positive(dup2(item->fd, STDOUT_FILENO), "Dup2(cachefile)");
        }
 

-       if (cgit_repo)
+       ctx.page.modified = time(NULL);
+       ctx.page.expires = ctx.page.modified + ttl_seconds(item->ttl);
+       if (ctx.repo)

                cgit_print_repo_page(item);
        else
                cgit_print_repolist(item);
                cgit_print_repo_page(item);
        else
                cgit_print_repolist(item);


@@ -203,8 +220,6 @@ static void cgit_fill_cache(struct cacheitem *item, int use_cache)
                             "Restoring original STDOUT");
                chk_zero(close(stdout2), "Closing temporary STDOUT");
        }
                             "Restoring original STDOUT");
                chk_zero(close(stdout2), "Closing temporary STDOUT");
        }

-
-       chdir(buf);

 }
 
 static void cgit_check_cache(struct cacheitem *item)
 }
 
 static void cgit_check_cache(struct cacheitem *item)


@@ -212,7 +227,7 @@ static void cgit_check_cache(struct cacheitem *item)
        int i = 0;
 
  top:
        int i = 0;
 
  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));
        }
                die("cgit_refresh_cache: unable to lock %s: %s",
                    item->name, strerror(errno));
        }


@@ -258,10 +273,10 @@ static void cgit_parse_args(int argc, const char **argv)
 
        for (i = 1; i < argc; i++) {
                if (!strncmp(argv[i], "--cache=", 8)) {
 
        for (i = 1; i < argc; i++) {
                if (!strncmp(argv[i], "--cache=", 8)) {

-                       cgit_cache_root = xstrdup(argv[i]+8);
+                       ctx.cfg.cache_root = xstrdup(argv[i]+8);

                }
                if (!strcmp(argv[i], "--nocache")) {
                }
                if (!strcmp(argv[i], "--nocache")) {

-                       cgit_nocache = 1;
+                       ctx.cfg.nocache = 1;

                }
                if (!strncmp(argv[i], "--query=", 8)) {
                        ctx.qry.raw = xstrdup(argv[i]+8);
                }
                if (!strncmp(argv[i], "--query=", 8)) {
                        ctx.qry.raw = xstrdup(argv[i]+8);


@@ -291,7 +306,7 @@ int main(int argc, const char **argv)
        struct cacheitem item;
        const char *cgit_config_env = getenv("CGIT_CONFIG");
 
        struct cacheitem item;
        const char *cgit_config_env = getenv("CGIT_CONFIG");
 

-       htmlfd = STDOUT_FILENO;
+       cgit_prepare_context(&ctx);

        item.st.st_mtime = time(NULL);
        cgit_repolist.length = 0;
        cgit_repolist.count = 0;
        item.st.st_mtime = time(NULL);
        cgit_repolist.length = 0;
        cgit_repolist.count = 0;


@@ -299,16 +314,15 @@ int main(int argc, const char **argv)
 
        cgit_read_config(cgit_config_env ? cgit_config_env : CGIT_CONFIG,
                         cgit_global_config_cb);
 
        cgit_read_config(cgit_config_env ? cgit_config_env : CGIT_CONFIG,
                         cgit_global_config_cb);

-       cgit_repo = NULL;

        if (getenv("SCRIPT_NAME"))
        if (getenv("SCRIPT_NAME"))

-               cgit_script_name = xstrdup(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 (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 (cgit_nocache) {
+       if (ctx.cfg.nocache) {

                cgit_fill_cache(&item, 0);
        } else {
                cgit_check_cache(&item);
                cgit_fill_cache(&item, 0);
        } else {
                cgit_check_cache(&item);