Merge branch 'lh/clone'

* lh/clone:
  Add support for cloning over http

Conflicts:
	cmd.c

6 files changed, 140 insertions, 0 deletions

diff --git a/Makefile b/Makefile
index 1163b02..b002d44 100644
--- a/Makefile
+++ b/Makefile
@@ -48,24 +48,25 @@ endif
 
 EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto
 OBJECTS =
 OBJECTS += cache.o
 OBJECTS += cgit.o
 OBJECTS += cmd.o
 OBJECTS += configfile.o
 OBJECTS += html.o
 OBJECTS += parsing.o
 OBJECTS += shared.o
 OBJECTS += ui-atom.o
 OBJECTS += ui-blob.o
+OBJECTS += ui-clone.o
 OBJECTS += ui-commit.o
 OBJECTS += ui-diff.o
 OBJECTS += ui-log.o
 OBJECTS += ui-patch.o
 OBJECTS += ui-refs.o
 OBJECTS += ui-repolist.o
 OBJECTS += ui-shared.o
 OBJECTS += ui-snapshot.o
 OBJECTS += ui-summary.o
 OBJECTS += ui-tag.o
 OBJECTS += ui-tree.o
 
diff --git a/cmd.c b/cmd.c
index c0e4db3..40ac53e 100644
--- a/cmd.c
+++ b/cmd.c
@@ -3,35 +3,41 @@
  * Copyright (C) 2008 Lars Hjemli
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
  */
 
 #include "cgit.h"
 #include "cmd.h"
 #include "cache.h"
 #include "ui-shared.h"
 #include "ui-atom.h"
 #include "ui-blob.h"
+#include "ui-clone.h"
 #include "ui-commit.h"
 #include "ui-diff.h"
 #include "ui-log.h"
 #include "ui-patch.h"
 #include "ui-refs.h"
 #include "ui-repolist.h"
 #include "ui-snapshot.h"
 #include "ui-summary.h"
 #include "ui-tag.h"
 #include "ui-tree.h"
 
+static void HEAD_fn(struct cgit_context *ctx)
+{
+        cgit_clone_head(ctx);
+}
+
 static void atom_fn(struct cgit_context *ctx)
 {
         cgit_print_atom(ctx->qry.head, ctx->qry.path, 10);
 }
 
 static void about_fn(struct cgit_context *ctx)
 {
         if (ctx->repo)
                 cgit_print_repo_readme();
         else
                 cgit_print_site_readme();
 }
@@ -42,38 +48,48 @@ static void blob_fn(struct cgit_context *ctx)
 }
 
 static void commit_fn(struct cgit_context *ctx)
 {
         cgit_print_commit(ctx->qry.sha1);
 }
 
 static void diff_fn(struct cgit_context *ctx)
 {
         cgit_print_diff(ctx->qry.sha1, ctx->qry.sha2, ctx->qry.path);
 }
 
+static void info_fn(struct cgit_context *ctx)
+{
+        cgit_clone_info(ctx);
+}
+
 static void log_fn(struct cgit_context *ctx)
 {
         cgit_print_log(ctx->qry.sha1, ctx->qry.ofs, ctx->cfg.max_commit_count,
                        ctx->qry.grep, ctx->qry.search, ctx->qry.path, 1);
 }
 
 static void ls_cache_fn(struct cgit_context *ctx)
 {
         ctx->page.mimetype = "text/plain";
         ctx->page.filename = "ls-cache.txt";
         cgit_print_http_headers(ctx);
         cache_ls(ctx->cfg.cache_root);
 }
 
