38 files changed, 1379 insertions, 1117 deletions

diff --git a/.gitignore b/.gitignore
index aa36ff7..1e016e5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ cgit
 cgit.conf
 VERSION
 *.o
+*.d
diff --git a/Makefile b/Makefile
index 8bf47f2..931c60e 100644
--- a/Makefile
+++ b/Makefile
@@ -12,13 +12,62 @@ GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2
 #
 -include cgit.conf
 
+#
+# Define a way to invoke make in subdirs quietly, shamelessly ripped
+# from git.git
+#
+QUIET_SUBDIR0  = +$(MAKE) -C # space to separate -C and subdir
+QUIET_SUBDIR1  =
 
-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-tree.o ui-commit.o ui-diff.o \
-        ui-snapshot.o ui-blob.o ui-tag.o ui-refs.o ui-patch.o
+ifneq ($(findstring $(MAKEFLAGS),w),w)
+PRINT_DIR = --no-print-directory
+else # "make -w"
+NO_SUBDIR = :
+endif
+
+ifndef V
+        QUIET_CC       = @echo '   ' CC $@;
+        QUIET_MM       = @echo '   ' MM $@;
+        QUIET_SUBDIR0  = +@subdir=
+        QUIET_SUBDIR1  = ;$(NO_SUBDIR) echo '   ' SUBDIR $$subdir; \
+                         $(MAKE) $(PRINT_DIR) -C $$subdir
+endif
+
+#
+# Define a pattern rule for automatic dependency building
+#
+%.d: %.c
+        $(QUIET_MM)$(CC) $(CFLAGS) -MM $< | sed -e 's/\($*\)\.o:/\1.o $@:/g' >$@
+
+#
+# Define a pattern rule for silent object building
+#
+%.o: %.c
+        $(QUIET_CC)$(CC) -o $*.o -c $(CFLAGS) $<
 
 
+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-blob.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
+
 ifdef NEEDS_LIBICONV
         EXTLIBS += -liconv
 endif
@@ -41,21 +90,25 @@ CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"'
 CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"'
 
 
-cgit: cgit.c $(OBJECTS)
-        $(CC) $(CFLAGS) cgit.c -o cgit $(OBJECTS) $(EXTLIBS)
+cgit: $(OBJECTS)
+        $(QUIET_CC)$(CC) $(CFLAGS) -o cgit $(OBJECTS) $(EXTLIBS)
+
+$(OBJECTS): git/xdiff/lib.a git/libgit.a
+
+cgit.o: VERSION
 
-$(OBJECTS): cgit.h git/xdiff/lib.a git/libgit.a VERSION
+-include $(OBJECTS:.o=.d)
 
 git/xdiff/lib.a: | git
 
 git/libgit.a: | git
 
 git:
-        cd git && $(MAKE) xdiff/lib.a
-        cd git && $(MAKE) libgit.a
+        $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) xdiff/lib.a
+        $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) libgit.a
 
 test: all
-        $(MAKE) -C tests
+        $(QUIET_SUBDIR0)tests $(QUIET_SUBDIR1) all
 
 install: all
         mkdir -p $(DESTDIR)$(CGIT_SCRIPT_PATH)
@@ -69,7 +122,7 @@ uninstall:
         rm -f $(CGIT_SCRIPT_PATH)/cgit.png
 
 clean:
-        rm -f cgit VERSION *.o
+        rm -f cgit VERSION *.o *.d
         cd git && $(MAKE) clean
 
 distclean: clean
diff --git a/cache.c b/cache.c
index 372e38d..89f7ecd 100644
--- a/cache.c
+++ b/cache.c
@@ -7,6 +7,7 @@
  */
 
 #include "cgit.h"
+#include "cache.h"
 
 const int NOLOCK = -1;
 
