Brown paper bag: don't use `grep -v`

[ps-cgit] / cgit.c

diff --git a/cgit.c b/cgit.c
index 0fa203cf457f4d07723c1fa0110fb2ef61106cbd..e8acc032583404dd243d58e09c1c421c2804a3cb 100644 (file)
--- a/cgit.c
+++ b/cgit.c
@@ -8,32 +8,9 @@
 
 #include "cgit.h"
 
 
 #include "cgit.h"
 

-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,14 +19,22 @@ 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.%s.html", cgit_cache_root,
+                                        cache_safe_filename(cgit_repo->url),
+                                        cache_safe_filename(cgit_querystring)));

                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, 
-                          cache_safe_filename(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)


@@ -60,10 +45,44 @@ static int cgit_prepare_cache(struct cacheitem *item)
        return 1;
 }
 
        return 1;
 }
 

+struct refmatch {
+       char *req_ref;
+       char *first_ref;
+       int match;
+};
+
+int find_current_ref(const char *refname, const unsigned char *sha1,
+                    int flags, void *cb_data)
+{
+       struct refmatch *info;
+
+       info = (struct refmatch *)cb_data;
+       if (!strcmp(refname, info->req_ref))
+               info->match = 1;
+       if (!info->first_ref)
+               info->first_ref = xstrdup(refname);
+       return info->match;
+}
+
+char *find_default_branch(struct repoinfo *repo)
+{
+       struct refmatch info;
+
+       info.req_ref = repo->defbranch;
+       info.first_ref = NULL;
+       info.match = 0;
+       for_each_branch_ref(find_current_ref, &info);
+       if (info.match)
+               return info.req_ref;
+       else
+               return info.first_ref;
+}
+

 static void cgit_print_repo_page(struct cacheitem *item)
 {
 static void cgit_print_repo_page(struct cacheitem *item)
 {

-       char *title;
+       char *title, *tmp;

        int show_search;
        int show_search;

+       unsigned char sha1[20];

 
        if (chdir(cgit_repo->path)) {
                title = fmt("%s - %s", cgit_root_title, "Bad request");
 
        if (chdir(cgit_repo->path)) {
                title = fmt("%s - %s", cgit_root_title, "Bad request");


@@ -78,37 +97,113 @@ 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 && !strcmp(cgit_query_page, "log"))
-               show_search = 1;
+
+       if (!cgit_query_head) {
+               cgit_query_head = xstrdup(find_default_branch(cgit_repo));
+               cgit_repo->defbranch = cgit_query_head;
+       }
+
+       if (!cgit_query_head) {
+               cgit_print_docstart(title, item);
+               cgit_print_pageheader(title, 0);
+               cgit_print_error("Repository seems to be empty");
+               cgit_print_docend();
+               return;
+       }
+
+       if (get_sha1(cgit_query_head, sha1)) {
+               tmp = xstrdup(cgit_query_head);
+               cgit_query_head = cgit_repo->defbranch;
+               cgit_print_docstart(title, item);
+               cgit_print_pageheader(title, 0);
+               cgit_print_error(fmt("Invalid branch: %s", tmp));
+               cgit_print_docend();
+               return;
+       }
+
+       if ((cgit_cmd == CMD_SNAPSHOT) && cgit_repo->snapshots) {
+               cgit_print_snapshot(item, cgit_query_head, cgit_query_sha1,
+                                   cgit_repobasename(cgit_repo->url),
+                                   cgit_query_path,
+                                   cgit_repo->snapshots );
+               return;
+       }
+
+       if (cgit_cmd == CMD_PATCH) {
+               cgit_print_patch(cgit_query_sha1, item);
+               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_docend();
+               return;
+       }
+
+       cgit_print_pageheader(cgit_query_page, show_search);
+
+       switch(cgit_cmd) {
+       case CMD_LOG:
+               cgit_print_log(cgit_query_sha1, cgit_query_ofs,
+                              cgit_max_commit_count, cgit_query_grep, cgit_query_search,
+                              cgit_query_path, 1);
+               break;
+       case CMD_TREE:

                cgit_print_tree(cgit_query_sha1, cgit_query_path);
                cgit_print_tree(cgit_query_sha1, cgit_query_path);

-       } else if (!strcmp(cgit_query_page, "commit")) {
+               break;
+       case CMD_COMMIT:

                cgit_print_commit(cgit_query_sha1);
                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);
+               break;
+       case CMD_REFS:
+               cgit_print_refs();
+               break;
+       case CMD_TAG:
+               cgit_print_tag(cgit_query_sha1);
+               break;
+       case CMD_DIFF:
+               cgit_print_diff(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);
 }
 


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


@@ -194,6 +289,7 @@ static void cgit_parse_args(int argc, const char **argv)
 int main(int argc, const char **argv)
 {
        struct cacheitem item;
 int main(int argc, const char **argv)
 {
        struct cacheitem item;

+       const char *cgit_config_env = getenv("CGIT_CONFIG");

 
        htmlfd = STDOUT_FILENO;
        item.st.st_mtime = time(NULL);
 
        htmlfd = STDOUT_FILENO;
        item.st.st_mtime = time(NULL);


@@ -201,7 +297,11 @@ 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_env ? cgit_config_env : 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);


@@ -209,8 +309,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);