Merge branch 'lh/cleanup'

* lh/cleanup: (21 commits)
  Reset ctx.repo to NULL when the config parser is finished
  Move cgit_parse_query() from parsing.c to html.c as http_parse_querystring()
  Move function for configfile parsing into configfile.[ch]
  Add cache.h
  Remove global and obsolete cgit_cmd
  Makefile: copy the QUIET constructs from the Makefile in git.git
  Move cgit_version from shared.c to cgit.c
  Makefile: autobuild dependency rules
  Initial Makefile cleanup
  Move non-generic functions from shared.c to cgit.c
  Add ui-shared.h
  Add separate header-files for each page/view
  Refactor snapshot support
  Add command dispatcher
  Remove obsolete cacheitem parameter to ui-functions
  Add struct cgit_page to cgit_context
  Introduce html.h
  Improve initialization of git directory
  Move cgit_repo into cgit_context
  Add all config variables into struct cgit_context
  ...

1 files changed, 11 insertions, 10 deletions

@@ -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));