sha1_file: allow sha1_file_name to handle arbitrary repositories

diff --git a/streaming.c b/streaming.c
index 9afa66b8be6c3b5481e4542c033bfebdb2abbfda..22d27df55ebb0926967c1b1afe027d6c112820ae 100644 (file)
--- a/streaming.c
+++ b/streaming.c
@@ -3,6 +3,9 @@
  */
 #include "cache.h"
 #include "streaming.h"
+#include "repository.h"
+#include "object-store.h"
+#include "packfile.h"
 
 enum input_source {
        stream_error = -1,
@@ -334,7 +337,8 @@ static struct stream_vtbl loose_vtbl = {
 
 static open_method_decl(loose)
 {
-       st->u.loose.mapped = map_sha1_file(sha1, &st->u.loose.mapsize);
+       st->u.loose.mapped = map_sha1_file(the_repository,
+                                          sha1, &st->u.loose.mapsize);
        if (!st->u.loose.mapped)
                return -1;
        if ((unpack_sha1_header(&st->z,
@@ -539,7 +543,7 @@ int stream_blob_to_fd(int fd, const struct object_id *oid, struct stream_filter
                        kept = 0;
                wrote = write_in_full(fd, buf, readlen);
 
-               if (wrote != readlen)
+               if (wrote < 0)
                        goto close_and_exit;
        }
        if (kept && (lseek(fd, kept - 1, SEEK_CUR) == (off_t) -1 ||