Rename config.c to parsing.c + move cgit_parse_query from cgit.c to parsing.c

[ps-cgit] / cgit.c
diff --git a/cgit.c b/cgit.c

index 808ffe98199ec38bdc5d705b559cab615b8e47a0..5567859c0e01f310c960de8c119526ff1ba5ceb5 100644 (file)
--- a/cgit.c
+++ b/cgit.c
@@ -8,14 +8,16 @@
  
  #include "cgit.h"
  
-static const char cgit_doctype[] =
+const char cgit_version[] = CGIT_VERSION;
+
+const char cgit_doctype[] =
  "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\"\n"
  "  \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n";
  
-static const char cgit_error[] =
+const char cgit_error[] =
  "<div class='error'>%s</div>";
  
-static const char cgit_lib_error[] =
+const char cgit_lib_error[] =
  "<div class='error'>%s: %s</div>";
  
  int htmlfd = 0;
@@ -29,6 +31,7 @@ char *cgit_virtual_root = NULL;
  
  char *cgit_cache_root   = "/var/cache/cgit";
  
+int cgit_max_lock_attempts     =  5;
  int cgit_cache_root_ttl        =  5;
  int cgit_cache_repo_ttl        =  5;
  int cgit_cache_dynamic_ttl     =  5;
@@ -50,32 +53,6 @@ char *cgit_query_sha1   = NULL;
  
  struct cacheitem cacheitem;
  
-int cgit_parse_query(char *txt, configfn fn)
-{
-       char *t, *value = NULL, c;
-
-       if (!txt)
-               return 0;
-
-       t = txt = xstrdup(txt);
- 
-       while((c=*t) != '\0') {
-               if (c=='=') {
-                       *t = '\0';
-                       value = t+1;
-               } else if (c=='&') {
-                       *t = '\0';
-                       (*fn)(txt, value);
-                       txt = t+1;
-                       value = NULL;
-               }
-               t++;
-       }
-       if (t!=txt)
-               (*fn)(txt, value);
-       return 0;
-}
-
  void cgit_global_config_cb(const char *name, const char *value)
  {
         if (!strcmp(name, "root"))
@@ -200,6 +177,7 @@ static void cgit_print_docstart(char *title)
         html("<title>");
         html_txt(title);
         html("</title>\n");
+       htmlf("<meta name='generator' content='cgit v%s'/>\n", cgit_version);
         html("<link rel='stylesheet' type='text/css' href='");
         html_attr(cgit_css);
         html("'/>\n");
@@ -462,20 +440,26 @@ static void cgit_fill_cache(struct cacheitem *item)
  
  static void cgit_refresh_cache(struct cacheitem *item)
  {
+       int i = 0;
+
+       cache_prepare(item);
   top:
-       if (!cache_lookup(item)) {
-               if (cache_lock(item)) {
-                       cgit_fill_cache(item);
-                       cache_unlock(item);
-               } else {
-                       sched_yield();
+       if (++i > cgit_max_lock_attempts) {
+               die("cgit_refresh_cache: unable to lock %s: %s",
+                   item->name, strerror(errno));
+       }
+       if (!cache_exist(item)) {
+               if (!cache_lock(item)) {
+                       sleep(1);
                         goto top;
                 }
-       } else if (cache_expired(item)) {
-               if (cache_lock(item)) {
+               if (!cache_exist(item))
                         cgit_fill_cache(item);
-                       cache_unlock(item);
-               }
+               cache_unlock(item);
+       } else if (cache_expired(item) && cache_lock(item)) {
+               if (cache_expired(item))
+                       cgit_fill_cache(item);
+               cache_unlock(item);
         }
  }