21 files changed, 507 insertions, 287 deletions

diff --git a/Makefile b/Makefile
index 6de072a..eac24ad 100644
--- a/Makefile
+++ b/Makefile
@@ -198,9 +198,9 @@ install-pdf: doc-pdf
         $(INSTALL) -m 0644 $(DOC_PDF) $(DESTDIR)$(pdfdir)
 
 uninstall:
-        rm -f $(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME)
-        rm -f $(CGIT_DATA_PATH)/cgit.css
-        rm -f $(CGIT_DATA_PATH)/cgit.png
+        rm -f $(DESTDIR)$(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME)
+        rm -f $(DESTDIR)$(CGIT_DATA_PATH)/cgit.css
+        rm -f $(DESTDIR)$(CGIT_DATA_PATH)/cgit.png
 
 uninstall-doc: uninstall-man uninstall-html uninstall-pdf
 
diff --git a/cgit.c b/cgit.c
index 435ce5a..1d50129 100644
--- a/cgit.c
+++ b/cgit.c
@@ -26,14 +26,27 @@ void add_mimetype(const char *name, const char *value)
         item->util = xstrdup(value);
 }
 
-struct cgit_filter *new_filter(const char *cmd, int extra_args)
+struct cgit_filter *new_filter(const char *cmd, filter_type filtertype)
 {
         struct cgit_filter *f;
         int args_size = 0;
+        int extra_args;
 
         if (!cmd || !cmd[0])
                 return NULL;
 
+        switch (filtertype) {
+                case SOURCE:
+                        extra_args = 1;
+                        break;
+
+                case ABOUT:
+                case COMMIT:
+                default:
+                        extra_args = 0;
+                        break;
+        }
+
         f = xmalloc(sizeof(struct cgit_filter));
         f->cmd = xstrdup(cmd);
         args_size = (2 + extra_args) * sizeof(char *);
@@ -83,11 +96,11 @@ void repo_config(struct cgit_repo *repo, const char *name, const char *value)
                 repo->logo_link = xstrdup(value);
         else if (ctx.cfg.enable_filter_overrides) {
                 if (!strcmp(name, "about-filter"))
-                        repo->about_filter = new_filter(value, 0);
+                        repo->about_filter = new_filter(value, ABOUT);
                 else if (!strcmp(name, "commit-filter"))
-                        repo->commit_filter = new_filter(value, 0);
+                        repo->commit_filter = new_filter(value, COMMIT);
                 else if (!strcmp(name, "source-filter"))
-                        repo->source_filter = new_filter(value, 1);
+                        repo->source_filter = new_filter(value, SOURCE);
         }
 }
 
@@ -147,6 +160,8 @@ void config_cb(const char *name, const char *value)
                 ctx.cfg.enable_filter_overrides = atoi(value);
         else if (!strcmp(name, "enable-gitweb-owner"))
                 ctx.cfg.enable_gitweb_owner = atoi(value);
+        else if (!strcmp(name, "enable-http-clone"))
+                ctx.cfg.enable_http_clone = atoi(value);
         else if (!strcmp(name, "enable-index-links"))
                 ctx.cfg.enable_index_links = atoi(value);
         else if (!strcmp(name, "enable-commit-graph"))
@@ -178,9 +193,9 @@ void config_cb(const char *name, const char *value)
         else if (!strcmp(name, "cache-dynamic-ttl"))
                 ctx.cfg.cache_dynamic_ttl = atoi(value);
         else if (!strcmp(name, "about-filter"))
-                ctx.cfg.about_filter = new_filter(value, 0);
+                ctx.cfg.about_filter = new_filter(value, ABOUT);
         else if (!strcmp(name, "commit-filter"))
-                ctx.cfg.commit_filter = new_filter(value, 0);
+                ctx.cfg.commit_filter = new_filter(value, COMMIT);
         else if (!strcmp(name, "embedded"))
                 ctx.cfg.embedded = atoi(value);
         else if (!strcmp(name, "max-atom-items"))
@@ -210,7 +225,7 @@ void config_cb(const char *name, const char *value)
         else if (!strcmp(name, "section-from-path"))
                 ctx.cfg.section_from_path = atoi(value);
         else if (!strcmp(name, "source-filter"))
