Include cgit.conf in Makefile

[ps-cgit] / cgit.c

diff --git a/cgit.c b/cgit.c
index 3d85a08766c99d536d290e0621e85f71a2fd579e..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;


@@ -81,7 +81,7 @@ static void cgit_print_repo_page(struct cacheitem *item)
 
        if (cgit_query_page) {
            if (cgit_repo->snapshots && !strcmp(cgit_query_page, "snapshot")) {
 
        if (cgit_query_page) {
            if (cgit_repo->snapshots && !strcmp(cgit_query_page, "snapshot")) {

-               cgit_print_snapshot(item, cgit_query_sha1, "zip", 
+               cgit_print_snapshot(item, cgit_query_sha1, "zip",

                                    cgit_repo->url, cgit_query_name);
                return;
            }
                                    cgit_repo->url, cgit_query_name);
                return;
            }


@@ -108,9 +108,10 @@ static void cgit_print_repo_page(struct cacheitem *item)
 
        if (!strcmp(cgit_query_page, "log")) {
                cgit_print_log(cgit_query_head, cgit_query_ofs,
 
        if (!strcmp(cgit_query_page, "log")) {
                cgit_print_log(cgit_query_head, cgit_query_ofs,

-                              cgit_max_commit_count, cgit_query_search);
+                              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")) {


@@ -132,7 +133,7 @@ static void cgit_fill_cache(struct cacheitem *item, int use_cache)
        item->st.st_mtime = time(NULL);
 
        if (use_cache) {
        item->st.st_mtime = time(NULL);
 
        if (use_cache) {

-               stdout2 = chk_positive(dup(STDOUT_FILENO), 
+               stdout2 = chk_positive(dup(STDOUT_FILENO),

                                       "Preserving STDOUT");
                chk_zero(close(STDOUT_FILENO), "Closing STDOUT");
                chk_positive(dup2(item->fd, STDOUT_FILENO), "Dup2(cachefile)");
                                       "Preserving STDOUT");
                chk_zero(close(STDOUT_FILENO), "Closing STDOUT");
                chk_positive(dup2(item->fd, STDOUT_FILENO), "Dup2(cachefile)");


@@ -145,7 +146,7 @@ static void cgit_fill_cache(struct cacheitem *item, int use_cache)
 
        if (use_cache) {
                chk_zero(close(STDOUT_FILENO), "Close redirected STDOUT");
 
        if (use_cache) {
                chk_zero(close(STDOUT_FILENO), "Close redirected STDOUT");

-               chk_positive(dup2(stdout2, STDOUT_FILENO), 
+               chk_positive(dup2(stdout2, STDOUT_FILENO),

                             "Restoring original STDOUT");
                chk_zero(close(stdout2), "Closing temporary STDOUT");
        }
                             "Restoring original STDOUT");
                chk_zero(close(stdout2), "Closing temporary STDOUT");
        }


@@ -242,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);