Do not alter incoming sha1 when handling the download refs.

[cgit.git] / cgit.c

diff --git a/cgit.c b/cgit.c
index 0fa203cf457f4d07723c1fa0110fb2ef61106cbd..3c11ff0a8f9021a20bf20771a617c7c53ebe6aac 100644 (file)
--- a/cgit.c
+++ b/cgit.c
@@ -15,7 +15,7 @@ static struct repoinfo *cgit_get_repoinfo(char *url)
 {
        int i;
        struct repoinfo *repo;
 {
        int i;
        struct repoinfo *repo;

-       
+

        for (i=0; i<cgit_repolist.count; i++) {
                repo = &cgit_repolist.repos[i];
                if (!strcmp(repo->url, url))
        for (i=0; i<cgit_repolist.count; i++) {
                repo = &cgit_repolist.repos[i];
                if (!strcmp(repo->url, url))


@@ -43,12 +43,12 @@ static int cgit_prepare_cache(struct cacheitem *item)
        }
 
        if (!cgit_query_page) {
        }
 
        if (!cgit_query_page) {

-               item->name = xstrdup(fmt("%s/%s/index.html", cgit_cache_root, 
+               item->name = xstrdup(fmt("%s/%s/index.html", cgit_cache_root,

                           cgit_repo->url));
                item->ttl = cgit_cache_repo_ttl;
        } else {
                           cgit_repo->url));
                item->ttl = cgit_cache_repo_ttl;
        } else {

-               item->name = xstrdup(fmt("%s/%s/%s/%s.html", cgit_cache_root, 
-                          cgit_repo->url, cgit_query_page, 
+               item->name = xstrdup(fmt("%s/%s/%s/%s.html", cgit_cache_root,
+                          cgit_repo->url, cgit_query_page,

                           cache_safe_filename(cgit_querystring)));
                if (cgit_query_has_symref)
                        item->ttl = cgit_cache_dynamic_ttl;
                           cache_safe_filename(cgit_querystring)));
                if (cgit_query_has_symref)
                        item->ttl = cgit_cache_dynamic_ttl;


@@ -78,37 +78,79 @@ static void cgit_print_repo_page(struct cacheitem *item)
        title = fmt("%s - %s", cgit_repo->name, cgit_repo->desc);
        show_search = 0;
        setenv("GIT_DIR", cgit_repo->path, 1);
        title = fmt("%s - %s", cgit_repo->name, cgit_repo->desc);
        show_search = 0;
        setenv("GIT_DIR", cgit_repo->path, 1);

+
+       if (cgit_query_page) {
+           if (cgit_repo->snapshots && !strcmp(cgit_query_page, "snapshot")) {
+               cgit_print_snapshot(item, cgit_query_sha1, "zip",
+                                   cgit_repo->url, cgit_query_name);
+               return;
+           }
+           if (!strcmp(cgit_query_page, "blob")) {
+                   cgit_print_blob(item, cgit_query_sha1, cgit_query_path);
+                   return;
+           }
+       }
+

        if (cgit_query_page && !strcmp(cgit_query_page, "log"))
                show_search = 1;
        if (cgit_query_page && !strcmp(cgit_query_page, "log"))
                show_search = 1;

+

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

-       cgit_print_pageheader(title, show_search);
+
+

        if (!cgit_query_page) {
        if (!cgit_query_page) {

+               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);
+               cgit_print_docend();
+               return;
+       }
+
+       cgit_print_pageheader(cgit_query_page, show_search);
+
+       if (!strcmp(cgit_query_page, "log")) {
+               cgit_print_log(cgit_query_head, cgit_query_ofs,
+                              cgit_max_commit_count, cgit_query_search,
+                              cgit_query_path);

        } else if (!strcmp(cgit_query_page, "tree")) {
        } else if (!strcmp(cgit_query_page, "tree")) {

-               cgit_print_tree(cgit_query_sha1, cgit_query_path);
+               cgit_print_tree(cgit_query_head, cgit_query_sha1, cgit_query_path);

        } else if (!strcmp(cgit_query_page, "commit")) {
                cgit_print_commit(cgit_query_sha1);
        } else if (!strcmp(cgit_query_page, "view")) {
        } 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);
+               cgit_print_view(cgit_query_sha1, cgit_query_path);

        } else if (!strcmp(cgit_query_page, "diff")) {
        } else if (!strcmp(cgit_query_page, "diff")) {

-               cgit_print_diff(cgit_query_sha1, cgit_query_sha2);
+               cgit_print_diff(cgit_query_sha1, cgit_query_sha2, cgit_query_path);
+       } else {
+               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 (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_query_repo)
                cgit_print_repo_page(item);
        else
                cgit_print_repolist(item);
        if (cgit_query_repo)
                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);
 }
 


@@ -127,14 +169,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);


@@ -201,7 +243,9 @@ int main(int argc, const char **argv)
        cgit_repolist.count = 0;
        cgit_repolist.repos = NULL;
 
        cgit_repolist.count = 0;
        cgit_repolist.repos = NULL;
 

-       cgit_read_config("/etc/cgitrc", cgit_global_config_cb);
+       cgit_read_config(CGIT_CONFIG, cgit_global_config_cb);
+       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);
        if (getenv("QUERY_STRING"))
                cgit_querystring = xstrdup(getenv("QUERY_STRING"));
        cgit_parse_args(argc, argv);


@@ -209,8 +253,7 @@ int main(int argc, const char **argv)
        if (!cgit_prepare_cache(&item))
                return 0;
        if (cgit_nocache) {
        if (!cgit_prepare_cache(&item))
                return 0;
        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);