cgit.c: fix whitespace breakage

[ps-cgit] / cgit.c

diff --git a/cgit.c b/cgit.c
index 300fe46505c7d09897e42996971d9f3bf830c3b8..1d7a83fcee4f4f69ba4486b93b54623041eb01b0 100644 (file)
--- a/cgit.c
+++ b/cgit.c
@@ -10,258 +10,154 @@
 
 const char cgit_version[] = CGIT_VERSION;
 
 
 const char cgit_version[] = CGIT_VERSION;
 

-int htmlfd = 0;

 
 

-char *cgit_root         = "/usr/src/git";
-char *cgit_root_title   = "Git repository browser";
-char *cgit_css          = "/cgit.css";
-char *cgit_logo         = "/git-logo.png";
-char *cgit_logo_link    = "http://www.kernel.org/pub/software/scm/git/docs/";
-char *cgit_virtual_root = NULL;
-
-char *cgit_cache_root   = "/var/cache/cgit";
-
-int cgit_max_lock_attempts     =  5;
-int cgit_cache_root_ttl        =  5;
-int cgit_cache_repo_ttl        =  5;
-int cgit_cache_dynamic_ttl     =  5;
-int cgit_cache_static_ttl      = -1;
-int cgit_cache_max_create_time =  5;
-
-char *cgit_repo_name    = NULL;
-char *cgit_repo_desc    = NULL;
-char *cgit_repo_owner   = NULL;
-
-int cgit_query_has_symref = 0;
-int cgit_query_has_sha1   = 0;
-
-char *cgit_querystring  = NULL;
-char *cgit_query_repo   = NULL;
-char *cgit_query_page   = NULL;
-char *cgit_query_head   = NULL;
-char *cgit_query_sha1   = NULL;
-
-struct cacheitem cacheitem;
-
-void cgit_global_config_cb(const char *name, const char *value)
+static struct repoinfo *cgit_get_repoinfo(char *url)

 {
 {

-       if (!strcmp(name, "root"))
-               cgit_root = xstrdup(value);
-       else if (!strcmp(name, "root-title"))
-               cgit_root_title = xstrdup(value);
-       else if (!strcmp(name, "css"))
-               cgit_css = xstrdup(value);
-       else if (!strcmp(name, "logo"))
-               cgit_logo = xstrdup(value);
-       else if (!strcmp(name, "logo-link"))
-               cgit_logo_link = xstrdup(value);
-       else if (!strcmp(name, "virtual-root"))
-               cgit_virtual_root = xstrdup(value);
-}
+       int i;
+       struct repoinfo *repo;

 
 

-void cgit_repo_config_cb(const char *name, const char *value)
-{
-       if (!strcmp(name, "name"))
-               cgit_repo_name = xstrdup(value);
-       else if (!strcmp(name, "desc"))
-               cgit_repo_desc = xstrdup(value);
-       else if (!strcmp(name, "owner"))
-               cgit_repo_owner = xstrdup(value);
-}
-
-void cgit_querystring_cb(const char *name, const char *value)
-{
-       if (!strcmp(name,"r"))
-               cgit_query_repo = xstrdup(value);
-       else if (!strcmp(name, "p"))
-               cgit_query_page = xstrdup(value);
-       else if (!strcmp(name, "h")) {
-               cgit_query_head = xstrdup(value);
-               cgit_query_has_symref = 1;
-       } else if (!strcmp(name, "id")) {
-               cgit_query_sha1 = xstrdup(value);
-               cgit_query_has_sha1 = 1;
+       for (i=0; i<cgit_repolist.count; i++) {
+               repo = &cgit_repolist.repos[i];
+               if (!strcmp(repo->url, url))
+                       return repo;

        }
        }

+       return NULL;

 }
 
 }
 

-static int get_one_line(char *txt)
-{
-       char *t;
-
-       for(t=txt; *t != '\n' && t != '\0'; t++)
-               ;
-       *t = '\0';
-       return t-txt-1;
-}

 
 