-                ctx.cfg.source_filter = new_filter(value, 1);
+                ctx.cfg.source_filter = new_filter(value, SOURCE);
         else if (!strcmp(name, "summary-log"))
                 ctx.cfg.summary_log = atoi(value);
         else if (!strcmp(name, "summary-branches"))
@@ -229,6 +244,8 @@ void config_cb(const char *name, const char *value)
                 ctx.cfg.robots = xstrdup(value);
         else if (!strcmp(name, "clone-prefix"))
                 ctx.cfg.clone_prefix = xstrdup(value);
+        else if (!strcmp(name, "clone-url"))
+                ctx.cfg.clone_url = xstrdup(value);
         else if (!strcmp(name, "local-time"))
                 ctx.cfg.local_time = atoi(value);
         else if (!prefixcmp(name, "mimetype."))
@@ -313,6 +330,7 @@ static void prepare_context(struct cgit_context *ctx)
         ctx->cfg.logo = "/cgit.png";
         ctx->cfg.local_time = 0;
         ctx->cfg.enable_gitweb_owner = 1;
+        ctx->cfg.enable_http_clone = 1;
         ctx->cfg.enable_tree_linenumbers = 1;
         ctx->cfg.max_repo_count = 50;
         ctx->cfg.max_commit_count = 50;
@@ -444,7 +462,7 @@ static int prepare_repo_cmd(struct cgit_context *ctx)
                 tmp = xstrdup(ctx->qry.head);
                 ctx->qry.head = ctx->repo->defbranch;
                 ctx->page.status = 404;
-                ctx->page.statusmsg = "not found";
+                ctx->page.statusmsg = "Not found";
                 cgit_print_http_headers(ctx);
                 cgit_print_docstart(ctx);
                 cgit_print_pageheader(ctx);
@@ -452,6 +470,7 @@ static int prepare_repo_cmd(struct cgit_context *ctx)
                 cgit_print_docend();
                 return 1;
         }
+        cgit_prepare_repo_env(ctx->repo);
         return 0;
 }
 
@@ -463,6 +482,8 @@ static void process_request(void *cbdata)
         cmd = cgit_get_cmd(ctx);
         if (!cmd) {
                 ctx->page.title = "cgit error";
+                ctx->page.status = 404;
+                ctx->page.statusmsg = "Not found";
                 cgit_print_http_headers(ctx);
                 cgit_print_docstart(ctx);
                 cgit_print_pageheader(ctx);
@@ -471,6 +492,11 @@ static void process_request(void *cbdata)
                 return;
         }
 
