CGIT 0.8.2

[cgit.git] / cache.c

diff --git a/cache.c b/cache.c
index 68472029e2e314f7d0f11f0f07c37fb6d0565deb..d7a8d5a913c72930a6c208246f7a8fea3300fe02 100644 (file)
--- a/cache.c
+++ b/cache.c
@@ -51,7 +51,7 @@ static int open_slot(struct cache_slot *slot)
        if (fstat(slot->cache_fd, &slot->cache_st))
                return errno;
 
        if (fstat(slot->cache_fd, &slot->cache_st))
                return errno;
 

-       slot->bufsize = read(slot->cache_fd, slot->buf, sizeof(slot->buf));
+       slot->bufsize = xread(slot->cache_fd, slot->buf, sizeof(slot->buf));

        if (slot->bufsize < 0)
                return errno;
 
        if (slot->bufsize < 0)
                return errno;
 


@@ -81,16 +81,19 @@ static int close_slot(struct cache_slot *slot)
 /* Print the content of the active cache slot (but skip the key). */
 static int print_slot(struct cache_slot *slot)
 {
 /* Print the content of the active cache slot (but skip the key). */
 static int print_slot(struct cache_slot *slot)
 {

-       ssize_t i, j = 0;
+       ssize_t i, j;

 
        i = lseek(slot->cache_fd, slot->keylen + 1, SEEK_SET);
        if (i != slot->keylen + 1)
                return errno;
 
 
        i = lseek(slot->cache_fd, slot->keylen + 1, SEEK_SET);
        if (i != slot->keylen + 1)
                return errno;
 

-       while((i=read(slot->cache_fd, slot->buf, sizeof(slot->buf))) > 0)
-               j = write(STDOUT_FILENO, slot->buf, i);
+       do {
+               i = j = xread(slot->cache_fd, slot->buf, sizeof(slot->buf));
+               if (i > 0)
+                       j = xwrite(STDOUT_FILENO, slot->buf, i);
+       } while (i > 0 && j == i);

 
 

-       if (j < 0)
+       if (i < 0 || j != i)

                return errno;
        else
                return 0;
                return errno;
        else
                return 0;


@@ -142,7 +145,7 @@ static int lock_slot(struct cache_slot *slot)
                             S_IRUSR|S_IWUSR);
        if (slot->lock_fd == -1)
                return errno;
                             S_IRUSR|S_IWUSR);
        if (slot->lock_fd == -1)
                return errno;

-       if (write(slot->lock_fd, slot->key, slot->keylen + 1) < 0)
+       if (xwrite(slot->lock_fd, slot->key, slot->keylen + 1) < 0)

                return errno;
        return 0;
 }
                return errno;
        return 0;
 }


@@ -252,9 +255,14 @@ static int process_slot(struct cache_slot *slot)
                                }
                        }
                }
                                }
                        }
                }

-               print_slot(slot);
+               if ((err = print_slot(slot)) != 0) {
+                       cache_log("[cgit] error printing cache %s: %s (%d)\n",
+                                 slot->cache_name,
+                                 strerror(err),
+                                 err);
+               }

                close_slot(slot);
                close_slot(slot);

-               return 0;
+               return err;

        }
 
        /* If the cache slot does not exist (or its key doesn't match the
        }
 
        /* If the cache slot does not exist (or its key doesn't match the


@@ -289,7 +297,12 @@ static int process_slot(struct cache_slot *slot)
        // the lock file.
        slot->cache_fd = slot->lock_fd;
        unlock_slot(slot, 1);
        // the lock file.
        slot->cache_fd = slot->lock_fd;
        unlock_slot(slot, 1);

-       err = print_slot(slot);
+       if ((err = print_slot(slot)) != 0) {
+               cache_log("[cgit] error printing cache %s: %s (%d)\n",
+                         slot->cache_name,
+                         strerror(err),
+                         err);
+       }

        close_slot(slot);
        return err;
 }
        close_slot(slot);
        return err;
 }


@@ -403,11 +416,11 @@ int cache_ls(const char *path)
                                  fullname, strerror(err), err);
                        continue;
                }
                                  fullname, strerror(err), err);
                        continue;
                }

-               printf("%s %s %10lld %s\n",
+               printf("%s %s %10"PRIuMAX" %s\n",

                       name,
                       sprintftime("%Y-%m-%d %H:%M:%S",
                                   slot.cache_st.st_mtime),
                       name,
                       sprintftime("%Y-%m-%d %H:%M:%S",
                                   slot.cache_st.st_mtime),

-                      slot.cache_st.st_size,
+                      (uintmax_t)slot.cache_st.st_size,

                       slot.buf);
                close_slot(&slot);
        }
                       slot.buf);
                close_slot(&slot);
        }