Merge branch 'virtual-url'

[ps-cgit] / cgit.c

diff --git a/cgit.c b/cgit.c
index d975570a73e361606753f641a629b05846914052..e5d8fbd3f7cddc594a6eb594fc1d127b1ef41670 100644 (file)
--- a/cgit.c
+++ b/cgit.c
@@ -10,19 +10,32 @@
 
 const char cgit_version[] = CGIT_VERSION;
 
 
 const char cgit_version[] = CGIT_VERSION;
 

-static void cgit_prepare_cache(struct cacheitem *item)
+
+static int cgit_prepare_cache(struct cacheitem *item)

 {
 {

-       if (!cgit_query_repo) {
+       if (!cgit_repo && cgit_query_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_repo) {

                item->name = xstrdup(fmt("%s/index.html", cgit_cache_root));
                item->ttl = cgit_cache_root_ttl;
                item->name = xstrdup(fmt("%s/index.html", cgit_cache_root));
                item->ttl = cgit_cache_root_ttl;

-       } else if (!cgit_query_page) {
-               item->name = xstrdup(fmt("%s/%s/index.html", cgit_cache_root, 
-                          cgit_query_repo));
+               return 1;
+       }
+
+       if (!cgit_cmd) {
+               item->name = xstrdup(fmt("%s/%s/index.html", cgit_cache_root,
+                          cache_safe_filename(cgit_repo->url)));

                item->ttl = cgit_cache_repo_ttl;
        } else {
                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_querystring));
+               item->name = xstrdup(fmt("%s/%s/%s/%s.html", cgit_cache_root,
+                          cache_safe_filename(cgit_repo->url), cgit_query_page,
+                          cache_safe_filename(cgit_querystring)));

                if (cgit_query_has_symref)
                        item->ttl = cgit_cache_dynamic_ttl;
                else if (cgit_query_has_sha1)
                if (cgit_query_has_symref)
                        item->ttl = cgit_cache_dynamic_ttl;
                else if (cgit_query_has_sha1)


@@ -30,13 +43,19 @@ static void cgit_prepare_cache(struct cacheitem *item)
                else
                        item->ttl = cgit_cache_repo_ttl;
        }
                else
                        item->ttl = cgit_cache_repo_ttl;
        }

+       return 1;

 }
 
 static void cgit_print_repo_page(struct cacheitem *item)
 {
 }
 
 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 (!cgit_query_head)