-static void cgit_print_commit_shortlog(struct commit *commit)
+static int cgit_prepare_cache(struct cacheitem *item)

 {
 {

-       char *h, *t, *p; 
-       char *tree = NULL, *author = NULL, *subject = NULL;
-       int len;
-       time_t sec;
-       struct tm *time;
-       char buf[32];
-
-       h = t = commit->buffer;
-       
-       if (strncmp(h, "tree ", 5))
-               die("Bad commit format: %s", 
-                   sha1_to_hex(commit->object.sha1));
-       
-       len = get_one_line(h);
-       tree = h+5;
-       h += len + 2;
-
-       while (!strncmp(h, "parent ", 7))
-               h += get_one_line(h) + 2;
-       
-       if (!strncmp(h, "author ", 7)) {
-               author = h+7;
-               h += get_one_line(h) + 2;
-               t = author;
-               while(t!=h && *t!='<') 
-                       t++;
-               *t='\0';
-               p = t;
-               while(--t!=author && *t==' ')
-                       *t='\0';
-               while(++p!=h && *p!='>')
-                       ;
-               while(++p!=h && !isdigit(*p))
-                       ;
-
-               t = p;
-               while(++p && isdigit(*p))
-                       ;
-               *p = '\0';
-               sec = atoi(t);
-               time = gmtime(&sec);
+       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) {
+               char *title = fmt("%s - %s", cgit_root_title, "Bad request");
+               cgit_print_docstart(title, item);
+               cgit_print_pageheader(title, 0);
+               cgit_print_error(fmt("Unknown repo: %s", cgit_query_repo));
+               cgit_print_docend();
+               return 0;

        }
 
        }
 

-       while((len = get_one_line(h)) > 0)
-               h += len+2;
-
-       h++;
-       len = get_one_line(h);
-
-       subject = h;
-
-       html("<tr><td>");
-       strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", time);
-       html_txt(buf);
-       html("</td><td>");
-       char *qry = fmt("id=%s", sha1_to_hex(commit->object.sha1));
-       char *url = cgit_pageurl(cgit_query_repo, "view", qry);
-       html_link_open(url, NULL, NULL);
-       html_txt(subject);
-       html_link_close();
-       html("</td><td>");
-       html_txt(author);
-       html("</td></tr>\n");
-}
-
-static void cgit_print_log(const char *tip, int ofs, int cnt)
-{
-       struct rev_info rev;
-       struct commit *commit;
-       const char *argv[2] = {NULL, tip};
-       int n = 0;
-       
-       init_revisions(&rev, NULL);
-       rev.abbrev = DEFAULT_ABBREV;
-       rev.commit_format = CMIT_FMT_DEFAULT;
-       rev.verbose_header = 1;
-       rev.show_root_diff = 0;
-       setup_revisions(2, argv, &rev, NULL);
-       prepare_revision_walk(&rev);
-
-       html("<h2>Log</h2>");
-       html("<table class='list'>");
-       html("<tr><th>Date</th><th>Message</th><th>Author</th></tr>\n");
-       while ((commit = get_revision(&rev)) != NULL && n++ < 100) {
-               cgit_print_commit_shortlog(commit);
-               free(commit->buffer);
-               commit->buffer = NULL;
-               free_commit_list(commit->parents);
-               commit->parents = NULL;
+       if (!cgit_query_page) {
+               item->name = xstrdup(fmt("%s/%s/index.html", cgit_cache_root,
+                          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,
+                          cache_safe_filename(cgit_querystring)));
+               if (cgit_query_has_symref)
+                       item->ttl = cgit_cache_dynamic_ttl;
+               else if (cgit_query_has_sha1)
+                       item->ttl = cgit_cache_static_ttl;
+               else
+                       item->ttl = cgit_cache_repo_ttl;

        }
        }

-       html("</table>\n");
+       return 1;

 }
 
 }
 

-static void cgit_print_object(char *hex)
+static void cgit_print_repo_page(struct cacheitem *item)

 {
 {

-       unsigned char sha1[20];
-       //struct object *object;
-       char type[20];
-       unsigned char *buf;
-       unsigned long size;
-
-       if (get_sha1_hex(hex, sha1)){
-               cgit_print_error(fmt("Bad hex value: %s", hex));
-               return;
-       }
+       char *title;
+       int show_search;

 
 

-       if (sha1_object_info(sha1, type, NULL)){
-               cgit_print_error("Bad object name");
+       if (chdir(cgit_repo->path)) {
+               title = fmt("%s - %s", cgit_root_title, "Bad request");
+               cgit_print_docstart(title, item);
+               cgit_print_pageheader(title, 0);
+               cgit_print_error(fmt("Unable to scan repository: %s",
+                                    strerror(errno)));
+               cgit_print_docend();

                return;
        }
 
                return;
        }
 

-       buf = read_sha1_file(sha1, type, &size);
-       if (!buf) {
-               cgit_print_error("Error reading object");
+       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;
                return;

+           }
+           if (!strcmp(cgit_query_page, "blob")) {
+                   cgit_print_blob(item, cgit_query_sha1, cgit_query_path);
+                   return;
+           }

        }
 
        }
 

-       buf[size] = '\0';
-       html("<h2>Object view</h2>");
-       htmlf("sha1=%s<br/>type=%s<br/>size=%i<br/>", hex, type, size);
-       html("<pre>");
-       html_txt(buf);
-       html("</pre>");
-}
+       if (cgit_query_page && !strcmp(cgit_query_page, "log"))
+               show_search = 1;

 
 

