t7004: factor out gpg setup

diff --git a/streaming.c b/streaming.c
index 565f000790b482a8977a36ca9a9cfcbd633f056d..71072e1b1da670cdb4b048a3a6e83a4ae806bf5f 100644 (file)
--- a/streaming.c
+++ b/streaming.c
@@ -60,12 +60,13 @@ struct filtered_istream {
        char obuf[FILTER_BUFFER];
        int i_end, i_ptr;
        int o_end, o_ptr;
+       int input_finished;
 };
 
 struct git_istream {
        const struct stream_vtbl *vtbl;
        unsigned long size; /* inflated size of full object */
-       z_stream z;
+       git_zstream z;
        enum { z_unused, z_used, z_done, z_error } z_state;
 
        union {
@@ -93,7 +94,9 @@ struct git_istream {
 
 int close_istream(struct git_istream *st)
 {
-       return st->vtbl->close(st);
+       int r = st->vtbl->close(st);
+       free(st);
+       return r;
 }
 
 ssize_t read_istream(struct git_istream *st, char *buf, size_t sz)
@@ -215,12 +218,30 @@ static read_method_decl(filtered)
                        fs->o_end = FILTER_BUFFER - to_receive;
                        continue;
                }
+
+               /* tell the filter to drain upon no more input */
+               if (fs->input_finished) {
+                       size_t to_receive = FILTER_BUFFER;
+                       if (stream_filter(fs->filter,
+                                         NULL, NULL,
+                                         fs->obuf, &to_receive))
+                               return -1;
+                       fs->o_end = FILTER_BUFFER - to_receive;
+                       if (!fs->o_end)
+                               break;
+                       continue;
+               }
                fs->i_end = fs->i_ptr = 0;
 
                /* refill the input from the upstream */
-               fs->i_end = read_istream(fs->upstream, fs->ibuf, FILTER_BUFFER);
-               if (fs->i_end <= 0)
-                       break;
+               if (!fs->input_finished) {
+                       fs->i_end = read_istream(fs->upstream, fs->ibuf, FILTER_BUFFER);
+                       if (fs->i_end < 0)
+                               break;
+                       if (fs->i_end)
+                               continue;
+               }
+               fs->input_finished = 1;
        }
        return filled;
 }
@@ -241,6 +262,7 @@ static struct git_istream *attach_stream_filter(struct git_istream *st,
        fs->filter = filter;
        fs->i_end = fs->i_ptr = 0;
        fs->o_end = fs->o_ptr = 0;
+       fs->input_finished = 0;
        ifs->size = -1; /* unknown */
        return ifs;
 }