diff options
| author | Lars Hjemli <hjemli@gmail.com> | 2008-05-18 23:26:05 +0200 |
|---|---|---|
| committer | Lars Hjemli <hjemli@gmail.com> | 2008-05-18 23:34:55 +0200 |
| commit | cdc6b2f8e7a8d43dcfe0475a9d3498333ea686b8 (patch) | |
| tree | 021c4ef2e82de11ffb27e19ea4e5b7d60f7e0a20 | |
| parent | cache.c: make all io-related functions return errno on error (diff) | |
| download | cgit-pink-cdc6b2f8e7a8d43dcfe0475a9d3498333ea686b8.tar.gz cgit-pink-cdc6b2f8e7a8d43dcfe0475a9d3498333ea686b8.zip | |
cache.c: use xread()/xwrite() from libgit
These functions handles EINTR/EAGAIN errors during read/write operations, which is something cache.c didn't. While at it, fix a bug in print_slot() where errors during reading from the cache slot might go by unnoticed. Noticed-by: Jim Meyering <jim@meyering.net> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| -rw-r--r-- | cache.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cache.c b/cache.c index 6847202..a996109 100644 --- 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; - 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; @@ -81,16 +81,16 @@ 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, j = 0; + ssize_t i; 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); + while((i = xread(slot->cache_fd, slot->buf, sizeof(slot->buf))) > 0) + i = xwrite(STDOUT_FILENO, slot->buf, i); - if (j < 0) + if (i < 0) return errno; else return 0; @@ -142,7 +142,7 @@ static int lock_slot(struct cache_slot *slot) 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; } |