ui-shared: rename parameter to cgit_print_snapshot_links()

[cgit.git] / cache.c

diff --git a/cache.c b/cache.c
index cd998127cc23e361cd9f53d9d988754fa5faa93d..0901e6e0111ef98b8133bfeb149245e4f0526c6d 100644 (file)
--- a/cache.c
+++ b/cache.c
@@ -13,18 +13,18 @@
  *
  */
 
-#ifdef HAVE_LINUX_SENDFILE
-#include <sys/sendfile.h>
-#endif
 #include "cgit.h"
 #include "cache.h"
 #include "html.h"
+#ifdef HAVE_LINUX_SENDFILE
+#include <sys/sendfile.h>
+#endif
 
 #define CACHE_BUFSIZE (1024 * 4)
 
 struct cache_slot {
        const char *key;
-       int keylen;
+       size_t keylen;
        int ttl;
        cache_fill_fn fn;
        int cache_fd;
@@ -44,7 +44,7 @@ struct cache_slot {
 static int open_slot(struct cache_slot *slot)
 {
        char *bufz;
-       int bufkeylen = -1;
+       ssize_t bufkeylen = -1;
 
        slot->cache_fd = open(slot->cache_name, O_RDONLY);
        if (slot->cache_fd == -1)
@@ -61,8 +61,9 @@ static int open_slot(struct cache_slot *slot)
        if (bufz)
                bufkeylen = bufz - slot->buf;
 
-       slot->match = bufkeylen == slot->keylen &&
-           !memcmp(slot->key, slot->buf, bufkeylen + 1);
+       if (slot->key)
+               slot->match = bufkeylen == slot->keylen &&
+                   !memcmp(slot->key, slot->buf, bufkeylen + 1);
 
        return 0;
 }
@@ -215,19 +216,31 @@ static int fill_slot(struct cache_slot *slot)
                return errno;
 
        /* Redirect stdout to lockfile */
-       if (dup2(slot->lock_fd, STDOUT_FILENO) == -1)
+       if (dup2(slot->lock_fd, STDOUT_FILENO) == -1) {
+               close(tmp);
                return errno;
+       }
 
        /* Generate cache content */
        slot->fn();
 
+       /* Make sure any buffered data is flushed to the file */
+       if (fflush(stdout)) {
+               close(tmp);
+               return errno;
+       }
+
        /* update stat info */
-       if (fstat(slot->lock_fd, &slot->cache_st))
+       if (fstat(slot->lock_fd, &slot->cache_st)) {
+               close(tmp);
                return errno;
+       }
 
        /* Restore stdout */
-       if (dup2(tmp, STDOUT_FILENO) == -1)
+       if (dup2(tmp, STDOUT_FILENO) == -1) {
+               close(tmp);
                return errno;
+       }
 
        /* Close the temporary filedescriptor */
        if (close(tmp))
@@ -305,7 +318,7 @@ static int process_slot(struct cache_slot *slot)
        /* If the cache slot does not exist (or its key doesn't match the
         * current key), lets try to create a new cache slot for this
         * request. If this fails (for whatever reason), lets just generate
-        * the content without caching it and fool the caller to belive
+        * the content without caching it and fool the caller to believe
         * everything worked out (but print a warning on stdout).
         */