@@ -44,23 +45,23 @@ int cache_create_dirs()
 {
         char *path;
 
-        path = fmt("%s", cgit_cache_root);
+        path = fmt("%s", ctx.cfg.cache_root);
         if (mkdir(path, S_IRWXU) && errno!=EEXIST)
                 return 0;
 
-        if (!cgit_repo)
+        if (!ctx.repo)
                 return 0;
 
-        path = fmt("%s/%s", cgit_cache_root,
-                   cache_safe_filename(cgit_repo->url));
+        path = fmt("%s/%s", ctx.cfg.cache_root,
+                   cache_safe_filename(ctx.repo->url));
 
         if (mkdir(path, S_IRWXU) && errno!=EEXIST)
                 return 0;
 
-        if (cgit_query_page) {
-                path = fmt("%s/%s/%s", cgit_cache_root,
-                           cache_safe_filename(cgit_repo->url),
-                           cgit_query_page);
+        if (ctx.qry.page) {
+                path = fmt("%s/%s/%s", ctx.cfg.cache_root,
+                           cache_safe_filename(ctx.repo->url),
+                           ctx.qry.page);
                 if (mkdir(path, S_IRWXU) && errno!=EEXIST)
                         return 0;
         }
@@ -74,7 +75,7 @@ int cache_refill_overdue(const char *lockfile)
         if (stat(lockfile, &st))
                 return 0;
         else
-                return (time(NULL) - st.st_mtime > cgit_cache_max_create_time);
+                return (time(NULL) - st.st_mtime > ctx.cfg.cache_max_create_time);
 }
 
 int cache_lock(struct cacheitem *item)
@@ -83,7 +84,7 @@ int cache_lock(struct cacheitem *item)
         char *lockfile = xstrdup(fmt("%s.lock", item->name));
 
  top:
-        if (++i > cgit_max_lock_attempts)
+        if (++i > ctx.cfg.max_lock_attempts)
                 die("cache_lock: unable to lock %s: %s",
                     item->name, strerror(errno));
 
diff --git a/cache.h b/cache.h
new file mode 100644
index 0000000..4dcbea3
--- /dev/null
+++ b/cache.h
@@ -0,0 +1,23 @@
+/*
+ * Since git has it's own cache.h which we include,
+ * lets test on CGIT_CACHE_H to avoid confusion
+ */
+
+#ifndef CGIT_CACHE_H
+#define CGIT_CACHE_H
+
+struct cacheitem {
+        char *name;
+        struct stat st;
+        int ttl;
+        int fd;
+};
+
+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);
+
+#endif /* CGIT_CACHE_H */
diff --git a/cgit.c b/cgit.c
index e8acc03..6ec763f 100644
--- a/cgit.c
+++ b/cgit.c
@@ -7,40 +7,199 @@
  */
 
 #include "cgit.h"
