commit 3aca5731dd4bb590a453dd0ab82e31bdb9312916
from: Stefan Sperling <stsp@stsp.name>
date: Tue Apr 24 10:24:57 2018 UTC

prepare for blob privsep: use file descriptors instead of FILE

commit - 962916a2f679f34e4029f33cb57807adb4be3340
commit + 3aca5731dd4bb590a453dd0ab82e31bdb9312916
blob - 3d236f40ffaa89bf6170f1a07863ce6d3c07a755
blob + dc418dad98c66632b60d29c230ae1d355aedd1a8
--- lib/object.c
+++ lib/object.c
@@ -1016,31 +1016,11 @@ got_object_tree_close(struct got_tree_object *tree)
 }
 
 static const struct got_error *
-open_loose_blob(FILE **outfile, int fd)
+read_blob_object(int outfd, int infd)
 {
-	const struct got_error *err = NULL;
-	FILE *infile = NULL;
 	size_t size;
 
-	infile = fdopen(fd, "rb");
-	if (infile == NULL) {
-		err = got_error_from_errno();
-		/* fd will be closed by caller */
-		goto done;
-	}
-
-	*outfile = got_opentemp();
-	if (*outfile == NULL) {
-		err = got_error_from_errno();
-		fclose(infile);
-		goto done;
-	}
-
-	err = got_inflate_to_file(&size, infile, *outfile);
-done:
-	if (infile)
-		fclose(infile);
-	return err;
+	return got_inflate_to_fd(&size, infd, outfd);
 }
 
 const struct got_error *
@@ -1069,16 +1049,31 @@ got_object_blob_open(struct got_blob_object **blob,
 		if (err)
 			goto done;
 	} else {
-		int fd;
+		int infd, outfd;
 
-		err = open_loose_object(&fd, obj, repo);
+		err = open_loose_object(&infd, obj, repo);
 		if (err)
 			goto done;
 
-		err = open_loose_blob(&(*blob)->f, fd);
-		close(fd);
+
+		outfd = got_opentempfd();
+		if (outfd == -1) {
+			err = got_error_from_errno();
+			close(infd);
+			goto done;
+		}
+
+		err = read_blob_object(outfd, infd);
+		close(infd);
 		if (err)
 			goto done;
+
+		(*blob)->f = fdopen(outfd, "rb");
+		if ((*blob)->f == NULL) {
+			err = got_error_from_errno();
+			close(outfd);
+			goto done;
+		}
 	}
 
 	(*blob)->hdrlen = obj->hdrlen;