4 files changed, 43 insertions, 34 deletions

diff --git a/Makefile b/Makefile
index 64bbd5c..4e532d0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,25 +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 \
-        ui-log.o
+        ui-log.o ui-view.c
 
 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 30a9a2a..52d9bd3 100644
--- a/cgit.c
+++ b/cgit.c
@@ -71,86 +71,54 @@ 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 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;
-        }
-
-        buf = read_sha1_file(sha1, type, &size);
-        if (!buf) {
-                cgit_print_error("Error reading object");
-                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>");
-}
-
 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_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_view(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);
 }
 
 static void cgit_refresh_cache(struct cacheitem *item)
 {
diff --git a/cgit.h b/cgit.h
index 0100763..9c7f0b4 100644
--- a/cgit.h
+++ b/cgit.h
@@ -64,21 +64,22 @@ 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_print_view(char *hex);
 
 extern void cgit_repo_config_cb(const char *name, const char *value);
 
 
 #endif /* CGIT_H */
diff --git a/ui-view.c b/ui-view.c
new file mode 100644
index 0000000..193c685
--- a/dev/null
+++ b/ui-view.c
@@ -0,0 +1,40 @@
+/* ui-view.c: functions to output _any_ object, given it's sha1
+ *
+ * Copyright (C) 2006 Lars Hjemli
+ *
+ * Licensed under GNU General Public License v2
+ *   (see COPYING for full license text)
+ */
+
+#include "cgit.h"
+
+void cgit_print_view(char *hex)
+{
+        unsigned char sha1[20];
+        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;
+        }
+
+        buf = read_sha1_file(sha1, type, &size);
+        if (!buf) {
+                cgit_print_error("Error reading object");
+                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>");
+}