6 files changed, 31 insertions, 17 deletions

diff --git a/cgit.c b/cgit.c
index bfde9f9..08cb5d2 100644
--- a/cgit.c
+++ b/cgit.c
@@ -166,4 +166,6 @@ void config_cb(const char *name, const char *value)
         else if (!strcmp(name, "max-repodesc-length"))
                 ctx.cfg.max_repodesc_len = atoi(value);
+        else if (!strcmp(name, "max-blob-size"))
+                ctx.cfg.max_blob_size = atoi(value);
         else if (!strcmp(name, "max-repo-count"))
                 ctx.cfg.max_repo_count = atoi(value);
@@ -271,4 +273,5 @@ static void prepare_context(struct cgit_context *ctx)
         ctx->cfg.max_msg_len = 80;
         ctx->cfg.max_repodesc_len = 80;
+        ctx->cfg.max_blob_size = 0;
         ctx->cfg.max_stats = 0;
         ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s";
diff --git a/cgit.css b/cgit.css
index c47ebc9..ef7d3c1 100644
--- a/cgit.css
+++ b/cgit.css
@@ -163,4 +163,9 @@ table.list td a {
 }
 
+table.list td a.ls-dir {
+        font-weight: bold;
+        color: #00f;
+}
+
 table.list td a:hover {
         color: #00f;
diff --git a/cgit.h b/cgit.h
index 6c6c460..39853df 100644
--- a/cgit.h
+++ b/cgit.h
@@ -186,4 +186,5 @@ struct cgit_config {
         int max_msg_len;
         int max_repodesc_len;
+        int max_blob_size;
         int max_stats;
         int nocache;
diff --git a/cgitrc.5.txt b/cgitrc.5.txt
index 0c13485..e69140b 100644
--- a/cgitrc.5.txt
+++ b/cgitrc.5.txt
@@ -178,4 +178,8 @@ max-repodesc-length::
         on the repository index page. Default value: "80".
 
+max-blob-size::
+        Specifies the maximum size of a blob to display HTML for in KBytes.
+        Default value: "0" (limit disabled).
+
 max-stats::
         Set the default maximum statistics period. Valid values are "week",
diff --git a/filters/syntax-highlighting.sh b/filters/syntax-highlighting.sh
index 999ad0c..6b1c576 100755
--- a/filters/syntax-highlighting.sh
+++ b/filters/syntax-highlighting.sh
@@ -4,4 +4,8 @@
 # filter options in cgitrc.
 #
+# This script requires a shell supporting the ${var##pattern} syntax.
+# It is supported by at least dash and bash, however busybox environments
+# might have to use an external call to sed instead.
+#
 # Note: the highlight command (http://www.andre-simon.de/) uses css for syntax
 # highlighting, so you'll probably want something like the following included
@@ -21,19 +25,10 @@
 # table.blob .kwd  { color:#010181; }
 
-case "$1" in
-        *.c)
-                highlight -f -I -X -S c
-                ;;
-        *.h)
-                highlight -f -I -X -S c
-                ;;
-        *.sh)
-                highlight -f -I -X -S sh
-                ;;
-        *.css)
-                highlight -f -I -X -S css
-                ;;
-        *)
-                highlight -f -I -X -S txt
-                ;;
-esac
+# store filename and extension in local vars
+BASENAME="$1"
+EXTENSION="${BASENAME##*.}"
+
+# map Makefile and Makefile.* to .mk
+[ "${BASENAME%%.*}" == "Makefile" ] && EXTENSION=mk
+
+exec highlight --force -f -I -X -S $EXTENSION 2>/dev/null
diff --git a/ui-tree.c b/ui-tree.c
index f53ab64..f281937 100644
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -108,4 +108,10 @@ static void print_object(const unsigned char *sha1, char *path, const char *base
         htmlf(")<br/>blob: %s\n", sha1_to_hex(sha1));
 
+        if (ctx.cfg.max_blob_size && size / 1024 > ctx.cfg.max_blob_size) {
+                htmlf("<div class='error'>blob size (%dKB) exceeds display size limit (%dKB).</div>",
+                                size / 1024, ctx.cfg.max_blob_size);
+                return;
+        }
+
         if (buffer_is_binary(buf, size))
                 print_binary_buffer(buf, size);