+        if (!ctx->cfg.enable_http_clone && cmd->is_clone) {
+                html_status(404, "Not found", 0);
+                return;
+        }
+
         /* If cmd->want_vpath is set, assume ctx->qry.path contains a "virtual"
          * in-project path limit to be made available at ctx->qry.vpath.
          * Otherwise, no path limit is in effect (ctx->qry.vpath = NULL).
diff --git a/cgit.css b/cgit.css
index 8f409c3..e06c261 100644
--- a/cgit.css
+++ b/cgit.css
@@ -1,4 +1,4 @@
-body, table, form {
+body, div#cgit table, div#cgit form {
         padding: 0em;
         margin: 0em;
 }
@@ -11,39 +11,40 @@ body {
         padding: 4px;
 }
 
-a {
+div#cgit a {
         color: blue;
         text-decoration: none;
 }
 
-a:hover {
+div#cgit a:hover {
         text-decoration: underline;
 }
 
-table {
+div#cgit table {
       border-collapse: collapse;
 }
 
-table#header {
+div#cgit table#header {
         width: 100%;
         margin-bottom: 1em;
 }
 
-table#header td.logo {
+div#cgit table#header td.logo {
         width: 96px;
+        vertical-align: top;
 }
 
-table#header td.main {
+div#cgit table#header td.main {
         font-size: 250%;
         padding-left: 10px;
         white-space: nowrap;
 }
 
-table#header td.main a {
+div#cgit table#header td.main a {
         color: #000;
 }
 
-table#header td.form {
+div#cgit table#header td.form {
         text-align: right;
         vertical-align: bottom;
         padding-right: 1em;
@@ -51,19 +52,19 @@ table#header td.form {
         white-space: nowrap;
 }
 
-table#header td.form form,
-table#header td.form input,
-table#header td.form select {
+div#cgit table#header td.form form,
+div#cgit table#header td.form input,
+div#cgit table#header td.form select {
         font-size: 90%;
 }
 
-table#header td.sub {
+div#cgit table#header td.sub {
         color: #777;
         border-top: solid 1px #ccc;
         padding-left: 10px;
 }
 
-table.tabs {
+div#cgit table.tabs {
         border-bottom: solid 3px #ccc;
         border-collapse: collapse;
         margin-top: 2em;
@@ -71,74 +72,74 @@ table.tabs {
         width: 100%;
 }
 
-table.tabs td {
+div#cgit table.tabs td {
         padding: 0px 1em;
         vertical-align: bottom;
 }
 
-table.tabs td a {
+div#cgit table.tabs td a {
         padding: 2px 0.75em;
         color: #777;
         font-size: 110%;
 }
 
-table.tabs td a.active {
+div#cgit table.tabs td a.active {
         color: #000;
         background-color: #ccc;
 }
 
-table.tabs td.form {
+div#cgit table.tabs td.form {
         text-align: right;
 }
 
-table.tabs td.form form {
+div#cgit table.tabs td.form form {
         padding-bottom: 2px;
         font-size: 90%;
         white-space: nowrap;
 }
 
-table.tabs td.form input,
-table.tabs td.form select {
+div#cgit table.tabs td.form input,
+div#cgit table.tabs td.form select {
         font-size: 90%;
 }
 
-div.path {
+div#cgit div.path {
         margin: 0px;
         padding: 5px 2em 2px 2em;
         color: #000;
         background-color: #eee;
 }
 
-div.content {
+div#cgit div.content {
         margin: 0px;
         padding: 2em;
         border-bottom: solid 3px #ccc;
 }
 
 
-table.list {
+div#cgit table.list {
         width: 100%;
         border: none;
         border-collapse: collapse;
 }
 
-table.list tr {
+div#cgit table.list tr {
         background: white;
 }
 
-table.list tr.logheader {
+div#cgit table.list tr.logheader {
         background: #eee;
 }
 
-table.list tr:hover {
+div#cgit table.list tr:hover {
         background: #eee;
 }
 
-table.list tr.nohover:hover {
+div#cgit table.list tr.nohover:hover {
         background: white;
 }
 
-table.list th {
+div#cgit table.list th {
         font-weight: bold;
         /* color: #888;
         border-top: dashed 1px #888;
@@ -148,93 +149,93 @@ table.list th {
         vertical-align: baseline;
 }
 
-table.list td {
+div#cgit table.list td {
         border: none;
         padding: 0.1em 0.5em 0.1em 0.5em;
 }
 
-table.list td.commitgraph {
+div#cgit table.list td.commitgraph {
         font-family: monospace;
         white-space: pre;
 }
 
-table.list td.commitgraph .column1 {
+div#cgit table.list td.commitgraph .column1 {
         color: #a00;
 }
 
-table.list td.commitgraph .column2 {
+div#cgit table.list td.commitgraph .column2 {
         color: #0a0;
 }
 
-table.list td.commitgraph .column3 {
+div#cgit table.list td.commitgraph .column3 {
         color: #aa0;
 }
 
-table.list td.commitgraph .column4 {
+div#cgit table.list td.commitgraph .column4 {
         color: #00a;
 }
 
-table.list td.commitgraph .column5 {
+div#cgit table.list td.commitgraph .column5 {
         color: #a0a;
 }
 
-table.list td.commitgraph .column6 {
+div#cgit table.list td.commitgraph .column6 {
         color: #0aa;
 }
 
-table.list td.logsubject {
+div#cgit table.list td.logsubject {
         font-family: monospace;
         font-weight: bold;
 }
 
-table.list td.logmsg {
+div#cgit table.list td.logmsg {
         font-family: monospace;
         white-space: pre;