X-Git-Url: http://git.imager.perl.org/imager.git/blobdiff_plain/0778adbf7b008e7a3230bab32fc70d5ead0ed2b6..c7b3be1bae27251214b66cdd1dc09507dc2a6a1a:/iolayert.h

diff --git a/iolayert.h b/iolayert.h
index d56de92b..8d19451c 100644
--- a/iolayert.h
+++ b/iolayert.h
@@ -5,6 +5,8 @@
 #include <unistd.h>
 #endif
 #include <sys/types.h>
+#include <stddef.h>
+#include <stdio.h>
 
 typedef enum { FDSEEK, FDNOSEEK, BUFFER, CBSEEK, CBNOSEEK, BUFCHAIN } io_type;
 
@@ -22,7 +24,7 @@ typedef i_io_glue_t io_glue;
 typedef ssize_t(*i_io_readp_t) (io_glue *ig, void *buf, size_t count);
 typedef ssize_t(*i_io_writep_t)(io_glue *ig, const void *buf, size_t count);
 typedef off_t  (*i_io_seekp_t) (io_glue *ig, off_t offset, int whence);
-typedef void   (*i_io_closep_t)(io_glue *ig);
+typedef int    (*i_io_closep_t)(io_glue *ig);
 typedef ssize_t(*i_io_sizep_t) (io_glue *ig);
 
 typedef void   (*i_io_closebufp_t)(void *p);
@@ -34,7 +36,7 @@ typedef void (*i_io_destroyp_t)(i_io_glue_t *ig);
 typedef ssize_t(*i_io_readl_t) (void *p, void *buf, size_t count);
 typedef ssize_t(*i_io_writel_t)(void *p, const void *buf, size_t count);
 typedef off_t  (*i_io_seekl_t) (void *p, off_t offset, int whence);
-typedef void   (*i_io_closel_t)(void *p);
+typedef int    (*i_io_closel_t)(void *p);
 typedef void   (*i_io_destroyl_t)(void *p);
 typedef ssize_t(*i_io_sizel_t) (void *p);
 
@@ -44,55 +46,65 @@ extern char *io_type_names[];
 
 /* Structures to describe data sources */
 
-typedef struct {
-  io_type	type;
-  int		fd;
-} io_fdseek;
-
-typedef struct {
-  io_type	type;		/* Must be first parameter */
-  char		*name;		/* Data source name */
-  char		*data;
-  size_t	len;
-  i_io_closebufp_t     closecb;        /* free memory mapped segment or decrement refcount */
-  void          *closedata;
-} io_buffer;
-
-typedef struct {
-  io_type	type;		/* Must be first parameter */
-  char		*name;		/* Data source name */
-  void		*p;		/* Callback data */
-  i_io_readl_t	readcb;
-  i_io_writel_t	writecb;
-  i_io_seekl_t	seekcb;
-  i_io_closel_t closecb;
-  i_io_destroyl_t      destroycb;
-} io_cb;
-
-typedef union {
-  io_type       type;
-  io_fdseek     fdseek;
-  io_buffer	buffer;
-  io_cb		cb;
-} io_obj;
-
 struct i_io_glue_t {
-  io_obj	source;
-  int		flags;		/* Flags */
-  void		*exdata;	/* Pair specific data */
+  io_type type;
+  void *exdata;
   i_io_readp_t	readcb;
   i_io_writep_t	writecb;
   i_io_seekp_t	seekcb;
   i_io_closep_t	closecb;
   i_io_sizep_t	sizecb;
   i_io_destroyp_t destroycb;
+  unsigned char *buffer;
+  unsigned char *read_ptr;
+  unsigned char *read_end;
+  unsigned char *write_ptr;
+  unsigned char *write_end;
+  size_t buf_size;
+
+  /* non-zero if we encountered EOF */
+  int buf_eof;
+
+  /* non-zero if we've seen an error */
+  int error;
+
+  /* if non-zero we do write buffering (enabled by default) */
+  int buffered;
+
+  im_context_t context;
 };
 
-#define i_io_type(ig) ((ig)->source.ig_type)
-#define i_io_read(ig, buf, size) ((ig)->readcb((ig), (buf), (size)))
-#define i_io_write(ig, data, size) ((ig)->writecb((ig), (data), (size)))
-#define i_io_seek(ig, offset, whence) ((ig)->seekcb((ig), (offset), (whence)))
-#define i_io_close(ig) ((ig)->closecb(ig))
+#define I_IO_DUMP_CALLBACKS 1
+#define I_IO_DUMP_BUFFER 2
+#define I_IO_DUMP_STATUS 4
+#define I_IO_DUMP_DEFAULT (I_IO_DUMP_BUFFER | I_IO_DUMP_STATUS)
 
+#define i_io_type(ig) ((ig)->source.ig_type)
+#define i_io_raw_read(ig, buf, size) ((ig)->readcb((ig), (buf), (size)))
+#define i_io_raw_write(ig, data, size) ((ig)->writecb((ig), (data), (size)))
+#define i_io_raw_seek(ig, offset, whence) ((ig)->seekcb((ig), (offset), (whence)))
+#define i_io_raw_close(ig) ((ig)->closecb(ig))
+#define i_io_is_buffered(ig) ((int)((ig)->buffered))
+
+#define i_io_getc(ig) \
+  ((ig)->read_ptr < (ig)->read_end ? \
+     *((ig)->read_ptr++) : \
+     i_io_getc_imp(ig))
+#define i_io_nextc(ig) \
+  ((void)((ig)->read_ptr < (ig)->read_end ?	\
+	  ((ig)->read_ptr++, 0) :		\
+	  i_io_getc_imp(ig)))
+#define i_io_peekc(ig) \
+  ((ig)->read_ptr < (ig)->read_end ? \
+   *((ig)->read_ptr) :		     \
+     i_io_peekc_imp(ig))
+#define i_io_putc(ig, c) \
+  ((ig)->write_ptr < (ig)->write_end && !(ig)->error ?	\
+    *(ig)->write_ptr++ = (c) :	       \
+      i_io_putc_imp(ig, (c)))
+#define i_io_eof(ig) \
+  ((ig)->read_ptr == (ig)->read_end && (ig)->buf_eof)
+#define i_io_error(ig) \
+  ((ig)->read_ptr == (ig)->read_end && (ig)->error)
 
 #endif