3 files changed, 16 insertions, 11 deletions

diff --git a/cache.c b/cache.c
index b034c48..0ffa502 100644
--- a/cache.c
+++ b/cache.c
@@ -1,44 +1,48 @@
 /* cache.c: cache management
  *
  * Copyright (C) 2006 Lars Hjemli
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
  */
 
 #include "cgit.h"
 
 const int NOLOCK = -1;
 
-int cache_lookup(struct cacheitem *item)
+void cache_prepare(struct cacheitem *item)
 {
         if (!cgit_query_repo) {
                 item->name = xstrdup(fmt("%s/index.html", cgit_cache_root));
                 item->ttl = cgit_cache_root_ttl;
         } else if (!cgit_query_page) {
                 item->name = xstrdup(fmt("%s/%s/index.html", cgit_cache_root, 
                            cgit_query_repo));
                 item->ttl = cgit_cache_repo_ttl;
         } else {
                 item->name = xstrdup(fmt("%s/%s/%s/%s.html", cgit_cache_root, 
                            cgit_query_repo, cgit_query_page, 
                            cgit_querystring));
                 if (cgit_query_has_symref)
                         item->ttl = cgit_cache_dynamic_ttl;
                 else if (cgit_query_has_sha1)
                         item->ttl = cgit_cache_static_ttl;
                 else
                         item->ttl = cgit_cache_repo_ttl;
         }
+}
+
+int cache_exist(struct cacheitem *item)
+{
         if (stat(item->name, &item->st)) {
                 item->st.st_mtime = 0;
                 return 0;
         }
         return 1;
 }
 
 int cache_create_dirs()
 {
         char *path;
 
         if (!cgit_query_repo)
diff --git a/cgit.c b/cgit.c
index 110face..7f14016 100644
--- a/cgit.c
+++ b/cgit.c
@@ -456,38 +456,38 @@ static void cgit_print_repo_page()
 static void cgit_fill_cache(struct cacheitem *item)
 {
         htmlfd = item->fd;
         item->st.st_mtime = time(NULL);
         if (cgit_query_repo)
                 cgit_print_repo_page();
         else
                 cgit_print_repolist();
 }
 
 static void cgit_refresh_cache(struct cacheitem *item)
 {
+        cache_prepare(item);
  top:
-        if (!cache_lookup(item)) {
-                if (cache_lock(item)) {
-                        cgit_fill_cache(item);
-                        cache_unlock(item);
-                } else {
+        if (!cache_exist(item)) {
+                if (!cache_lock(item)) {
                         sched_yield();
                         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);
         }
 }
 
 static void cgit_print_cache(struct cacheitem *item)
 {
         static char buf[4096];
         ssize_t i;
 
         int fd = open(item->name, O_RDONLY);
         if (fd<0)
                 die("Unable to open cached file %s", item->name);
 
diff --git a/cgit.h b/cgit.h
index 1e084d4..3b0994a 100644
--- a/cgit.h
+++ b/cgit.h
@@ -47,18 +47,19 @@ extern int htmlfd;
 extern char *fmt(const char *format,...);
 
 extern void html(const char *txt);
 extern void htmlf(const char *format,...);
 extern void html_txt(char *txt);
 extern void html_attr(char *txt);
 extern void html_link_open(char *url, char *title, char *class);
 extern void html_link_close(void);
 
 
 extern int cgit_read_config(const char *filename, configfn fn);
 
-extern int cache_lookup(struct cacheitem *item);
+extern void cache_prepare(struct cacheitem *item);
 extern int cache_lock(struct cacheitem *item);
 extern int cache_unlock(struct cacheitem *item);
+extern int cache_exist(struct cacheitem *item);
 extern int cache_expired(struct cacheitem *item);
 
 #endif /* CGIT_H */