Change S/L/T to summary/log/tree

[ps-cgit] / cgit.c

diff --git a/cgit.c b/cgit.c
index 1c213c7bbe83f34251a9526e685fe5cb23a56d36..b943fe5769ce56644d5b5ac54c43da0d15be8e7d 100644 (file)
--- a/cgit.c
+++ b/cgit.c
@@ -29,13 +29,15 @@ static int cgit_prepare_cache(struct cacheitem *item)
        }
 
        if (!cgit_cmd) {
-               item->name = xstrdup(fmt("%s/%s/index.html", cgit_cache_root,
-                          cache_safe_filename(cgit_repo->url)));
+               item->name = xstrdup(fmt("%s/%s/index.%s.html", cgit_cache_root,
+                                        cache_safe_filename(cgit_repo->url),
+                                        cache_safe_filename(cgit_querystring)));
                item->ttl = cgit_cache_repo_ttl;
        } else {
                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)));
+                                        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)
@@ -92,7 +94,7 @@ static void cgit_print_repo_page(struct cacheitem *item)
 
        switch(cgit_cmd) {
        case CMD_LOG:
-               cgit_print_log(cgit_query_head, cgit_query_ofs,
+               cgit_print_log(cgit_query_sha1, cgit_query_ofs,
                               cgit_max_commit_count, cgit_query_search,
                               cgit_query_path, 1);
                break;
@@ -100,11 +102,10 @@ static void cgit_print_repo_page(struct cacheitem *item)
                cgit_print_tree(cgit_query_sha1, cgit_query_path);
                break;
        case CMD_COMMIT:
-               cgit_print_commit(cgit_query_head);
+               cgit_print_commit(cgit_query_sha1);
                break;
        case CMD_DIFF:
-               cgit_print_diff(cgit_query_head, cgit_query_sha1, cgit_query_sha2,
-                               cgit_query_path);
+               cgit_print_diff(cgit_query_sha1, cgit_query_sha2);
                break;
        default:
                cgit_print_error("Invalid request");