Allow relative paths for cgit_cache_root

Make sure we chdir(2) back to the original getcwd(2) when a page
has been generated. Also, if the cgit_cache_root do not exist,
try to create it.

This is a feature intended to ease testing/debugging.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>

2 files changed, 8 insertions, 0 deletions

diff --git a/cache.c b/cache.c
index 39e63a5..91b89a6 100644
--- a/cache.c
+++ b/cache.c
@@ -36,24 +36,28 @@ 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;
 
+        path = fmt("%s", cgit_cache_root);
+        if (mkdir(path, S_IRWXU) && errno!=EEXIST)
+                return 0;
+
         if (!cgit_query_repo)
                 return 0;
 
         path = fmt("%s/%s", cgit_cache_root, cgit_query_repo);
         if (mkdir(path, S_IRWXU) && errno!=EEXIST)
                 return 0;
 
         if (cgit_query_page) {
                 path = fmt("%s/%s/%s", cgit_cache_root, cgit_query_repo, 
                            cgit_query_page);
                 if (mkdir(path, S_IRWXU) && errno!=EEXIST)
                         return 0;
diff --git a/cgit.c b/cgit.c
index 9dbc608..372b436 100644
--- a/cgit.c
+++ b/cgit.c
@@ -33,30 +33,34 @@ static void cgit_print_repo_page(struct cacheitem *item)
         } else if (!strcmp(cgit_query_page, "tree")) {
                 cgit_print_tree(cgit_query_sha1);
         } else if (!strcmp(cgit_query_page, "commit")) {
                 cgit_print_commit(cgit_query_sha1);
         } else if (!strcmp(cgit_query_page, "view")) {
                 cgit_print_view(cgit_query_sha1);
         }
         cgit_print_docend();
 }
 
 static void cgit_fill_cache(struct cacheitem *item)
 {
+        static char buf[PATH_MAX];
+
+        getcwd(buf, sizeof(buf));
         htmlfd = item->fd;
         item->st.st_mtime = time(NULL);
         if (cgit_query_repo)
                 cgit_print_repo_page(item);
         else
                 cgit_print_repolist(item);
+        chdir(buf);
 }
 
 static void cgit_check_cache(struct cacheitem *item)
 {
         int i = 0;
 
         cache_prepare(item);
  top:
         if (++i > cgit_max_lock_attempts) {
                 die("cgit_refresh_cache: unable to lock %s: %s",
                     item->name, strerror(errno));
         }