1 files changed, 4 insertions, 0 deletions

diff --git a/cgit.c b/cgit.c
index 9dbc608..372b436 100644
--- a/cgit.c
+++ b/cgit.c
@@ -13,70 +13,74 @@ const char cgit_version[] = CGIT_VERSION;
 static void cgit_print_repo_page(struct cacheitem *item)
 {
         if (chdir(fmt("%s/%s", cgit_root, cgit_query_repo)) || 
             cgit_read_config("info/cgit", cgit_repo_config_cb)) {
                 char *title = fmt("%s - %s", cgit_root_title, "Bad request");
                 cgit_print_docstart(title, item);
                 cgit_print_pageheader(title);
                 cgit_print_error(fmt("Unable to scan repository: %s",
                                      strerror(errno)));
                 cgit_print_docend();
                 return;
         }
         setenv("GIT_DIR", fmt("%s/%s", cgit_root, cgit_query_repo), 1);
         char *title = fmt("%s - %s", cgit_repo_name, cgit_repo_desc);
         cgit_print_docstart(title, item);
         cgit_print_pageheader(title);
         if (!cgit_query_page) {
                 cgit_print_summary();
         } else if (!strcmp(cgit_query_page, "log")) {
                 cgit_print_log(cgit_query_head, cgit_query_ofs, 100);
         } 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));
         }
         if (!cache_exist(item)) {
                 if (!cache_lock(item)) {
                         sleep(1);
                         goto top;
                 }
                 if (!cache_exist(item)) {
                         cgit_fill_cache(item);
                         cache_unlock(item);
                 } else {
                         cache_cancel_lock(item);
                 }
         } else if (cache_expired(item) && cache_lock(item)) {
                 if (cache_expired(item)) {
                         cgit_fill_cache(item);
                         cache_unlock(item);
                 } else {
                         cache_cancel_lock(item);
                 }
         }
 }