Add display of tree content w/ui-tree.c

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

9 files changed, 112 insertions, 7 deletions

diff --git a/Makefile b/Makefile
index c029637..4d2ede3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,28 +1,28 @@
 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 = shared.o cache.o parsing.o html.o ui-shared.o ui-repolist.o \
-	ui-summary.o ui-log.o ui-view.c
+	ui-summary.o ui-log.o ui-view.c ui-tree.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
 
 .PHONY: clean
 clean:
 	rm -f cgit *.o
diff --git a/cgit.c b/cgit.c
index 0f72f2d..ada488b 100644
--- a/cgit.c
+++ b/cgit.c
@@ -1,106 +1,108 @@
 /* cgit.c: cgi for the git scm
  *
  * Copyright (C) 2006 Lars Hjemli
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
  */
 
 #include "cgit.h"
 
 const char cgit_version[] = CGIT_VERSION;
 
 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)
+	if (!cgit_query_page) {
 		cgit_print_summary();
-	else if (!strcmp(cgit_query_page, "log")) {
+	} else if (!strcmp(cgit_query_page, "log")) {
 		cgit_print_log(cgit_query_head, 0, 100);
+	} else if (!strcmp(cgit_query_page, "tree")) {
+		cgit_print_tree(cgit_query_sha1);
 	} else if (!strcmp(cgit_query_page, "view")) {
 		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_check_cache(struct cacheitem *item)
 {
 	int i = 0;
 
 	cache_prepare(item);
  top:
 	if (++i > cgit_max_lock_attempts) {
 		die("cgit_refresh_cache: unable to lock %s: %s",
 		    item->name, strerror(errno));
 	}
 	if (!cache_exist(item)) {
 		if (!cache_lock(item)) {
 			sleep(1);
 			goto top;
 		}
 		if (!cache_exist(item)) {
 			cgit_fill_cache(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);
 			cache_unlock(item);
 		} else {
 			cache_cancel_lock(item);
 		}
 	}
 }
 
 static void cgit_print_cache(struct cacheitem *item)
 {
 	static char buf[4096];
 	ssize_t i;
 
 	int fd = open(item->name, O_RDONLY);
 	if (fd<0)
 		die("Unable to open cached file %s", item->name);
 
 	while((i=read(fd, buf, sizeof(buf))) > 0)
 		write(STDOUT_FILENO, buf, i);
 
 	close(fd);
 }
 
 int main(int argc, const char **argv)
 {
 	struct cacheitem item;
 
 	cgit_read_config("/etc/cgitrc", cgit_global_config_cb);
 	cgit_querystring = xstrdup(getenv("QUERY_STRING"));
 	cgit_parse_query(cgit_querystring, cgit_querystring_cb);
 
 	cgit_check_cache(&item);
 	cgit_print_cache(&item);
 	return 0;
 }
diff --git a/cgit.css b/cgit.css
index 3ed0c22..c16f3f2 100644
--- a/cgit.css
+++ b/cgit.css
@@ -1,63 +1,72 @@
 body {
 	font-family: arial;
 	font-size: normal;
 	background: white;
 	padding: 0em;
 	margin: 0.5em;
 }
 
 
 h2 {
 	font-size: normal;
 	font-weight: bold;
 	margin-bottom: 0.1em;
 }
 
 
 table.list {
 	border: solid 1px black;
 	border-collapse: collapse;
 	border: solid 1px #aaa;
 }
 
 table.list th {
 	text-align: left;
 	font-weight: bold;
 	background: #ddd;
 	border-bottom: solid 1px #aaa;
 	padding: 0.1em 0.5em 0.1em;
 	vertical-align: baseline;
 }
 table.list td {
 	border: none;
-	padding: 0.1em 0.5em;
+	padding: 0.1em 1em 0.1em 0.5em;
 	background: white;
 }
 
 img {
 	border: none;
 }
 
 
 div#header {
 	background-color: #ddd;
 	padding: 0.25em 0.25em 0.25em 0.5em;
 	font-size: 150%;
 	font-weight: bold;
 	border: solid 1px #aaa;
 	vertical-align: middle;
 }
 
 div#header img#logo {
 	float: right;
 }
 
 div#content {
 	margin: 0.5em 0.5em;
 }
 
 div.error {
 	color: red;
 	font-weight: bold;
 	margin: 1em 2em;
 }
