Sources, by analogy with sinks

diff --git a/lib/sink.c b/lib/sink.c
index 152b7dceb0516fd0da82d02adfb35a8695557f42..0a3f701067272736fc42b62bd197a81a147025e1 100644 (file)
--- a/lib/sink.c
+++ b/lib/sink.c
@@ -227,6 +227,78 @@ struct sink *sink_socketio(struct socketio *sio) {
   return &s->s;
 }
 
+/* stdio source *************************************************************/
+
+/** @brief Source that reads from a socket handle */
+struct stdio_source {
+  /** @brief Base member */
+  struct source s;
+
+  FILE *fp;
+};
+
+static int source_stdio_getc(struct source *s) {
+  return getc(((struct stdio_source *)s)->fp);
+}
+
+static int source_stdio_error(struct source *s) {
+  FILE *fp = ((struct stdio_source *)s)->fp;
+  if(ferror(fp)) {
+#if _WIN32
+    return GetLastError();
+#else
+    return errno;
+#endif
+  }
+  return 0;
+}
+
+static int source_stdio_eof(struct source *s) {
+  FILE *fp = ((struct stdio_source *)s)->fp;
+  return feof(fp);
+}
+
+struct source *source_stdio(FILE *fp) {
+  struct stdio_source *ss = xmalloc(sizeof *ss);
+  ss->s.getch = source_stdio_getc;
+  ss->s.error = source_stdio_error;
+  ss->s.eof = source_stdio_eof;
+  ss->s.eclass = ec_errno;
+  ss->fp = fp;
+  return (struct source *)ss;
+}
+
+/* socket source ***********************************************************/
+
+/** @brief Source that reads from a socket handle */
+struct socket_source {
+  /** @brief Base member */
+  struct source s;
+
+  struct socketio *sio;
+};
+
+static int source_socketio_getc(struct source *s) {
+  return socketio_getc(((struct socket_source *)s)->sio);
+}
+
+static int source_socketio_error(struct source *s) {
+  return socketio_error(((struct socket_source *)s)->sio);
+}
+static int source_socketio_eof(struct source *s) {
+  return socketio_eof(((struct socket_source *)s)->sio);
+}
+
+struct source *source_socketio(struct socketio *sio) {
+  struct socket_source *ss = xmalloc(sizeof *ss);
+  ss->s.getch = source_socketio_getc;
+  ss->s.error = source_socketio_error;
+  ss->s.eof = source_socketio_eof;
+  ss->s.eclass = ec_native;
+  ss->sio = sio;
+  return (struct source *)ss;
+}
+
 /*
 Local Variables:
 c-basic-offset:2

diff --git a/lib/sink.h b/lib/sink.h
index ff763a69fe9e7e27526602e1517cb935ffa68b2d..fc99d6b7b6c1515b51eaf22867b1e301fb54bd42 100644 (file)
--- a/lib/sink.h
+++ b/lib/sink.h
@@ -115,6 +115,29 @@ static inline int sink_err(struct sink *s) {
   return s->error(s);
 }
 
+struct source {
+  int (*getch)(struct source *s);
+  int (*error)(struct source *s);
+  int (*eof)(struct source *s);
+
+  enum error_class eclass;
+};
+
+struct source *source_stdio(FILE *fp);
+struct source *source_socketio(struct socketio *sio);
+
+static inline int source_getc(struct source *s) {
+  return s->getch(s);
+}
+
+static inline int source_err(struct source *s) {
+  return s->error(s);
+}
+
+static inline int source_eof(struct source *s) {
+  return s->eof(s);
+}
+
 #endif /* SINK_H */
 
 /*