cache.c: make all io-related functions return errno on error

We'll need proper return-values from these functions to make the cache
behave correctly (which includes giving proper error messages).

Noticed-by: Jim Meyering <jim@meyering.net>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>

1 files changed, 22 insertions, 7 deletions

diff --git a/cache.c b/cache.c
index add647e..6847202 100644
--- a/cache.c
+++ b/cache.c
@@ -65,14 +65,18 @@ static int open_slot(struct cache_slot *slot)
 	return 0;
 }
 
 /* Close the active cache slot */
-static void close_slot(struct cache_slot *slot)
+static int close_slot(struct cache_slot *slot)
 {
+	int err = 0;
 	if (slot->cache_fd > 0) {
-		close(slot->cache_fd);
+		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)
@@ -115,14 +119,18 @@ static int is_modified(struct cache_slot *slot)
 		st.st_size != slot->cache_st.st_size);
 }
 
 /* Close an open lockfile */
-static void close_lock(struct cache_slot *slot)
+static int close_lock(struct cache_slot *slot)
 {
+	int err = 0;
 	if (slot->lock_fd > 0) {
-		close(slot->lock_fd);
+		if (close(slot->lock_fd))
+			err = errno;
+		else
 		slot->lock_fd = -1;
 	}
+	return err;
 }
 
 /* Create a lockfile used to store the generated content for a cache
  * slot, and write the slot key + \0 into it.
@@ -133,9 +141,10 @@ 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;
-	write(slot->lock_fd, slot->key, slot->keylen + 1);
+	if (write(slot->lock_fd, slot->key, slot->keylen + 1) < 0)
+		return errno;
 	return 0;
 }
 
 /* Release the current lockfile. If `replace_old_slot` is set the
@@ -149,9 +158,13 @@ static int unlock_slot(struct cache_slot *slot, int replace_old_slot)
 	if (replace_old_slot)
 		err = rename(slot->lock_name, slot->cache_name);
 	else
 		err = unlink(slot->lock_name);
-	return err;
+
+	if (err)
+		return errno;
+
+	return 0;
 }
 
 /* Generate the content for the current cache slot by redirecting
  * stdout to the lock-fd and invoking the callback function
@@ -176,9 +189,11 @@ static int fill_slot(struct cache_slot *slot)
 	if (dup2(tmp, STDOUT_FILENO) == -1)
 		return errno;
 
 	/* Close the temporary filedescriptor */
-	close(tmp);
+	if (close(tmp))
+		return errno;
+
 	return 0;
 }
 
 /* Crude implementation of 32-bit FNV-1 hash algorithm,