\ No newline at end of file
+div.ls-dir a {
+	font-weight: bold;
+}
+th.filesize, td.filesize {
+	text-align: right;
+}
+th.filemode, td.filemode {
+	text-align: center;
+}
diff --git a/cgit.h b/cgit.h
index c9554a7..2fdfab3 100644
--- a/cgit.h
+++ b/cgit.h
@@ -1,87 +1,88 @@
 #ifndef CGIT_H
 #define CGIT_H
 
 #include "git.h"
 #include <openssl/sha.h>
 #include <ctype.h>
 #include <sched.h>
 
 typedef void (*configfn)(const char *name, const char *value);
 
 struct cacheitem {
 	char *name;
 	struct stat st;
 	int ttl;
 	int fd;
 };
 
 extern const char cgit_version[];
 
 extern char *cgit_root;
 extern char *cgit_root_title;
 extern char *cgit_css;
 extern char *cgit_logo;
 extern char *cgit_logo_link;
 extern char *cgit_virtual_root;
 extern char *cgit_cache_root;
 
 extern int cgit_max_lock_attempts;
 extern int cgit_cache_root_ttl;
 extern int cgit_cache_repo_ttl;
 extern int cgit_cache_dynamic_ttl;
 extern int cgit_cache_static_ttl;
 extern int cgit_cache_max_create_time;
 
 extern char *cgit_repo_name;
 extern char *cgit_repo_desc;
 extern char *cgit_repo_owner;
 
 extern int cgit_query_has_symref;
 extern int cgit_query_has_sha1;
 
 extern char *cgit_querystring;
 extern char *cgit_query_repo;
 extern char *cgit_query_page;
 extern char *cgit_query_head;
 extern char *cgit_query_sha1;
 
 extern int htmlfd;
 
 extern void cgit_global_config_cb(const char *name, const char *value);
 extern void cgit_repo_config_cb(const char *name, const char *value);
 extern void cgit_querystring_cb(const char *name, const char *value);
 
 extern char *fmt(const char *format,...);
 
 extern void html(const char *txt);
 extern void htmlf(const char *format,...);
 extern void html_txt(char *txt);
 extern void html_attr(char *txt);
 extern void html_link_open(char *url, char *title, char *class);
 extern void html_link_close(void);
 
 extern int cgit_read_config(const char *filename, configfn fn);
 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_cancel_lock(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_print_tree(const char *sha1);
 
 #endif /* CGIT_H */
diff --git a/git.h b/git.h
index dfa3542..a3f977c 100644
--- a/git.h
+++ b/git.h
@@ -95,192 +95,205 @@ static inline void *xcalloc(size_t nmemb, size_t size)
 }
 
 static inline ssize_t xread(int fd, void *buf, size_t len)
 {
 	ssize_t nr;
 	while (1) {
 		nr = read(fd, buf, len);
 		if ((nr < 0) && (errno == EAGAIN || errno == EINTR))
 			continue;
 		return nr;
 	}
 }
 
 static inline ssize_t xwrite(int fd, const void *buf, size_t len)
 {
 	ssize_t nr;
 	while (1) {
 		nr = write(fd, buf, len);
 		if ((nr < 0) && (errno == EAGAIN || errno == EINTR))
 			continue;
 		return nr;
 	}
 }
 
 
 
 
 /*
  * from git:cache.h
  */
 
 
 /* Convert to/from hex/sha1 representation */
 #define MINIMUM_ABBREV 4
 #define DEFAULT_ABBREV 7
 
 extern int sha1_object_info(const unsigned char *, char *, unsigned long *);
 
 extern void * read_sha1_file(const unsigned char *sha1, char *type, unsigned long *size);
 
 extern int get_sha1(const char *str, unsigned char *sha1);
 extern int get_sha1_hex(const char *hex, unsigned char *sha1);
 extern char *sha1_to_hex(const unsigned char *sha1);	/* static buffer result! */
 
 
 
 /*
  * from git:object.h 
  */
 
 struct object_list {
 	struct object *item;
 	struct object_list *next;
 };
 
 struct object_refs {
 	unsigned count;
 	struct object *base;
 	struct object *ref[FLEX_ARRAY]; /* more */
 };
 
 struct object_array {
 	unsigned int nr;
 	unsigned int alloc;
 	struct object_array_entry {
 		struct object *item;
 		const char *name;
 	} *objects;
 };
 
 #define TYPE_BITS   3
 #define FLAG_BITS  27
 
 /*
  * The object type is stored in 3 bits.
  */
 struct object {
 	unsigned parsed : 1;
 	unsigned used : 1;
 	unsigned type : TYPE_BITS;
 	unsigned flags : FLAG_BITS;
 	unsigned char sha1[20];
 };
 
 
 /*
  * from git:tree.h
  */
 
 struct tree {
 	struct object object;
 	void *buffer;
 	unsigned long size;
 };
 
 