+static void objects_fn(struct cgit_context *ctx)
+{
+        cgit_clone_objects(ctx);
+}
+
 static void repolist_fn(struct cgit_context *ctx)
 {
         cgit_print_repolist();
 }
 
 static void patch_fn(struct cgit_context *ctx)
 {
         cgit_print_patch(ctx->qry.sha1);
 }
 
 static void refs_fn(struct cgit_context *ctx)
 {
@@ -99,31 +115,34 @@ static void tag_fn(struct cgit_context *ctx)
 
 static void tree_fn(struct cgit_context *ctx)
 {
         cgit_print_tree(ctx->qry.sha1, ctx->qry.path);
 }
 
 #define def_cmd(name, want_repo, want_layout) \
         {#name, name##_fn, want_repo, want_layout}
 
 struct cgit_cmd *cgit_get_cmd(struct cgit_context *ctx)
 {
         static struct cgit_cmd cmds[] = {
+                def_cmd(HEAD, 1, 0),
                 def_cmd(atom, 1, 0),
                 def_cmd(about, 0, 1),
                 def_cmd(blob, 1, 0),
                 def_cmd(commit, 1, 1),
                 def_cmd(diff, 1, 1),
+                def_cmd(info, 1, 0),
                 def_cmd(log, 1, 1),
                 def_cmd(ls_cache, 0, 0),
+                def_cmd(objects, 1, 0),
                 def_cmd(patch, 1, 0),
                 def_cmd(refs, 1, 1),
                 def_cmd(repolist, 0, 0),
                 def_cmd(snapshot, 1, 0),
                 def_cmd(summary, 1, 1),
                 def_cmd(tag, 1, 1),
                 def_cmd(tree, 1, 1),
         };
         int i;
 
         if (ctx->qry.page == NULL) {
                 if (ctx->repo)
diff --git a/html.c b/html.c
index bddb04d..1237076 100644
--- a/html.c
+++ b/html.c
@@ -42,24 +42,31 @@ void html(const char *txt)
 
 void htmlf(const char *format, ...)
 {
         static char buf[65536];
         va_list args;
 
         va_start(args, format);
         vsnprintf(buf, sizeof(buf), format, args);
         va_end(args);
         html(buf);
 }
 
+void html_status(int code, int more_headers)
+{
+        htmlf("Status: %d\n", code);
+        if (!more_headers)
+                html("\n");
+}
+
 void html_txt(char *txt)
 {
         char *t = txt;
         while(t && *t){
                 int c = *t;
                 if (c=='<' || c=='>' || c=='&') {
                         write(htmlfd, txt, t - txt);
                         if (c=='>')
                                 html("&gt;");
                         else if (c=='<')
                                 html("&lt;");
                         else if (c=='&')
diff --git a/html.h b/html.h
index e6fdc54..2bde28d 100644
--- a/html.h
+++ b/html.h
@@ -1,19 +1,20 @@
 #ifndef HTML_H
 #define HTML_H
 
 extern int htmlfd;
 
 extern void html(const char *txt);
 extern void htmlf(const char *format,...);
+extern void html_status(int code, int more_headers);
 extern void html_txt(char *txt);
 extern void html_ntxt(int len, char *txt);
 extern void html_attr(char *txt);
 extern void html_hidden(char *name, char *value);
 extern void html_option(char *value, char *text, char *selected_value);
 extern void html_link_open(char *url, char *title, char *class);
 extern void html_link_close(void);
 extern void html_fileperm(unsigned short mode);
 extern int html_include(const char *filename);
 
 extern int http_parse_querystring(char *txt, void (*fn)(const char *name, const char *value));
 
diff --git a/ui-clone.c b/ui-clone.c
new file mode 100644
index 0000000..3a037ad
--- a/dev/null
+++ b/ui-clone.c
@@ -0,0 +1,104 @@
+/* ui-clone.c: functions for http cloning, based on
+ * git's http-backend.c by Shawn O. Pearce
+ *
+ * Copyright (C) 2008 Lars Hjemli
+ *
+ * Licensed under GNU General Public License v2
+ *   (see COPYING for full license text)
+ */
+
+#include "cgit.h"
+#include "html.h"
+#include "ui-shared.h"
+
+static int print_ref_info(const char *refname, const unsigned char *sha1,
+                          int flags, void *cb_data)
+{
+        struct object *obj;
+
+        if (!(obj = parse_object(sha1)))
+                return 0;
+
+        if (!strcmp(refname, "HEAD") || !prefixcmp(refname, "refs/heads/"))
+                htmlf("%s\t%s\n", sha1_to_hex(sha1), refname);
+        else if (!prefixcmp(refname, "refs/tags") && obj->type == OBJ_TAG) {
+                if (!(obj = deref_tag(obj, refname, 0)))
+                        return 0;
+                htmlf("%s\t%s\n", sha1_to_hex(sha1), refname);
+                htmlf("%s\t%s^{}\n", sha1_to_hex(obj->sha1), refname);
+        }
+        return 0;
+}
+
+static void print_pack_info(struct cgit_context *ctx)
+{
+        struct packed_git *pack;
+        int ofs;
+
+        ctx->page.mimetype = "text/plain";
+        ctx->page.filename = "objects/info/packs";
+        cgit_print_http_headers(ctx);
+        ofs = strlen(ctx->repo->path) + strlen("/objects/pack/");
+        prepare_packed_git();
+        for (pack = packed_git; pack; pack = pack->next)
+                if (pack->pack_local)
+                        htmlf("P %s\n", pack->pack_name + ofs);
+}
+
+static void send_file(struct cgit_context *ctx, char *path)
+{
+        struct stat st;
+        int err;
+
+        if (stat(path, &st)) {
+                switch (errno) {
+                case ENOENT:
+                        err = 404;
+                        break;
+                case EACCES:
+                        err = 403;
+                        break;
+                default:
+                        err = 400;
+                }
+                html_status(err, 0);
+                return;
+        }
+        ctx->page.mimetype = "application/octet-stream";
+        ctx->page.filename = path;
+        if (prefixcmp(ctx->repo->path, path))
+                ctx->page.filename += strlen(ctx->repo->path) + 1;
+        cgit_print_http_headers(ctx);
+        html_include(path);
+}
+
+void cgit_clone_info(struct cgit_context *ctx)
+{
+        if (!ctx->qry.path || strcmp(ctx->qry.path, "refs"))
+                return;
+
+        ctx->page.mimetype = "text/plain";
+        ctx->page.filename = "info/refs";
+        cgit_print_http_headers(ctx);
+        for_each_ref(print_ref_info, ctx);
+}
+
+void cgit_clone_objects(struct cgit_context *ctx)
+{
+        if (!ctx->qry.path) {
+                html_status(400, 0);
+                return;
+        }
+
+        if (!strcmp(ctx->qry.path, "info/packs")) {
+                print_pack_info(ctx);
+                return;
+        }
+
+        send_file(ctx, git_path("objects/%s", ctx->qry.path));
+}
+
+void cgit_clone_head(struct cgit_context *ctx)
+{
+        send_file(ctx, git_path("%s", "HEAD"));
+}
diff --git a/ui-clone.h b/ui-clone.h
new file mode 100644
index 0000000..89cd4f1
--- a/dev/null
+++ b/ui-clone.h
@@ -0,0 +1,8 @@
+#ifndef UI_CLONE_H
+#define UI_CLONE_H
+
+void cgit_clone_info(struct cgit_context *ctx);
+void cgit_clone_objects(struct cgit_context *ctx);
+void cgit_clone_head(struct cgit_context *ctx);
+
+#endif /* UI_CLONE_H */