Diffstat (limited to 'cache.c')
| -rw-r--r-- | cache.c | 90 |
1 files changed, 43 insertions, 47 deletions
@@ -29,7 +29,6 @@ struct cache_slot { cache_fill_fn fn; int cache_fd; int lock_fd; - int stdout_fd; const char *cache_name; const char *lock_name; int match; @@ -85,45 +84,40 @@ 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) { - off_t off; #ifdef HAVE_LINUX_SENDFILE - off_t size; -#endif - - off = slot->keylen + 1; + off_t start_off; + int ret; -#ifdef HAVE_LINUX_SENDFILE - size = slot->cache_st.st_size; + start_off = slot->keylen + 1; do { - ssize_t ret; - ret = sendfile(STDOUT_FILENO, slot->cache_fd, &off, size - off); + ret = sendfile(STDOUT_FILENO, slot->cache_fd, &start_off, + slot->cache_st.st_size - start_off); if (ret < 0) { if (errno == EAGAIN || errno == EINTR) continue; - /* Fall back to read/write on EINVAL or ENOSYS */ - if (errno == EINVAL || errno == ENOSYS) - break; return errno; } - if (off == size) - return 0; + return 0; } while (1); -#endif +#else + ssize_t i, j; - if (lseek(slot->cache_fd, off, SEEK_SET) != off) + i = lseek(slot->cache_fd, slot->keylen + 1, SEEK_SET); + if (i != slot->keylen + 1) return errno; do { - ssize_t ret; - ret = xread(slot->cache_fd, slot->buf, sizeof(slot->buf)); - if (ret < 0) - return errno; - if (ret == 0) - return 0; - if (write_in_full(STDOUT_FILENO, slot->buf, ret) < 0) - return errno; - } while (1); + 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 || j != i) + return errno; + else + return 0; +#endif } /* Check if the slot has expired */ @@ -185,8 +179,6 @@ static int lock_slot(struct cache_slot *slot) slot->lock_fd = -1; return saved_errno; } - if (ftruncate(slot->lock_fd, 0) < 0) - return errno; if (xwrite(slot->lock_fd, slot->key, slot->keylen + 1) < 0) return errno; return 0; @@ -205,13 +197,6 @@ static int unlock_slot(struct cache_slot *slot, int replace_old_slot) else err = unlink(slot->lock_name); - /* Restore stdout and close the temporary FD. */ - if (slot->stdout_fd >= 0) { - dup2(slot->stdout_fd, STDOUT_FILENO); - close(slot->stdout_fd); - slot->stdout_fd = -1; - } - if (err) return errno; @@ -223,24 +208,36 @@ static int unlock_slot(struct cache_slot *slot, int replace_old_slot) */ static int fill_slot(struct cache_slot *slot) { + int tmp; + /* Preserve stdout */ - slot->stdout_fd = dup(STDOUT_FILENO); - if (slot->stdout_fd == -1) + tmp = dup(STDOUT_FILENO); + if (tmp == -1) 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)) + /* update stat info */ + if (fstat(slot->lock_fd, &slot->cache_st)) { + close(tmp); return errno; + } - /* update stat info */ - if (fstat(slot->lock_fd, &slot->cache_st)) + /* Restore stdout */ + if (dup2(tmp, STDOUT_FILENO) == -1) { + close(tmp); + return errno; + } + + /* Close the temporary filedescriptor */ + if (close(tmp)) return errno; return 0; @@ -315,7 +312,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 believe + * the content without caching it and fool the caller to belive * everything worked out (but print a warning on stdout). */ @@ -390,7 +387,6 @@ int cache_process(int size, const char *path, const char *key, int ttl, strbuf_addstr(&lockname, ".lock"); slot.fn = fn; slot.ttl = ttl; - slot.stdout_fd = -1; slot.cache_name = filename.buf; slot.lock_name = lockname.buf; slot.key = key; @@ -408,12 +404,12 @@ int cache_process(int size, const char *path, const char *key, int ttl, static char *sprintftime(const char *format, time_t time) { static char buf[64]; - struct tm tm; + struct tm *tm; if (!time) return NULL; - gmtime_r(&time, &tm); - strftime(buf, sizeof(buf)-1, format, &tm); + tm = gmtime(&time); + strftime(buf, sizeof(buf)-1, format, tm); return buf; } |