+struct tree *lookup_tree(const unsigned char *sha1);
+int parse_tree_buffer(struct tree *item, void *buffer, unsigned long size);
+int parse_tree(struct tree *tree);
+struct tree *parse_tree_indirect(const unsigned char *sha1);
+
+typedef int (*read_tree_fn_t)(const unsigned char *, const char *, int, const char *, unsigned int, int);
+
+extern int read_tree_recursive(struct tree *tree,
+			       const char *base, int baselen,
+			       int stage, const char **match,
+			       read_tree_fn_t fn);
+
+extern int read_tree(struct tree *tree, int stage, const char **paths);
 
 
 /* from git:commit.h */
 
 struct commit_list {
 	struct commit *item;
 	struct commit_list *next;
 };
 
 struct commit {
 	struct object object;
 	void *util;
 	unsigned long date;
 	struct commit_list *parents;
 	struct tree *tree;
 	char *buffer;
 };
 
 
 struct commit *lookup_commit(const unsigned char *sha1);
 struct commit *lookup_commit_reference(const unsigned char *sha1);
 struct commit *lookup_commit_reference_gently(const unsigned char *sha1,
 					      int quiet);
 
 int parse_commit_buffer(struct commit *item, void *buffer, unsigned long size);
 int parse_commit(struct commit *item);
 
 struct commit_list * commit_list_insert(struct commit *item, struct commit_list **list_p);
 struct commit_list * insert_by_date(struct commit *item, struct commit_list **list);
 
 void free_commit_list(struct commit_list *list);
 
 void sort_by_date(struct commit_list **list);
 
 /* Commit formats */
 enum cmit_fmt {
 	CMIT_FMT_RAW,
 	CMIT_FMT_MEDIUM,
 	CMIT_FMT_DEFAULT = CMIT_FMT_MEDIUM,
 	CMIT_FMT_SHORT,
 	CMIT_FMT_FULL,
 	CMIT_FMT_FULLER,
 	CMIT_FMT_ONELINE,
 	CMIT_FMT_EMAIL,
 
 	CMIT_FMT_UNSPECIFIED,
 };
 
 extern unsigned long pretty_print_commit(enum cmit_fmt fmt, const struct commit *, unsigned long len, char *buf, unsigned long space, int abbrev, const char *subject, const char *after_subject, int relative_date);
 
 
 typedef void (*topo_sort_set_fn_t)(struct commit*, void *data);
 typedef void* (*topo_sort_get_fn_t)(struct commit*);
 
 
 
 
 /*
  *  from git:diff.h
  */
 
 
 struct rev_info;
 struct diff_options;
 struct diff_queue_struct;
 
 typedef void (*change_fn_t)(struct diff_options *options,
 		 unsigned old_mode, unsigned new_mode,
 		 const unsigned char *old_sha1,
 		 const unsigned char *new_sha1,
 		 const char *base, const char *path);
 
 typedef void (*add_remove_fn_t)(struct diff_options *options,
 		    int addremove, unsigned mode,
 		    const unsigned char *sha1,
 		    const char *base, const char *path);
 
 typedef void (*diff_format_fn_t)(struct diff_queue_struct *q,
 		struct diff_options *options, void *data);
 
 #define DIFF_FORMAT_RAW		0x0001
 #define DIFF_FORMAT_DIFFSTAT	0x0002
 #define DIFF_FORMAT_NUMSTAT	0x0004
 #define DIFF_FORMAT_SUMMARY	0x0008
 #define DIFF_FORMAT_PATCH	0x0010
 
 /* These override all above */
 #define DIFF_FORMAT_NAME	0x0100
 #define DIFF_FORMAT_NAME_STATUS	0x0200
 #define DIFF_FORMAT_CHECKDIFF	0x0400
 
 /* Same as output_format = 0 but we know that -s flag was given
  * and we should not give default value to output_format.
  */
 #define DIFF_FORMAT_NO_OUTPUT	0x0800
 
