Merge branch 'master' of git.distorted.org.uk:~mdw/publish/public-git/disorder

[disorder] / lib / sink.c

diff --git a/lib/sink.c b/lib/sink.c
index 7a74640e585c5f55d2a17c6829ac172c4b8ed8df..0a3f701067272736fc42b62bd197a81a147025e1 100644 (file)
--- a/lib/sink.c
+++ b/lib/sink.c
@@ -1,6 +1,6 @@
 /*
  * This file is part of DisOrder
- * Copyright (C) 2004, 2007, 2008 Richard Kettlewell
+ * Copyright (C) 2004, 2007-9, 2013 Richard Kettlewell
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -26,8 +26,9 @@
 
 #include "mem.h"
 #include "vector.h"
-#include "sink.h"
+#include "socketio.h"
 #include "log.h"
+#include "sink.h"
 #include "printf.h"
 
 /** @brief Formatted output to a sink
@@ -55,6 +56,14 @@ int sink_printf(struct sink *s, const char *fmt, ...) {
   return n;
 }
 
+static int sink_generic_flush(struct sink attribute((unused)) *s) {
+  return 0;
+}
+
+static int sink_generic_error(struct sink attribute((unused)) *s) {
+  return 0;
+}
+
 /* stdio sink *****************************************************************/
 
 /** @brief Sink that writes to a stdio @c FILE */
@@ -67,6 +76,8 @@ struct stdio_sink {
 
   /** @brief Stream to write to */
   FILE *fp;
+
+  int error;
 };
 
 /** @brief Reinterpret a @ref sink as a @ref stdio_sink */
@@ -76,6 +87,7 @@ struct stdio_sink {
 static int sink_stdio_write(struct sink *s, const void *buffer, int nbytes) {
   int n = fwrite(buffer, 1, nbytes, S(s)->fp);
   if(n < nbytes) {
+    S(s)->error = errno;
     if(S(s)->name)
       disorder_fatal(errno, "error writing to %s", S(s)->name);
     else
@@ -84,6 +96,10 @@ static int sink_stdio_write(struct sink *s, const void *buffer, int nbytes) {
   return n;
 }
 
+static int sink_stdio_error(struct sink *s) {
+  return S(s)->error;
+}
+
 /** @brief Create a sink that writes to a stdio stream
  * @param name Filename for use in error messages
  * @param fp Stream to write to
@@ -93,6 +109,9 @@ struct sink *sink_stdio(const char *name, FILE *fp) {
   struct stdio_sink *s = xmalloc(sizeof *s);
 
   s->s.write = sink_stdio_write;
+  s->s.flush = sink_generic_flush;
+  s->s.error = sink_stdio_error;
+  s->s.eclass = ec_errno;
   s->name = name;
   s->fp = fp;
   return (struct sink *)s;
@@ -122,6 +141,9 @@ struct sink *sink_dynstr(struct dynstr *output) {
   struct dynstr_sink *s = xmalloc(sizeof *s);
 
   s->s.write = sink_dynstr_write;
+  s->s.flush = sink_generic_flush;
+  s->s.error = sink_generic_error;
+  s->s.eclass = ec_errno;
   s->d = output;
   return (struct sink *)s;
 }
@@ -139,6 +161,9 @@ struct sink *sink_discard(void) {
   struct sink *s = xmalloc(sizeof *s);
 
   s->write = sink_discard_write;
+  s->flush = sink_generic_flush;
+  s->error = sink_generic_error;
+  s->eclass = ec_errno;
   return s;
 }
 
@@ -155,9 +180,125 @@ struct sink *sink_error(void) {
   struct sink *s = xmalloc(sizeof *s);
 
   s->write = sink_error_write;
+  s->flush = sink_generic_flush;
+  s->error = sink_generic_error;
+  s->eclass = ec_errno;
   return s;
 }
 
+/* socket sink *************************************************************/
+
+/** @brief Sink that writes to a socket handle */
+struct socketio_sink {
+  /** @brief Base member */
+  struct sink s;
+
+  struct socketio *sio;
+};
+
+static int sink_socketio_flush(struct sink *s) {
+  struct socketio_sink *ss = (struct socketio_sink *)s;
+  return socketio_flush(ss->sio);
+}
+
+/** @brief Write callback for @ref stdio_sink */
+static int sink_socketio_write(struct sink *s, const void *buffer, int nbytes) {
+  struct socketio_sink *ss = (struct socketio_sink *)s;
+  return socketio_write(ss->sio, buffer, nbytes);
+}
+
+static int sink_socketio_error(struct sink *s) {
+  struct socketio_sink *ss = (struct socketio_sink *)s;
+  return socketio_error(ss->sio);
+}
+
+/** @brief Create a sink that writes to a socket
+ * @param sio Socket IO context
+ * @return Pointer to new sink
+ */
+struct sink *sink_socketio(struct socketio *sio) {
+  struct socketio_sink *s = xmalloc(sizeof *s);
+
+  s->s.write = sink_socketio_write;
+  s->s.flush = sink_socketio_flush;
+  s->s.error = sink_socketio_error;
+  s->s.eclass = ec_native;
+  s->sio = 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