cache.c: make all io-related functions return errno on error

[ps-cgit] / cache.c

diff --git a/cache.c b/cache.c
index e590d7b52ad1ad5a3d23e92c90c6d425d52e8190..68472029e2e314f7d0f11f0f07c37fb6d0565deb 100644 (file)
--- a/cache.c
+++ b/cache.c
@@ -52,7 +52,7 @@ static int open_slot(struct cache_slot *slot)
                return errno;
 
        slot->bufsize = read(slot->cache_fd, slot->buf, sizeof(slot->buf));
-       if (slot->bufsize == 0)
+       if (slot->bufsize < 0)
                return errno;
 
        bufz = memchr(slot->buf, 0, slot->bufsize);
@@ -66,12 +66,16 @@ static int open_slot(struct cache_slot *slot)
 }
 
 /* Close the active cache slot */
-static void close_slot(struct cache_slot *slot)
+static int close_slot(struct cache_slot *slot)
 {
+       int err = 0;
        if (slot->cache_fd > 0) {
-               close(slot->cache_fd);
-               slot->cache_fd = -1;
+               if (close(slot->cache_fd))
+                       err = errno;
+               else
+                       slot->cache_fd = -1;
        }
+       return err;
 }
 
 /* Print the content of the active cache slot (but skip the key). */
@@ -116,12 +120,16 @@ static int is_modified(struct cache_slot *slot)
 }
 
 /* Close an open lockfile */
-static void close_lock(struct cache_slot *slot)
+static int close_lock(struct cache_slot *slot)
 {
+       int err = 0;
        if (slot->lock_fd > 0) {
-               close(slot->lock_fd);
-               slot->lock_fd = -1;
+               if (close(slot->lock_fd))
+                       err = errno;
+               else
+                       slot->lock_fd = -1;
        }
+       return err;
 }
 
 /* Create a lockfile used to store the generated content for a cache
@@ -134,7 +142,8 @@ static int lock_slot(struct cache_slot *slot)
                             S_IRUSR|S_IWUSR);
        if (slot->lock_fd == -1)
                return errno;
-       write(slot->lock_fd, slot->key, slot->keylen + 1);
+       if (write(slot->lock_fd, slot->key, slot->keylen + 1) < 0)
+               return errno;
        return 0;
 }
 
@@ -150,7 +159,11 @@ static int unlock_slot(struct cache_slot *slot, int replace_old_slot)
                err = rename(slot->lock_name, slot->cache_name);
        else
                err = unlink(slot->lock_name);
-       return err;
+
+       if (err)
+               return errno;
+
+       return 0;
 }
 
 /* Generate the content for the current cache slot by redirecting
@@ -177,7 +190,9 @@ static int fill_slot(struct cache_slot *slot)
                return errno;
 
        /* Close the temporary filedescriptor */
-       close(tmp);
+       if (close(tmp))
+               return errno;
+
        return 0;
 }
 
@@ -332,6 +347,74 @@ int cache_process(int size, const char *path, const char *key, int ttl,
        return process_slot(&slot);
 }
 
+/* Return a strftime formatted date/time
+ * NB: the result from this function is to shared memory
+ */
+char *sprintftime(const char *format, time_t time)
+{
+       static char buf[64];
+       struct tm *tm;
+
+       if (!time)
+               return NULL;
+       tm = gmtime(&time);
+       strftime(buf, sizeof(buf)-1, format, tm);
+       return buf;
+}
+
+int cache_ls(const char *path)
+{
+       DIR *dir;
+       struct dirent *ent;
+       int err = 0;
+       struct cache_slot slot;
+       char fullname[1024];
+       char *name;
+
+       if (!path) {
+               cache_log("[cgit] cache path not specified\n");
+               return -1;
+       }
+       if (strlen(path) > 1024 - 10) {
+               cache_log("[cgit] cache path too long: %s\n",
+                         path);
+               return -1;
+       }
+       dir = opendir(path);
+       if (!dir) {
+               err = errno;
+               cache_log("[cgit] unable to open path %s: %s (%d)\n",
+                         path, strerror(err), err);
+               return err;
+       }
+       strcpy(fullname, path);
+       name = fullname + strlen(path);
+       if (*(name - 1) != '/') {
+               *name++ = '/';
+               *name = '\0';
+       }
+       slot.cache_name = fullname;
+       while((ent = readdir(dir)) != NULL) {
+               if (strlen(ent->d_name) != 8)
+                       continue;
+               strcpy(name, ent->d_name);
+               if ((err = open_slot(&slot)) != 0) {
+                       cache_log("[cgit] unable to open path %s: %s (%d)\n",
+                                 fullname, strerror(err), err);
+                       continue;
+               }
+               printf("%s %s %10lld %s\n",
+                      name,
+                      sprintftime("%Y-%m-%d %H:%M:%S",
+                                  slot.cache_st.st_mtime),
+                      slot.cache_st.st_size,
+                      slot.buf);
+               close_slot(&slot);
+       }
+       closedir(dir);
+       return 0;
+}
+
 /* Print a message to stdout */
 void cache_log(const char *format, ...)
 {