Merge branch 'virtual-url'

[ps-cgit] / cgit.c

diff --git a/cgit.c b/cgit.c
index 28bab8d2f2c9dfbe3a7f01fee5a9a508e2ecf952..e5d8fbd3f7cddc594a6eb594fc1d127b1ef41670 100644 (file)
--- a/cgit.c
+++ b/cgit.c
@@ -11,29 +11,9 @@
 const char cgit_version[] = CGIT_VERSION;
 
 
 const char cgit_version[] = CGIT_VERSION;
 
 

-static struct repoinfo *cgit_get_repoinfo(char *url)
-{
-       int i;
-       struct repoinfo *repo;
-       
-       for (i=0; i<cgit_repolist.count; i++) {
-               repo = &cgit_repolist.repos[i];
-               if (!strcmp(repo->url, url))
-                       return repo;
-       }
-       return NULL;
-}
-
-

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

-       if (!cgit_query_repo) {
-               item->name = xstrdup(fmt("%s/index.html", cgit_cache_root));
-               item->ttl = cgit_cache_root_ttl;
-               return 1;
-       }
-       cgit_repo = cgit_get_repoinfo(cgit_query_repo);
-       if (!cgit_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);
                char *title = fmt("%s - %s", cgit_root_title, "Bad request");
                cgit_print_docstart(title, item);
                cgit_print_pageheader(title, 0);


@@ -42,13 +22,19 @@ static int cgit_prepare_cache(struct cacheitem *item)
                return 0;
        }
 
                return 0;
        }
 

-       if (!cgit_query_page) {
-               item->name = xstrdup(fmt("%s/%s/index.html", cgit_cache_root, 
-                          cgit_repo->url));
+       if (!cgit_repo) {
+               item->name = xstrdup(fmt("%s/index.html", cgit_cache_root));
+               item->ttl = cgit_cache_root_ttl;
+               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_repo->url, cgit_query_page, 
+               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;
                           cache_safe_filename(cgit_querystring)));
                if (cgit_query_has_symref)
                        item->ttl = cgit_cache_dynamic_ttl;


@@ -65,6 +51,9 @@ static void cgit_print_repo_page(struct cacheitem *item)
        char *title;
        int show_search;
 
        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);
        if (chdir(cgit_repo->path)) {
                title = fmt("%s - %s", cgit_root_title, "Bad request");
                cgit_print_docstart(title, item);


@@ -79,25 +68,20 @@ static void cgit_print_repo_page(struct cacheitem *item)
        show_search = 0;
        setenv("GIT_DIR", cgit_repo->path, 1);
 
        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", 
+       if ((cgit_cmd == CMD_SNAPSHOT) && cgit_repo->snapshots) {
+               cgit_print_snapshot(item, cgit_query_sha1, "zip",

                                    cgit_repo->url, cgit_query_name);
                return;
                                    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_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);

-
-
-       if (!cgit_query_page) {
+       if (!cgit_cmd) {

                cgit_print_pageheader("summary", show_search);
                cgit_print_summary();
                cgit_print_docend();
                cgit_print_pageheader("summary", show_search);
                cgit_print_summary();
                cgit_print_docend();


@@ -106,18 +90,26 @@ static void cgit_print_repo_page(struct cacheitem *item)
 
        cgit_print_pageheader(cgit_query_page, show_search);
 
 
        cgit_print_pageheader(cgit_query_page, show_search);
 

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

-       } else if (!strcmp(cgit_query_page, "diff")) {
-               cgit_print_diff(cgit_query_sha1, cgit_query_sha2);
-       } else {
+               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_error("Invalid request");
        }
        cgit_print_docend();


@@ -132,20 +124,20 @@ 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)");
        }
 

-       if (cgit_query_repo)
+       if (cgit_repo)

                cgit_print_repo_page(item);
        else
                cgit_print_repolist(item);
 
        if (use_cache) {
                chk_zero(close(STDOUT_FILENO), "Close redirected STDOUT");
                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), 
+               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 +234,10 @@ 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);
+       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);
        if (getenv("QUERY_STRING"))
                cgit_querystring = xstrdup(getenv("QUERY_STRING"));
        cgit_parse_args(argc, argv);