+               cgit_query_head = cgit_repo->defbranch;
+
+       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",
                cgit_print_docstart(title, item);
                cgit_print_pageheader(title, 0);
                cgit_print_error(fmt("Unable to scan repository: %s",


@@ -44,40 +63,85 @@ static void cgit_print_repo_page(struct cacheitem *item)
                cgit_print_docend();
                return;
        }
                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;
-       if (cgit_query_page && !strcmp(cgit_query_page, "log"))
-               show_search = 1;
+
+       title = fmt("%s - %s", cgit_repo->name, cgit_repo->desc);
+       show_search = 0;
+       setenv("GIT_DIR", cgit_repo->path, 1);
+
+       if ((cgit_cmd == CMD_SNAPSHOT) && cgit_repo->snapshots) {
+               cgit_print_snapshot(item, cgit_query_sha1, "zip",
+                                   cgit_repo->url, cgit_query_name);
+               return;
+       }
+
+       if (cgit_cmd == CMD_BLOB) {
+               cgit_print_blob(item, cgit_query_sha1, cgit_query_path);
+               return;
+       }
+
+       show_search = (cgit_cmd == CMD_LOG);

        cgit_print_docstart(title, item);
        cgit_print_docstart(title, item);

-       cgit_print_pageheader(title, show_search);
-       if (!cgit_query_page) {
+       if (!cgit_cmd) {
+               cgit_print_pageheader("summary", show_search);

                cgit_print_summary();
                cgit_print_summary();

-       } else if (!strcmp(cgit_query_page, "log")) {
-               cgit_print_log(cgit_query_head, cgit_query_ofs, 100, cgit_query_search);
-       } else if (!strcmp(cgit_query_page, "tree")) {
-               cgit_print_tree(cgit_query_sha1);
-       } else if (!strcmp(cgit_query_page, "commit")) {
-               cgit_print_commit(cgit_query_sha1);
-       } else if (!strcmp(cgit_query_page, "view")) {
-               cgit_print_view(cgit_query_sha1);
-       } else if (!strcmp(cgit_query_page, "diff")) {
-               cgit_print_diff(cgit_query_sha1, cgit_query_sha2);
+               cgit_print_docend();
+               return;
+       }
+
+       cgit_print_pageheader(cgit_query_page, show_search);
+
+       switch(cgit_cmd) {
+       case CMD_LOG:
+               cgit_print_log(cgit_query_head, cgit_query_ofs,
+                              cgit_max_commit_count, cgit_query_search,
+                              cgit_query_path);
+               break;
+       case CMD_TREE:
+               cgit_print_tree(cgit_query_head, cgit_query_sha1, cgit_query_path);
+               break;
+       case CMD_COMMIT:
+               cgit_print_commit(cgit_query_head);
+               break;
+       case CMD_VIEW:
+               cgit_print_view(cgit_query_sha1, cgit_query_path);
+               break;
+       case CMD_DIFF:
+               cgit_print_diff(cgit_query_head, cgit_query_sha1, cgit_query_sha2,
+                               cgit_query_path);
+               break;
+       default:
+               cgit_print_error("Invalid request");

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

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

 {
        static char buf[PATH_MAX];
 {
        static char buf[PATH_MAX];

+       int stdout2;

 
        getcwd(buf, sizeof(buf));
 
        getcwd(buf, sizeof(buf));

-       htmlfd = item->fd;

        item->st.st_mtime = time(NULL);
        item->st.st_mtime = time(NULL);

-       if (cgit_query_repo)
+
+       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)");
+       }
+
+       if (cgit_repo)

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

+
+       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");
+       }
+

        chdir(buf);
 }
 
        chdir(buf);
 }
 


@@ -96,14 +160,14 @@ static void cgit_check_cache(struct cacheitem *item)
                        goto top;
                }
                if (!cache_exist(item)) {
                        goto top;
                }
                if (!cache_exist(item)) {

-                       cgit_fill_cache(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)) {
                        cache_unlock(item);
                } else {
                        cache_cancel_lock(item);
                }
        } else if (cache_expired(item) && cache_lock(item)) {
                if (cache_expired(item)) {

-                       cgit_fill_cache(item);
+                       cgit_fill_cache(item, 1);

                        cache_unlock(item);
                } else {
                        cache_cancel_lock(item);
                        cache_unlock(item);
                } else {
                        cache_cancel_lock(item);


@@ -131,9 +195,6 @@ static void cgit_parse_args(int argc, const char **argv)
        int i;
 
        for (i = 1; i < argc; i++) {
        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);
                }
                if (!strncmp(argv[i], "--cache=", 8)) {
                        cgit_cache_root = xstrdup(argv[i]+8);
                }


@@ -167,16 +228,24 @@ int main(int argc, const char **argv)
 {
        struct cacheitem item;
 
 {
        struct cacheitem item;
 

-       cgit_read_config("/etc/cgitrc", cgit_global_config_cb);
+       htmlfd = STDOUT_FILENO;
+       item.st.st_mtime = time(NULL);
+       cgit_repolist.length = 0;
+       cgit_repolist.count = 0;
+       cgit_repolist.repos = NULL;
+
+       cgit_read_config(CGIT_CONFIG, cgit_global_config_cb);
+       cgit_repo = NULL;
+       if (getenv("SCRIPT_NAME"))
+               cgit_script_name = xstrdup(getenv("SCRIPT_NAME"));

        if (getenv("QUERY_STRING"))
                cgit_querystring = xstrdup(getenv("QUERY_STRING"));
        cgit_parse_args(argc, argv);
        cgit_parse_query(cgit_querystring, cgit_querystring_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) {
        if (cgit_nocache) {

-               item.fd = STDOUT_FILENO;
-               cgit_fill_cache(&item);
+               cgit_fill_cache(&item, 0);

        } else {
                cgit_check_cache(&item);
                cgit_print_cache(&item);
        } else {
                cgit_check_cache(&item);
                cgit_print_cache(&item);