diff --git a/ui-log.c b/ui-log.c
index 701c392..4d2c2e0 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -1,115 +1,120 @@
 /* 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><td><a href='");
+	html_attr(cgit_pageurl(cgit_query_repo, "tree", 
+			       fmt("id=%s", 
+				   sha1_to_hex(commit->tree->object.sha1))));
+	html("'>tree</a>");
 	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");
+	html("<tr><th>Date</th><th>Message</th><th>Author</th><th>Link</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 cc918ad..29baa74 100644
--- a/ui-summary.c
+++ b/ui-summary.c
@@ -1,55 +1,60 @@
 /* ui-summary.c: functions for generating repo summary page
  *
  * Copyright (C) 2006 Lars Hjemli
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
  */
 
 #include "cgit.h"
 
 static int cgit_print_branch_cb(const char *refname, const unsigned char *sha1,
 				int flags, void *cb_data)
 {
 	struct commit *commit;
 	char buf[256], *url;
 
 	commit = lookup_commit(sha1);
 	if (commit && !parse_commit(commit)){
 		html("<tr><td>");
 		url = cgit_pageurl(cgit_query_repo, "log", 
 				   fmt("h=%s", refname));
 		html_link_open(url, NULL, NULL);
 		strncpy(buf, refname, sizeof(buf));
 		html_txt(buf);
 		html_link_close();
 		html("</td><td>");
 		pretty_print_commit(CMIT_FMT_ONELINE, commit, ~0, buf,
 				    sizeof(buf), 0, NULL, NULL, 0);
 		html_txt(buf);
+		html("</td><td><a href='");
+		html_attr(cgit_pageurl(cgit_query_repo, "tree", 
+				       fmt("id=%s", 
+					   sha1_to_hex(commit->tree->object.sha1))));
+		html("'>tree</a>");
 		html("</td></tr>\n");
 	} else {
 		html("<tr><td>");
 		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");
+	html("<tr><th>Branch name</th><th>Latest</th><th>Link</th></tr>\n");
 	for_each_branch_ref(cgit_print_branch_cb, NULL);
 	html("</table>");
 }
 
 void cgit_print_summary()
 {
 	html("<h2>");
 	html_txt("Repo summary page");
 	html("</h2>");
 	cgit_print_branches();
 }
diff --git a/ui-tree.c b/ui-tree.c
new file mode 100644
index 0000000..84930cb
--- a/dev/null
+++ b/ui-tree.c
@@ -0,0 +1,70 @@
+/* ui-tree.c: functions for tree output
+ *
+ * Copyright (C) 2006 Lars Hjemli
+ *
+ * Licensed under GNU General Public License v2
+ *   (see COPYING for full license text)
+ */
+
+#include "cgit.h"
+
+
+static int print_entry(const unsigned char *sha1, const char *base, 
+		       int baselen, const char *pathname, unsigned int mode, 
+		       int stage)
+{
+	char *name;
+	char type[20];
+	unsigned long size;
+
+	if (sha1_object_info(sha1, type, &size)) {
+		cgit_print_error(fmt("Bad object name: %s", 
+				     sha1_to_hex(sha1)));
+		return 0;
+	}
+	name = xstrdup(pathname);
+	html("<tr><td>");
+	if (S_ISDIR(mode)) {
+		html("<div class='ls-dir'><a href='");
+		html_attr(cgit_pageurl(cgit_query_repo, "tree", 
+				       fmt("id=%s", sha1_to_hex(sha1))));
+	} else {
+		html("<div class='ls-blob'><a href='");
+		html_attr(cgit_pageurl(cgit_query_repo, "view",
+				      fmt("id=%s", sha1_to_hex(sha1))));
+	}
+	html("'>");
+	html_txt(name);
+	if (S_ISDIR(mode))
+		html("/");
+	html("</a></div></td>");
+	htmlf("<td class='filesize'>%li</td>", size);
+	htmlf("<td class='filemode'>%06o</td>", mode);
+	html("</tr>\n");
+	free(name);
+	return 0;
+}
+
+void cgit_print_tree(const char *hex)
+{
+	struct tree *tree;
+	unsigned char sha1[20];
+
+	if (get_sha1_hex(hex, sha1)) {
+		cgit_print_error(fmt("Invalid object id: %s", hex));
+		return;
+	}
+	tree = parse_tree_indirect(sha1);
+	if (!tree) {
+		cgit_print_error(fmt("Not a tree object: %s", hex));
+		return;
+	}
+
+	html("<h2>Tree content</h2>\n");
+	html("<table class='list'>\n");
+	html("<tr><th>Name</th>");
+	html("<th class='filesize'>Size</th>");
+	html("<th class='filemode'>Mode</th></tr>\n");
+	read_tree_recursive(tree, "", 0, 1, NULL, print_entry);
+	html("</table>\n");
+}
diff --git a/ui-view.c b/ui-view.c
index 193c685..1bf8472 100644
--- a/ui-view.c
+++ b/ui-view.c
@@ -1,40 +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)){
+	if (sha1_object_info(sha1, type, &size)){
 		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>");
 }