Use GIT-1.7.3

[cgit.git] / cache.c

diff --git a/cache.c b/cache.c
index aa97ae19aad496fcf134d46b5e57c431389a39e2..d7a8d5a913c72930a6c208246f7a8fea3300fe02 100644 (file)
--- a/cache.c
+++ b/cache.c
@@ -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)
 {
-       ssize_t i;
+       ssize_t i, j;
 
        i = lseek(slot->cache_fd, slot->keylen + 1, SEEK_SET);
        if (i != slot->keylen + 1)
                return errno;
 
-       while((i = xread(slot->cache_fd, slot->buf, sizeof(slot->buf))) > 0)
-               i = xwrite(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 (i < 0)
+       if (i < 0 || j != i)
                return errno;
        else
                return 0;
@@ -413,11 +416,11 @@ int cache_ls(const char *path)
                                  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),
-                      slot.cache_st.st_size,
+                      (uintmax_t)slot.cache_st.st_size,
                       slot.buf);
                close_slot(&slot);
        }