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>

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
@@ -42,25 +42,25 @@ struct cache_slot {
 static int open_slot(struct cache_slot *slot)
 {
 	char *bufz;
 	int bufkeylen = -1;
 
 	slot->cache_fd = open(slot->cache_name, O_RDONLY);
 	if (slot->cache_fd == -1)
 		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;
 
 	bufz = memchr(slot->buf, 0, slot->bufsize);
 	if (bufz)
 		bufkeylen = bufz - slot->buf;
 
 	slot->match = bufkeylen == slot->keylen &&
 	    !memcmp(slot->key, slot->buf, bufkeylen + 1);
 
 	return 0;
 }
@@ -72,34 +72,34 @@ static int close_slot(struct cache_slot *slot)
 	if (slot->cache_fd > 0) {
 		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). */
 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;
 }
 
 /* Check if the slot has expired */
 static int is_expired(struct cache_slot *slot)
 {
 	if (slot->ttl < 0)
 		return 0;
 	else
 		return slot->cache_st.st_mtime + slot->ttl*60 < time(NULL);
@@ -133,25 +133,25 @@ static int close_lock(struct cache_slot *slot)
 }
 
 /* Create a lockfile used to store the generated content for a cache
  * slot, and write the slot key + \0 into it.
  * Returns 0 on success and errno otherwise.
  */
 static int lock_slot(struct cache_slot *slot)
 {
 	slot->lock_fd = open(slot->lock_name, O_RDWR|O_CREAT|O_EXCL,
 			     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;
 }
 
 /* Release the current lockfile. If `replace_old_slot` is set the
  * lockfile replaces the old cache slot, otherwise the lockfile is
  * just deleted.
  */
 static int unlock_slot(struct cache_slot *slot, int replace_old_slot)
 {
 	int err;