ui-shared: use common function in print_rel_date()

[cgit.git] / cache.c

diff --git a/cache.c b/cache.c
index 801e63fd9d40c1525de5c18ca5adf61b5adbd220..57c891864ffb8b70447c6db5fd8366f662aadd39 100644 (file)
--- a/cache.c
+++ b/cache.c
@@ -13,12 +13,12 @@
  *
  */
 
-#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)
 
@@ -161,10 +161,23 @@ static int close_lock(struct cache_slot *slot)
  */
 static int lock_slot(struct cache_slot *slot)
 {
-       slot->lock_fd = open(slot->lock_name, O_RDWR | O_CREAT | O_EXCL,
+       struct flock lock = {
+               .l_type = F_WRLCK,
+               .l_whence = SEEK_SET,
+               .l_start = 0,
+               .l_len = 0,
+       };
+
+       slot->lock_fd = open(slot->lock_name, O_RDWR | O_CREAT,
                             S_IRUSR | S_IWUSR);
        if (slot->lock_fd == -1)
                return errno;
+       if (fcntl(slot->lock_fd, F_SETLK, &lock) < 0) {
+               int saved_errno = errno;
+               close(slot->lock_fd);
+               slot->lock_fd = -1;
+               return saved_errno;
+       }
        if (xwrite(slot->lock_fd, slot->key, slot->keylen + 1) < 0)
                return errno;
        return 0;
@@ -398,7 +411,7 @@ int cache_ls(const char *path)
        DIR *dir;
        struct dirent *ent;
        int err = 0;
-       struct cache_slot slot = { 0 };
+       struct cache_slot slot = { NULL };
        struct strbuf fullname = STRBUF_INIT;
        size_t prefixlen;