New module 'memory-ostream': Output stream that accumulates the output in

memory.

diff --git a/gnulib-local/lib/memory-ostream.oo.c b/gnulib-local/lib/memory-ostream.oo.c
new file mode 100644 (file)
index 0000000..d9a6c0e
--- /dev/null
+++ b/gnulib-local/lib/memory-ostream.oo.c
@@ -0,0 +1,103 @@
+/* Output stream that accumulates the output in memory.
+   Copyright (C) 2006 Free Software Foundation, Inc.
+   Written by Bruno Haible <bruno@clisp.org>, 2006.
+
+   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
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+#include <config.h>
+
+/* Specification.  */
+#include "memory-ostream.h"
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "error.h"
+#include "exit.h"
+#include "xalloc.h"
+#include "xsize.h"
+#include "gettext.h"
+
+#define _(str) gettext (str)
+
+struct memory_ostream : struct ostream
+{
+fields:
+  char *buffer;                        /* Buffer containing the accumulated output.  */
+  size_t buflen;               /* Number of bytes stored so far.  */
+  size_t allocated;            /* Allocated size of the buffer.  */
+};
+
+/* Implementation of ostream_t methods.  */
+
+static void
+memory_ostream::write_mem (memory_ostream_t stream,
+                          const void *data, size_t len)
+{
+  if (len > 0)
+    {
+      if (len > stream->allocated - stream->buflen)
+       {
+         size_t new_allocated =
+           xmax (xsum (stream->buflen, len),
+                 xsum (stream->allocated, stream->allocated));
+         if (size_overflow_p (new_allocated))
+           error (EXIT_FAILURE, 0,
+                  _("%s: too much output, buffer size overflow"),
+                  "memory_ostream");
+         stream->buffer = (char *) xrealloc (stream->buffer, new_allocated);
+         stream->allocated = new_allocated;
+       }
+      memcpy (stream->buffer + stream->buflen, data, len);
+      stream->buflen += len;
+    }
+}
+
+static void
+memory_ostream::flush (memory_ostream_t stream)
+{
+}
+
+static void
+memory_ostream::free (memory_ostream_t stream)
+{
+  free (stream->buffer);
+  free (stream);
+}
+
+/* Implementation of memory_ostream_t methods.  */
+
+void
+memory_ostream::contents (memory_ostream_t stream,
+                         const void **bufp, size_t *buflenp)
+{
+  *bufp = stream->buffer;
+  *buflenp = stream->buflen;
+}
+
+/* Constructor.  */
+
+memory_ostream_t
+memory_ostream_create (void)
+{
+  memory_ostream_t stream = XMALLOC (struct memory_ostream_representation);
+
+  stream->base.vtable = &memory_ostream_vtable;
+  stream->allocated = 250;
+  stream->buffer = XNMALLOC (stream->allocated, char);
+  stream->buflen = 0;
+
+  return stream;
+}

diff --git a/gnulib-local/lib/memory-ostream.oo.h b/gnulib-local/lib/memory-ostream.oo.h
new file mode 100644 (file)
index 0000000..51cad29
--- /dev/null
+++ b/gnulib-local/lib/memory-ostream.oo.h
@@ -0,0 +1,49 @@
+/* Output stream that accumulates the output in memory.
+   Copyright (C) 2006 Free Software Foundation, Inc.
+   Written by Bruno Haible <bruno@clisp.org>, 2006.
+
+   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
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+#ifndef _MEMORY_OSTREAM_H
+#define _MEMORY_OSTREAM_H
+
+#include <stddef.h>
+
+#include "ostream.h"
+
+struct memory_ostream : struct ostream
+{
+methods:
+  /* Return a pointer to the output accumulated so far and its size:
+     Store them in *BUFP and *BUFLENP.
+     Note: These two return values become invalid when more output is done to
+     the stream.  */
+  void contents (memory_ostream_t stream, const void **bufp, size_t *buflenp);
+};
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/* Create an output stream that accumulates the output in a memory buffer.  */
+extern memory_ostream_t memory_ostream_create (void);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _MEMORY_OSTREAM_H */

diff --git a/gnulib-local/modules/memory-ostream b/gnulib-local/modules/memory-ostream
new file mode 100644 (file)
index 0000000..f3cd514
--- /dev/null
+++ b/gnulib-local/modules/memory-ostream
@@ -0,0 +1,33 @@
+Description:
+Output stream that accumulates the output in memory.
+
+Files:
+lib/memory-ostream.oo.h
+lib/memory-ostream.oo.c
+
+Depends-on:
+ostream
+error
+exit
+gettext
+xalloc
+xsize
+
+configure.ac:
+
+Makefile.am:
+lib_SOURCES += memory-ostream.c
+memory-ostream.h memory-ostream.c : $(top_srcdir)/build-aux/moopp memory-ostream.oo.h memory-ostream.oo.c ostream.oo.h
+       $(top_srcdir)/build-aux/moopp $(srcdir)/memory-ostream.oo.c $(srcdir)/memory-ostream.oo.h $(srcdir)/ostream.oo.h
+BUILT_SOURCES += memory-ostream.h memory-ostream.c memory_ostream.priv.h memory_ostream.vt.h
+CLEANFILES += memory-ostream.h memory-ostream.c memory_ostream.priv.h memory_ostream.vt.h
+
+Include:
+"memory-ostream.h"
+
+License:
+GPL
+
+Maintainer:
+Bruno Haible
+