From 805da46670c88e5a47caee5125acbdc69a2d6aea Mon Sep 17 00:00:00 2001
From: John Cupitt <jcupitt@gmail.com>
Date: Fri, 1 Nov 2019 12:57:48 +0000
Subject: [PATCH] more buffered input tweaking

---
 libvips/include/vips/stream.h | 6 ++++++
 libvips/iofuncs/streami.c     | 8 +++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/libvips/include/vips/stream.h b/libvips/include/vips/stream.h
index 92416bbf..fafe5046 100644
--- a/libvips/include/vips/stream.h
+++ b/libvips/include/vips/stream.h
@@ -242,6 +242,8 @@ gint64 vips_streami_size( VipsStreami *streami );
 typedef struct _VipsStreamib {
 	VipsStreami parent_object;
 
+	/*< private >*/
+
 	/* The +1 means there's always a \0 byte at the end.
 	 */
 	char input_buffer[VIPS_STREAMIB_BUFFER_SIZE + 1];
@@ -249,6 +251,10 @@ typedef struct _VipsStreamib {
 	char *read_point;
 	int bytes_remaining;
 
+	/* No seeks on buffered streams, so an EOF flag is easy.
+	 */
+	gboolean eof;
+
 } VipsStreamib;
 
 typedef struct _VipsStreamibClass {
diff --git a/libvips/iofuncs/streami.c b/libvips/iofuncs/streami.c
index 274297b6..b0238cfc 100644
--- a/libvips/iofuncs/streami.c
+++ b/libvips/iofuncs/streami.c
@@ -1114,7 +1114,8 @@ vips_streamib_refill( VipsStreamib *streamib )
 	 */
 	streamib->read_postion[bytes_read] = '\0';
 
-	how do we siganl EOF?
+	if( bytes_read == 0 )
+		streamib->eof = TRUE;
 
 	return( 0 );
 }
@@ -1192,8 +1193,13 @@ vips_streamib_get_line( VipsStreamib *streamib, const char **line )
 			 */
 			if( vips_streamib_refill( streamib ) )
 				return( -1 );
+
+			if( streamib->eof )
+				break;
 		}
 	}
+
+	return( 0 );
 }
 
 /**