+#include "cache.h"
+#include "cmd.h"
+#include "configfile.h"
+#include "html.h"
+#include "ui-shared.h"
+
+const char *cgit_version = CGIT_VERSION;
+
+void config_cb(const char *name, const char *value)
+{
+        if (!strcmp(name, "root-title"))
+                ctx.cfg.root_title = xstrdup(value);
+        else if (!strcmp(name, "css"))
+                ctx.cfg.css = xstrdup(value);
+        else if (!strcmp(name, "logo"))
+                ctx.cfg.logo = xstrdup(value);
+        else if (!strcmp(name, "index-header"))
+                ctx.cfg.index_header = xstrdup(value);
+        else if (!strcmp(name, "index-info"))
+                ctx.cfg.index_info = xstrdup(value);
+        else if (!strcmp(name, "logo-link"))
+                ctx.cfg.logo_link = xstrdup(value);
+        else if (!strcmp(name, "module-link"))
+                ctx.cfg.module_link = xstrdup(value);
+        else if (!strcmp(name, "virtual-root")) {
+                ctx.cfg.virtual_root = trim_end(value, '/');
+                if (!ctx.cfg.virtual_root && (!strcmp(value, "/")))
+                        ctx.cfg.virtual_root = "";
+        } else if (!strcmp(name, "nocache"))
+                ctx.cfg.nocache = atoi(value);
+        else if (!strcmp(name, "snapshots"))
+                ctx.cfg.snapshots = cgit_parse_snapshots_mask(value);
+        else if (!strcmp(name, "enable-index-links"))
+                ctx.cfg.enable_index_links = atoi(value);
+        else if (!strcmp(name, "enable-log-filecount"))
+                ctx.cfg.enable_log_filecount = atoi(value);
+        else if (!strcmp(name, "enable-log-linecount"))
+                ctx.cfg.enable_log_linecount = atoi(value);
+        else if (!strcmp(name, "cache-root"))
+                ctx.cfg.cache_root = xstrdup(value);
+        else if (!strcmp(name, "cache-root-ttl"))
+                ctx.cfg.cache_root_ttl = atoi(value);
+        else if (!strcmp(name, "cache-repo-ttl"))
+                ctx.cfg.cache_repo_ttl = atoi(value);
+        else if (!strcmp(name, "cache-static-ttl"))
+                ctx.cfg.cache_static_ttl = atoi(value);
+        else if (!strcmp(name, "cache-dynamic-ttl"))
+                ctx.cfg.cache_dynamic_ttl = atoi(value);
+        else if (!strcmp(name, "max-message-length"))
+                ctx.cfg.max_msg_len = atoi(value);
+        else if (!strcmp(name, "max-repodesc-length"))
+                ctx.cfg.max_repodesc_len = atoi(value);
+        else if (!strcmp(name, "max-commit-count"))
+                ctx.cfg.max_commit_count = atoi(value);
+        else if (!strcmp(name, "summary-log"))
+                ctx.cfg.summary_log = atoi(value);
+        else if (!strcmp(name, "summary-branches"))
+                ctx.cfg.summary_branches = atoi(value);
+        else if (!strcmp(name, "summary-tags"))
+                ctx.cfg.summary_tags = atoi(value);
+        else if (!strcmp(name, "agefile"))
+                ctx.cfg.agefile = xstrdup(value);
+        else if (!strcmp(name, "renamelimit"))
+                ctx.cfg.renamelimit = atoi(value);
+        else if (!strcmp(name, "robots"))
+                ctx.cfg.robots = xstrdup(value);
+        else if (!strcmp(name, "clone-prefix"))
+                ctx.cfg.clone_prefix = xstrdup(value);
+        else if (!strcmp(name, "repo.group"))
+                ctx.cfg.repo_group = xstrdup(value);
+        else if (!strcmp(name, "repo.url"))
+                ctx.repo = cgit_add_repo(value);
+        else if (!strcmp(name, "repo.name"))
+                ctx.repo->name = xstrdup(value);
+        else if (ctx.repo && !strcmp(name, "repo.path"))
+                ctx.repo->path = trim_end(value, '/');
+        else if (ctx.repo && !strcmp(name, "repo.clone-url"))
+                ctx.repo->clone_url = xstrdup(value);
+        else if (ctx.repo && !strcmp(name, "repo.desc"))
+                ctx.repo->desc = xstrdup(value);
+        else if (ctx.repo && !strcmp(name, "repo.owner"))
+                ctx.repo->owner = xstrdup(value);
+        else if (ctx.repo && !strcmp(name, "repo.defbranch"))
+                ctx.repo->defbranch = xstrdup(value);
+        else if (ctx.repo && !strcmp(name, "repo.snapshots"))
+                ctx.repo->snapshots = ctx.cfg.snapshots & cgit_parse_snapshots_mask(value); /* XXX: &? */
+        else if (ctx.repo && !strcmp(name, "repo.enable-log-filecount"))
+                ctx.repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value);
+        else if (ctx.repo && !strcmp(name, "repo.enable-log-linecount"))
+                ctx.repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value);
+        else if (ctx.repo && !strcmp(name, "repo.module-link"))