Move log-functions into ui-log.c

Signed-off-by: Lars Hjemli <hjemli@gmail.com>

5 files changed, 121 insertions, 111 deletions

diff --git a/Makefile b/Makefile
index 71ddc40..64bbd5c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,24 +1,25 @@
 CGIT_VERSION = 0.1-pre
 
 INSTALL_BIN = /var/www/htdocs/cgit.cgi
 INSTALL_CSS = /var/www/htdocs/cgit.css
 CACHE_ROOT = /var/cache/cgit
 
 EXTLIBS = ../git/libgit.a ../git/xdiff/lib.a -lz -lcrypto
-OBJECTS = cache.o parsing.o html.o ui-shared.o ui-repolist.o ui-summary.o
+OBJECTS = cache.o parsing.o html.o ui-shared.o ui-repolist.o ui-summary.o \
+        ui-log.o
 
 CFLAGS += -Wall
 
 all: cgit
 
 install: all
         install cgit $(INSTALL_BIN)
         install cgit.css $(INSTALL_CSS)
         rm -rf $(CACHE_ROOT)/*
 
 cgit: cgit.c cgit.h git.h $(OBJECTS)
         $(CC) $(CFLAGS) -DCGIT_VERSION='"$(CGIT_VERSION)"' cgit.c -o cgit \
                 $(OBJECTS) $(EXTLIBS)
 
 $(OBJECTS): cgit.h git.h
 
diff --git a/cgit.c b/cgit.c
index 300fe46..30a9a2a 100644
--- a/cgit.c
+++ b/cgit.c
@@ -71,137 +71,32 @@ void cgit_repo_config_cb(const char *name, const char *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;
         }
 }
 
-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)
-{
-        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);
-        }
-
-        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;
-        }
-        html("</table>\n");
-}
-
 static void cgit_print_object(char *hex)
 {
         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;
         }
 
         if (sha1_object_info(sha1, type, NULL)){
                 cgit_print_error("Bad object name");
                 return;
@@ -225,33 +120,33 @@ 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_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();
+                cgit_print_summary();
         else if (!strcmp(cgit_query_page, "log")) {
                 cgit_print_log(cgit_query_head, 0, 100);
         } else if (!strcmp(cgit_query_page, "view")) {
                 cgit_print_object(cgit_query_sha1);
         }
         cgit_print_docend();
 }
 
 static void cgit_fill_cache(struct cacheitem *item)
 {
         htmlfd = item->fd;
         item->st.st_mtime = time(NULL);
         if (cgit_query_repo)
                 cgit_print_repo_page(item);
         else
                 cgit_print_repolist(item);
diff --git a/cgit.h b/cgit.h
index 3a153a5..0100763 100644
--- a/cgit.h
+++ b/cgit.h
@@ -62,24 +62,23 @@ extern int cgit_parse_query(char *txt, configfn fn);
 extern void cache_prepare(struct cacheitem *item);
 extern int cache_lock(struct cacheitem *item);
 extern int cache_unlock(struct cacheitem *item);
 extern int cache_exist(struct cacheitem *item);
 extern int cache_expired(struct cacheitem *item);
 
 extern char *cgit_repourl(const char *reponame);
 extern char *cgit_pageurl(const char *reponame, const char *pagename, 
                           const char *query);
 
 extern void cgit_print_error(char *msg);
 extern void cgit_print_docstart(char *title, struct cacheitem *item);
 extern void cgit_print_docend();
 extern void cgit_print_pageheader(char *title);
 
 extern void cgit_print_repolist(struct cacheitem *item);
-
+extern void cgit_print_summary();
+extern void cgit_print_log(const char *tip, int ofs, int cnt);
 
 extern void cgit_repo_config_cb(const char *name, const char *value);
 
-extern void cgit_print_repo_summary();
-
 
 #endif /* CGIT_H */
diff --git a/ui-log.c b/ui-log.c
new file mode 100644
index 0000000..701c392
--- a/dev/null
+++ b/ui-log.c
@@ -0,0 +1,115 @@
+/* ui-log.c: functions for log output
+ *
+ * Copyright (C) 2006 Lars Hjemli
+ *
+ * Licensed under GNU General Public License v2
+ *   (see COPYING for full license text)
+ */
+
+#include "cgit.h"
+
+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)
+{
+        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);
+        }
+
+        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");
+}
+
+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;
+        }
+        html("</table>\n");
+}
+
diff --git a/ui-summary.c b/ui-summary.c
index 532ddbf..cc918ad 100644
--- a/ui-summary.c
+++ b/ui-summary.c
@@ -33,23 +33,23 @@ static int cgit_print_branch_cb(const char *refname, const unsigned char *sha1,
                 html_txt(buf);
                 html("</td><td>");
                 htmlf("*** bad ref %s", sha1_to_hex(sha1));
                 html("</td></tr>\n");
         }
         return 0;
 }
 
 static void cgit_print_branches()
 {
         html("<table class='list'>");
         html("<tr><th>Branch name</th><th>Head commit</th></tr>\n");
         for_each_branch_ref(cgit_print_branch_cb, NULL);
         html("</table>");
 }
 
-void cgit_print_repo_summary()
+void cgit_print_summary()
 {
         html("<h2>");
         html_txt("Repo summary page");
         html("</h2>");
         cgit_print_branches();
 }