5 files changed, 47 insertions, 3 deletions

diff --git a/Makefile b/Makefile
index 24c3963..7c0527b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,36 +1,36 @@
 CGIT_VERSION = 0.2
 
 prefix = /var/www/htdocs/cgit
 gitsrc = ../git
 
 SHA1_HEADER = <openssl/sha.h>
 
 CACHE_ROOT = /var/cache/cgit
 EXTLIBS = $(gitsrc)/libgit.a $(gitsrc)/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.o ui-tree.o ui-commit.o ui-diff.o \
-        ui-snapshot.o
+        ui-snapshot.o ui-blob.o
 
 CFLAGS += -Wall
 
 ifdef DEBUG
         CFLAGS += -g
 endif
 
 CFLAGS += -I$(gitsrc) -DSHA1_HEADER='$(SHA1_HEADER)'
 
 all: cgit
 
 install: all clean-cache
         mkdir -p $(prefix)
         install cgit $(prefix)/cgit.cgi
         install cgit.css $(prefix)/cgit.css
 
 cgit: cgit.c cgit.h $(OBJECTS) $(gitsrc)/libgit.a
         $(CC) $(CFLAGS) -DCGIT_VERSION='"$(CGIT_VERSION)"' cgit.c -o cgit \
                 $(OBJECTS) $(EXTLIBS)
 
 $(OBJECTS): cgit.h
 
 $(gitsrc)/libgit.a:
         $(MAKE) -C $(gitsrc)
diff --git a/cgit.c b/cgit.c
index 6dddcbb..28bab8d 100644
--- a/cgit.c
+++ b/cgit.c
@@ -58,54 +58,59 @@ static int cgit_prepare_cache(struct cacheitem *item)
                         item->ttl = cgit_cache_repo_ttl;
         }
         return 1;
 }
 
 static void cgit_print_repo_page(struct cacheitem *item)
 {
         char *title;
         int show_search;
 
         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;
         }
 
         title = fmt("%s - %s", cgit_repo->name, cgit_repo->desc);
         show_search = 0;
         setenv("GIT_DIR", cgit_repo->path, 1);
 
-        if (cgit_repo->snapshots && cgit_query_page && 
-            !strcmp(cgit_query_page, "snapshot")) {
+        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;
         }
+            if (!strcmp(cgit_query_page, "blob")) {
+                    cgit_print_blob(item, cgit_query_sha1, cgit_query_path);
+                    return;
+            }
+        }
 
         if (cgit_query_page && !strcmp(cgit_query_page, "log"))
                 show_search = 1;
 
         cgit_print_docstart(title, item);
 
 
         if (!cgit_query_page) {
                 cgit_print_pageheader("summary", show_search);
                 cgit_print_summary();
                 cgit_print_docend();
                 return;
         }
 
         cgit_print_pageheader(cgit_query_page, show_search);
 
         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_tree(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")) {
diff --git a/cgit.h b/cgit.h
index 2615231..292e488 100644
--- a/cgit.h
+++ b/cgit.h
@@ -135,32 +135,33 @@ extern struct taginfo *cgit_parse_tag(struct tag *tag);
 extern char *cache_safe_filename(const char *unsafe);
 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_date(unsigned long secs);
 extern void cgit_print_docstart(char *title, struct cacheitem *item);
 extern void cgit_print_docend();
 extern void cgit_print_pageheader(char *title, int show_search);
 extern void cgit_print_snapshot_start(const char *mimetype, 
                                       const char *filename, 
                                       struct cacheitem *item);
 
 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, char *grep);
 extern void cgit_print_view(const char *hex, char *path);
+extern void cgit_print_blob(struct cacheitem *item, const char *hex, char *path);
 extern void cgit_print_tree(const char *hex, char *path);
 extern void cgit_print_commit(const char *hex);
 extern void cgit_print_diff(const char *old_hex, const char *new_hex);
 extern void cgit_print_snapshot(struct cacheitem *item, const char *hex, 
                                 const char *format, const char *prefix,
                                 const char *filename);
 
 #endif /* CGIT_H */
diff --git a/ui-blob.c b/ui-blob.c
new file mode 100644
index 0000000..f5b844b
--- a/dev/null
+++ b/ui-blob.c
@@ -0,0 +1,31 @@
+#include "cgit.h"
+
+void cgit_print_blob(struct cacheitem *item, const char *hex, char *path)
+{
+
+        unsigned char sha1[20];
+        enum object_type type;
+        unsigned char *buf;
+        unsigned long size;
+
+        if (get_sha1_hex(hex, sha1)){
+                cgit_print_error(fmt("Bad hex value: %s", hex));
+                return;
+        }
+
+        type = sha1_object_info(sha1, &size);
+        if (type == OBJ_BAD) {
+                cgit_print_error(fmt("Bad object name: %s", hex));
+                return;
+        }
+
+        buf = read_sha1_file(sha1, &type, &size);
+        if (!buf) {
+                cgit_print_error(fmt("Error reading object %s", hex));
+                return;
+        }
+
+        buf[size] = '\0';
+        cgit_print_snapshot_start("text/plain", path, item);
+        write(htmlfd, buf, size);
+}
diff --git a/ui-view.c b/ui-view.c
index 7d022fd..dbe4b29 100644
--- a/ui-view.c
+++ b/ui-view.c
@@ -19,30 +19,37 @@ void cgit_print_view(const char *hex, char *path)
                 cgit_print_error(fmt("Bad hex value: %s", hex));
                 return;
         }
 
         type = sha1_object_info(sha1, &size);
         if (type == OBJ_BAD) {
                 cgit_print_error(fmt("Bad object name: %s", hex));
                 return;
         }
 
         buf = read_sha1_file(sha1, &type, &size);
         if (!buf) {
                 cgit_print_error(fmt("Error reading object %s", hex));
                 return;
         }
 
         buf[size] = '\0';
         html("<table class='list'>\n");
         html("<tr class='nohover'><th class='left'>");
         if (path)
                 htmlf("%s (", path);
         htmlf("%s %s, %li bytes", typename(type), hex, size);
         if (path)
                 html(")");
+
+        html(" <a href='");
+        html_attr(cgit_pageurl(cgit_query_repo, "blob", 
+                               fmt("id=%s&path=%s", 
+                                   hex,
+                                   path)));
+        html("'>download</a>");
         html("</th></tr>\n");
         html("<tr><td class='blob'>\n");
         html_txt(buf);
         html("\n</td></tr>\n");
         html("</table>\n");
 }