-static void cgit_print_repo_page(struct cacheitem *item)
-{
-       if (chdir(fmt("%s/%s", cgit_root, cgit_query_repo)) || 
-           cgit_read_config("info/cgit", cgit_repo_config_cb)) {
-               char *title = fmt("%s - %s", cgit_root_title, "Bad request");
-               cgit_print_docstart(title, item);
-               cgit_print_pageheader(title);
-               cgit_print_error(fmt("Unable to scan repository: %s",
-                                    strerror(errno)));
+       cgit_print_docstart(title, item);
+
+
+       if (!cgit_query_page) {
+               cgit_print_pageheader("summary", show_search);
+               cgit_print_summary();

                cgit_print_docend();
                return;
        }
                cgit_print_docend();
                return;
        }

-       setenv("GIT_DIR", fmt("%s/%s", cgit_root, cgit_query_repo), 1);
-       char *title = fmt("%s - %s", cgit_repo_name, cgit_repo_desc);
-       cgit_print_docstart(title, item);
-       cgit_print_pageheader(title);
-       if (!cgit_query_page)
-               cgit_print_repo_summary();
-       else if (!strcmp(cgit_query_page, "log")) {
-               cgit_print_log(cgit_query_head, 0, 100);
+
+       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")) {
+               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, "view")) {

-               cgit_print_object(cgit_query_sha1);
+               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, 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)

 {
 {

-       htmlfd = item->fd;
+       static char buf[PATH_MAX];
+       int stdout2;
+
+       getcwd(buf, sizeof(buf));

        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);

 }
 
 }
 

-static void cgit_refresh_cache(struct cacheitem *item)
+static void cgit_check_cache(struct cacheitem *item)

 {
        int i = 0;
 
 {
        int i = 0;
 

-       cache_prepare(item);

  top:
        if (++i > cgit_max_lock_attempts) {
                die("cgit_refresh_cache: unable to lock %s: %s",
  top:
        if (++i > cgit_max_lock_attempts) {
                die("cgit_refresh_cache: unable to lock %s: %s",


@@ -272,13 +168,19 @@ static void cgit_refresh_cache(struct cacheitem *item)
                        sleep(1);
                        goto top;
                }
                        sleep(1);
                        goto top;
                }

-               if (!cache_exist(item))
-                       cgit_fill_cache(item);
-               cache_unlock(item);
+               if (!cache_exist(item)) {
+                       cgit_fill_cache(item, 1);
+                       cache_unlock(item);
+               } else {
+                       cache_cancel_lock(item);
+               }

        } else if (cache_expired(item) && cache_lock(item)) {
        } else if (cache_expired(item) && cache_lock(item)) {

-               if (cache_expired(item))
-                       cgit_fill_cache(item);
-               cache_unlock(item);
+               if (cache_expired(item)) {
+                       cgit_fill_cache(item, 1);
+                       cache_unlock(item);
+               } else {
+                       cache_cancel_lock(item);
+               }

        }
 }
 
        }
 }
 


@@ -297,12 +199,62 @@ static void cgit_print_cache(struct cacheitem *item)
        close(fd);
 }
 
        close(fd);
 }
 

+static void cgit_parse_args(int argc, const char **argv)
+{
+       int i;
+
+       for (i = 1; i < argc; i++) {
+               if (!strncmp(argv[i], "--cache=", 8)) {
+                       cgit_cache_root = xstrdup(argv[i]+8);
+               }
+               if (!strcmp(argv[i], "--nocache")) {
+                       cgit_nocache = 1;
+               }
+               if (!strncmp(argv[i], "--query=", 8)) {
+                       cgit_querystring = xstrdup(argv[i]+8);
+               }
+               if (!strncmp(argv[i], "--repo=", 7)) {
+                       cgit_query_repo = xstrdup(argv[i]+7);
+               }
+               if (!strncmp(argv[i], "--page=", 7)) {
+                       cgit_query_page = xstrdup(argv[i]+7);
+               }
+               if (!strncmp(argv[i], "--head=", 7)) {
+                       cgit_query_head = xstrdup(argv[i]+7);
+                       cgit_query_has_symref = 1;
+               }
+               if (!strncmp(argv[i], "--sha1=", 7)) {
+                       cgit_query_sha1 = xstrdup(argv[i]+7);
+                       cgit_query_has_sha1 = 1;
+               }
+               if (!strncmp(argv[i], "--ofs=", 6)) {
+                       cgit_query_ofs = atoi(argv[i]+6);
+               }
+       }
+}
+

 int main(int argc, const char **argv)
 {
 int main(int argc, const char **argv)
 {

+       struct cacheitem item;
+
+       htmlfd = STDOUT_FILENO;
+       item.st.st_mtime = time(NULL);
+       cgit_repolist.length = 0;
+       cgit_repolist.count = 0;
+       cgit_repolist.repos = NULL;
+

        cgit_read_config("/etc/cgitrc", cgit_global_config_cb);
        cgit_read_config("/etc/cgitrc", cgit_global_config_cb);

-       cgit_querystring = xstrdup(getenv("QUERY_STRING"));
+       if (getenv("QUERY_STRING"))
+               cgit_querystring = xstrdup(getenv("QUERY_STRING"));
+       cgit_parse_args(argc, argv);

        cgit_parse_query(cgit_querystring, cgit_querystring_cb);
        cgit_parse_query(cgit_querystring, cgit_querystring_cb);

-       cgit_refresh_cache(&cacheitem);
-       cgit_print_cache(&cacheitem);
+       if (!cgit_prepare_cache(&item))
+               return 0;
+       if (cgit_nocache) {
+               cgit_fill_cache(&item, 0);
+       } else {
+               cgit_check_cache(&item);
+               cgit_print_cache(&item);
+       }

        return 0;
 }
        return 0;
 }