
and fixed at least one problem (end of stream never happening in certain cases). Things that can fail now have a way of saying they failed too. So much for taking ANZAC day off to get drunk! 2000-04-26 NotZed <NotZed@HelixCode.com> * camel-seekable-substream.c (stream_seek): Changed to have absolute seek semantics, not relative to the bounds. * camel-seekable-stream.c (reset): When we reset, seek to the start of the bound, if there is one. (stream_tell): Make tell virtual. * camel-stream-filter.c (do_available): Removed. * camel-stream-buffer.c: Remove leading _'s from static functions. (stream_read): Renamed from read(). Fancy that conflicting! (my boo!) Others too. * providers/pop3/camel-pop3-folder.c (get_message_by_number): Changed to stream_mem interface. * providers/mbox/camel-mbox-folder.c (_get_message_by_uid): Fixed for streamfs interface changes, and implement a failure case. (_append_message): Changed for fs stream interface change. * camel-multipart.c (print_part): Iterate rahter than callback. I hate glists's interface (hence, move this to write_to_stream). (write_to_stream): Return an error (yuck, this is a royal PITA to do with the stream write interface). * camel-mime-message.c: Removed leading _ from static names. * camel-mime-part.h: construct_from_parser() now returns an error code. * camel-mime-part-utils.c (camel_mime_part_construct_content_from_parser): Changed to use a camel-data-wrapper instead of a camel-simple-data-wrapper (no change needed elsewhere?). (simple_data_wrapper_construct_from_parser): Fixes for stream-mem interface changes. * camel-simple-data-wrapper.[ch], camel-simple-data-wrapper-stream.[ch], camel-stream-data-wrapper.[ch], removed. Fixed including of these files. * camel-mime-part.c (camel_mime_part_set_text): Remove the use of the camel-simple-data-wrapper-stream, just use a mem stream. (write_to_stream): Renamed from my_* (construct_from_stream): Return an error on error. * camel-stream-mem.c (camel_stream_mem_new*): Remove mode parameter. * camel-stream-mem.h (enum CamelStreamMemMode): Removed. It wasn't used at all. * camel-data-wrapper.h: Add camel_data_wrapper_new() to create these. (write_to_stream, construct_from_stream): Return an error indicator for success. Fixed all methods to match (ICK). * Makefile.am (libcamel_la_SOURCES): Remove camel-simple-data-wrapper.c, camel-simple-data-wrapper-stream.c, camel-stream-data-wrapper.c. Obsoleted by code re-use! * camel-data-wrapper.c (construct_from_stream): Change the default implementation to just set the output stream == construction stream. Well, this lets me get rid of both simple-data-wrapper and stream-data-wrapper (unused anyway), and simple-data-wrapper-stream in one hit. CamelDataWrapper is now also a concrete class. (write_to_stream): Use camel_stream_write_to_stream() to calculate/return values (and save code). Include <errno.h> for obvious reasons. * camel-stream.c (eos): Provide a default implementation of .eos(). (camel_stream_write_to_stream): Make it return an error code on error. (camel_stream_printf): Changed to return the number of bytes written/error. (camel_stream_available): Removed. * camel-stream-fs.h (enum CamelStreamFsMode): Removed. Changed to use unix modes and so forth (wasn't used for anything but new file creation and didn't work well either). * camel-stream-fs.c: Removed leading _'s for names. And removed some virtual method 'documentation'. (destroy): Dont try and close a closed/error fd. Only report error if close returns -1. Moved all the code to finalise(), and killed this function. (init_with_fd): Properly setup the seek offset, if it is a valid and seekable file descriptor. (init_with_fd_and_bounds): Use off_t for bounds, set bounds on the seekable stream. (init_with_name): Return error codes. (init_with_name_and_bounds): Ditto. (camel_stream_fs_new_with_name): REturn NULL object if it failed. (camel_stream_fs_new_with_name_and_bounds): Return NULL object on failure. Changed with_name* api's to take unix open style args and flags. (read): The bounded stream bounds checking seemed off, simplified code a bit. (write): Implement bounds checking for writing, the comment was wrong, it could make sense to bound writing. Cleaned up a little. (available): Gone. (eos): Removed. Use CamelStream's implementation now. (close): Reset the fd to -1, provide a warning for bad usage. (seek): Cleaned up. Changed the behaviour a little, the returned offset is the absolute position in the file, even in bounded streams. (seek): Seek from end mirrors lseek() behaviour (reverse seeking). 2000-04-25 NotZed <NotZed@HelixCode.com> * camel-stream-fs.h (struct _CamelStreamFs): Moved bounds and eof indicator to other parent classes. * camel-stream.c (camel_stream_printf): New utility function. Obvious use. * camel-stream-mem.c: Removed leading _'s from static func's. (camel_stream_mem_new_with_byte_array): Fixed for api changes, set the owner for the byte array to us. : Removed A bunch of gtk doc stuff for static (implementation) functions. (available): Removed. (write): Fixed the write implementation so that seek() works on a seekable memory stream, as expected. Seeking past the end of the buffer has unix semantics (filling with 0). (available): Removed. (write): Implement seekable stream bounded stream. (read): Implement seekable stream bounded stream. (close): Dont free the stream_mem if we're not the owner. (seek): Allow to seek beyond the end of memory area, implement bounds checking. (seek): Set errno on bad policy. * camel-stream-mem.h (struct _CamelStreamMem): Changed position to off_t. (new_with_buffer): Changed len to be a size_t. (set_buffer, set_byte_array): New interface functions. (struct _CamelStreamMem): Removed position, it is stored in the superclass. * camel-stream.h: Removed some of the seemingly random whitespace. Removed the available method (its not impelemented/useful enough). * camel-seekable-substream.c (init_with_seekable_stream_and_bounds): Remove the data_available stuff, it hasn't been properly implemented/finished, and may never work (unfortunately *sigh). (reemit_parent_signal): Removed part of the above change. (set_bounds): Removed (moved to seekable-stream). : Fixed up some of the generally unreadable indenting (sorry, wrapping at 80 characters with camels_really_long_function_names() just_doesnt_work_very_well_does_it(). (available): Removed. (stream_seek): Fixup for object changes. Make sure we return -1 if the parent stream can't seek. * camel-seekable-stream.c (ccamel_seekable_stream_set_bounds): New function to bound any seekable stream. : Removed _'s. (camel_seekable_stream_class_init): Implement an init function, to setup the stream bounds to unbound. * camel-seekable-stream.h (CamelSeekableStreamClass): New virtual method set_bounds for seekable streams. (CAMEL_STREAM_UNBOUND): New define for no bound. * camel-seekable-substream.h (struct _CamelSeekableSubstream): Removed sup_bound and inf_bound, moved to CamelSeekableStream (and renamed, and changed to off_t's). (new_with_seekable_stream_and_bounds): Use off_t as the bounds. (CamelSeekableSubstreamClass): Uh, why was the intialiser virtual? Removed. * camel-seekable-stream.[ch] (CamelSeekableStreamClass): Changed seek to accept an off_t as the offset. (struct _CamelSeekableStream): Renamed cur_pos to position and changed it to an off_t type. (enum CamelStreamSeekPolicy): Set to match the SEEK_* constants from lseek(). (get_current_position): Renamed to tell(). * camel-stream-buffer.h: Commented out set_vbuf - never implemented. svn path=/trunk/; revision=2624
473 lines
12 KiB
C
473 lines
12 KiB
C
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
|
|
|
|
/* camel-stream-buffer.c : Buffer any other other stream
|
|
*
|
|
* Authors: Michael Zucchi <notzed@helixcode.com>
|
|
*
|
|
* Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
|
|
*
|
|
* 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 of the
|
|
* License, 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307
|
|
* USA
|
|
*/
|
|
|
|
|
|
#include <config.h>
|
|
#include "camel-stream-buffer.h"
|
|
#include <sys/types.h>
|
|
#include <sys/stat.h>
|
|
#include <fcntl.h>
|
|
#include <errno.h>
|
|
|
|
static CamelStreamBufferClass *parent_class=NULL;
|
|
|
|
enum {
|
|
BUF_USER = 1<<0, /* user-supplied buffer, do not free */
|
|
};
|
|
|
|
#define BUF_SIZE 1024
|
|
|
|
static gint stream_read (CamelStream *stream, gchar *buffer, gint n);
|
|
static gint stream_write (CamelStream *stream, const gchar *buffer, gint n);
|
|
static void stream_flush (CamelStream *stream);
|
|
static gboolean stream_eos (CamelStream *stream);
|
|
static void stream_close (CamelStream *stream);
|
|
|
|
static void finalize (GtkObject *object);
|
|
static void destroy (GtkObject *object);
|
|
|
|
static void init_vbuf(CamelStreamBuffer *sbf, CamelStream *s, CamelStreamBufferMode mode, char *buf, guint32 size);
|
|
static void init(CamelStreamBuffer *sbuf, CamelStream *s, CamelStreamBufferMode mode);
|
|
|
|
static void
|
|
camel_stream_buffer_class_init (CamelStreamBufferClass *camel_stream_buffer_class)
|
|
{
|
|
CamelStreamClass *camel_stream_class = CAMEL_STREAM_CLASS (camel_stream_buffer_class);
|
|
GtkObjectClass *gtk_object_class = GTK_OBJECT_CLASS (camel_stream_buffer_class);
|
|
|
|
parent_class = gtk_type_class (camel_stream_get_type ());
|
|
|
|
/* virtual method definition */
|
|
camel_stream_buffer_class->init = init;
|
|
camel_stream_buffer_class->init_vbuf = init_vbuf;
|
|
|
|
/* virtual method overload */
|
|
camel_stream_class->read = stream_read;
|
|
camel_stream_class->write = stream_write;
|
|
camel_stream_class->flush = stream_flush;
|
|
camel_stream_class->eos = stream_eos;
|
|
camel_stream_class->close = stream_close;
|
|
|
|
gtk_object_class->finalize = finalize;
|
|
gtk_object_class->destroy = destroy;
|
|
|
|
}
|
|
|
|
static void
|
|
camel_stream_buffer_init (gpointer object, gpointer klass)
|
|
{
|
|
CamelStreamBuffer *sbf = CAMEL_STREAM_BUFFER (object);
|
|
|
|
sbf->flags = 0;
|
|
sbf->size = BUF_SIZE;
|
|
sbf->buf = g_malloc(BUF_SIZE);
|
|
sbf->ptr = sbf->buf;
|
|
sbf->end = sbf->buf;
|
|
sbf->mode = CAMEL_STREAM_BUFFER_READ | CAMEL_STREAM_BUFFER_BUFFER;
|
|
sbf->stream = 0;
|
|
}
|
|
|
|
GtkType
|
|
camel_stream_buffer_get_type (void)
|
|
{
|
|
static GtkType camel_stream_buffer_type = 0;
|
|
|
|
gdk_threads_enter ();
|
|
if (!camel_stream_buffer_type) {
|
|
GtkTypeInfo camel_stream_buffer_info =
|
|
{
|
|
"CamelStreamBuffer",
|
|
sizeof (CamelStreamBuffer),
|
|
sizeof (CamelStreamBufferClass),
|
|
(GtkClassInitFunc) camel_stream_buffer_class_init,
|
|
(GtkObjectInitFunc) camel_stream_buffer_init,
|
|
/* reserved_1 */ NULL,
|
|
/* reserved_2 */ NULL,
|
|
(GtkClassInitFunc) NULL,
|
|
};
|
|
|
|
camel_stream_buffer_type = gtk_type_unique (camel_stream_get_type (), &camel_stream_buffer_info);
|
|
}
|
|
gdk_threads_leave ();
|
|
return camel_stream_buffer_type;
|
|
}
|
|
|
|
|
|
static void
|
|
destroy (GtkObject *object)
|
|
{
|
|
CamelStreamBuffer *stream_buffer = CAMEL_STREAM_BUFFER (object);
|
|
|
|
/* NOP to remove warnings */
|
|
stream_buffer->buf = stream_buffer->buf;
|
|
|
|
GTK_OBJECT_CLASS (parent_class)->destroy (object);
|
|
}
|
|
|
|
|
|
static void
|
|
finalize (GtkObject *object)
|
|
{
|
|
CamelStreamBuffer *sbf = CAMEL_STREAM_BUFFER (object);
|
|
|
|
if (!(sbf->flags & BUF_USER)) {
|
|
g_free(sbf->buf);
|
|
}
|
|
if (sbf->stream)
|
|
gtk_object_unref(GTK_OBJECT(sbf->stream));
|
|
|
|
GTK_OBJECT_CLASS (parent_class)->finalize (object);
|
|
}
|
|
|
|
static void
|
|
set_vbuf(CamelStreamBuffer *sbf, char *buf, CamelStreamBufferMode mode, int size)
|
|
{
|
|
if (sbf->buf && !(sbf->flags & BUF_USER)) {
|
|
g_free(sbf->buf);
|
|
}
|
|
if (buf) {
|
|
sbf->buf = buf;
|
|
sbf->flags |= BUF_USER;
|
|
} else {
|
|
sbf->buf = g_malloc(size);
|
|
sbf->flags &= ~BUF_USER;
|
|
}
|
|
sbf->size = size;
|
|
sbf->mode = mode;
|
|
}
|
|
|
|
static void
|
|
init_vbuf(CamelStreamBuffer *sbf, CamelStream *s, CamelStreamBufferMode mode, char *buf, guint32 size)
|
|
{
|
|
set_vbuf(sbf, buf, mode, size);
|
|
if (sbf->stream)
|
|
gtk_object_unref(GTK_OBJECT(sbf->stream));
|
|
sbf->stream = s;
|
|
}
|
|
|
|
static void
|
|
init(CamelStreamBuffer *sbuf, CamelStream *s, CamelStreamBufferMode mode)
|
|
{
|
|
init_vbuf(sbuf, s, mode, NULL, BUF_SIZE);
|
|
}
|
|
|
|
|
|
/**
|
|
* camel_stream_buffer_new:
|
|
* @stream: Existing stream to buffer.
|
|
* @mode: Operational mode of buffered stream.
|
|
*
|
|
* Create a new buffered stream of another stream. A default
|
|
* buffer size (1024 bytes), automatically managed will be used
|
|
* for buffering.
|
|
*
|
|
* See camel_stream_buffer_new_with_vbuf() for details on the
|
|
* @mode parameter.
|
|
*
|
|
* Return value: A newly created buffered stream.
|
|
**/
|
|
CamelStream *
|
|
camel_stream_buffer_new (CamelStream *stream, CamelStreamBufferMode mode)
|
|
{
|
|
CamelStreamBuffer *sbf;
|
|
sbf = gtk_type_new (camel_stream_buffer_get_type ());
|
|
CAMEL_STREAM_BUFFER_CLASS (GTK_OBJECT(sbf)->klass)->init (sbf, stream, mode);
|
|
|
|
return CAMEL_STREAM (sbf);
|
|
}
|
|
|
|
/**
|
|
* camel_stream_buffer_new_with_vbuf:
|
|
* @stream: An existing stream to buffer.
|
|
* @mode: Mode to buffer in.
|
|
* @buf: Memory to use for buffering.
|
|
* @size: Size of buffer to use.
|
|
*
|
|
* Create a new stream which buffers another stream, @stream.
|
|
*
|
|
* The following values are available for @mode:
|
|
*
|
|
* CAMEL_STREAM_BUFFER_BUFFER, Buffer the input/output in blocks.
|
|
* CAMEL_STREAM_BUFFER_NEWLINE, Buffer on newlines (for output).
|
|
* CAMEL_STREAM_BUFFER_NONE, Perform no buffering.
|
|
*
|
|
* Note that currently this is ignored and CAMEL_STREAM_BUFFER_BUFFER
|
|
* is always used.
|
|
*
|
|
* In addition, one of the following mode options should be or'd
|
|
* together with the buffering mode:
|
|
*
|
|
* CAMEL_STREAM_BUFFER_WRITE, Buffer in write mode.
|
|
* CAMEL_STREAM_BUFFER_READ, Buffer in read mode.
|
|
*
|
|
* Buffering can only be done in one direction for any
|
|
* buffer instance.
|
|
*
|
|
* If @buf is non-NULL, then use the memory pointed to
|
|
* (for upto @size bytes) as the buffer for all buffering
|
|
* operations. It is upto the application to free this buffer.
|
|
* If @buf is NULL, then allocate and manage @size bytes
|
|
* for all buffering.
|
|
*
|
|
* Return value: A new stream with buffering applied.
|
|
**/
|
|
CamelStream *camel_stream_buffer_new_with_vbuf (CamelStream *stream, CamelStreamBufferMode mode, char *buf, guint32 size)
|
|
{
|
|
CamelStreamBuffer *sbf;
|
|
sbf = gtk_type_new (camel_stream_buffer_get_type ());
|
|
CAMEL_STREAM_BUFFER_CLASS (GTK_OBJECT(sbf)->klass)->init_vbuf (sbf, stream, mode, buf, size);
|
|
|
|
return CAMEL_STREAM (sbf);
|
|
}
|
|
|
|
/**
|
|
* _read: read bytes from a stream
|
|
* @stream: stream
|
|
* @buffer: buffer where bytes are stored
|
|
* @n: max number of bytes to read
|
|
*
|
|
*
|
|
*
|
|
* Return value: number of bytes actually read.
|
|
**/
|
|
static gint
|
|
stream_read (CamelStream *stream, gchar *buffer, gint n)
|
|
{
|
|
CamelStreamBuffer *sbf = CAMEL_STREAM_BUFFER (stream);
|
|
int bytes_read=1;
|
|
int bytes_left;
|
|
gchar *bptr = buffer;
|
|
|
|
g_return_val_if_fail( (sbf->mode & CAMEL_STREAM_BUFFER_MODE) == CAMEL_STREAM_BUFFER_READ, 0);
|
|
|
|
while (n && bytes_read>0) {
|
|
bytes_left = sbf->end - sbf->ptr;
|
|
if (bytes_left<n) {
|
|
if (bytes_left>0) {
|
|
memcpy(bptr, sbf->ptr, bytes_left);
|
|
n -= bytes_left;
|
|
bptr += bytes_left;
|
|
sbf->ptr += bytes_left;
|
|
}
|
|
/* if we are reading a lot, then read directly to the destination buffer */
|
|
if (n >= sbf->size/3) {
|
|
bytes_read = camel_stream_read(sbf->stream, bptr, n);
|
|
if (bytes_read>0) {
|
|
n -= bytes_read;
|
|
bptr += bytes_read;
|
|
}
|
|
} else {
|
|
bytes_read = camel_stream_read(sbf->stream, sbf->buf, sbf->size);
|
|
if (bytes_read>0) {
|
|
sbf->ptr = sbf->buf;
|
|
sbf->end = sbf->buf+bytes_read;
|
|
memcpy(bptr, sbf->ptr, n);
|
|
sbf->ptr += n;
|
|
bptr += n;
|
|
n -= bytes_read;
|
|
}
|
|
}
|
|
} else {
|
|
memcpy(bptr, sbf->ptr, bytes_left);
|
|
sbf->ptr += n;
|
|
bptr += n;
|
|
n = 0;
|
|
}
|
|
}
|
|
|
|
return bptr-buffer;
|
|
}
|
|
|
|
|
|
static gint
|
|
stream_write (CamelStream *stream, const gchar *buffer, gint n)
|
|
{
|
|
CamelStreamBuffer *sbf = CAMEL_STREAM_BUFFER (stream);
|
|
const gchar *bptr = buffer;
|
|
int bytes_written = 1;
|
|
int bytes_left;
|
|
|
|
g_return_val_if_fail( (sbf->mode & CAMEL_STREAM_BUFFER_MODE) == CAMEL_STREAM_BUFFER_WRITE, 0);
|
|
|
|
while (n && bytes_written > 0) {
|
|
bytes_left = sbf->size - (sbf->ptr-sbf->buf);
|
|
if (bytes_left<n) {
|
|
memcpy(sbf->ptr, bptr, bytes_left);
|
|
n -= bytes_left;
|
|
bptr += bytes_left;
|
|
bytes_written = camel_stream_write(sbf->stream, sbf->buf, sbf->size);
|
|
sbf->ptr = sbf->buf;
|
|
/* if we are writing a lot, write directly to the stream */
|
|
if (n >= sbf->size/3) {
|
|
bytes_written = camel_stream_write(sbf->stream, bptr, n);
|
|
bytes_written = n;
|
|
n -= bytes_written;
|
|
bptr += bytes_written;
|
|
} else {
|
|
memcpy(sbf->ptr, bptr, n);
|
|
sbf->ptr += n;
|
|
bptr += n;
|
|
n = 0;
|
|
}
|
|
} else {
|
|
memcpy(sbf->ptr, bptr, n);
|
|
sbf->ptr += n;
|
|
bptr += n;
|
|
n = 0;
|
|
}
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
stream_flush (CamelStream *stream)
|
|
{
|
|
CamelStreamBuffer *sbf = CAMEL_STREAM_BUFFER (stream);
|
|
|
|
if ((sbf->mode & CAMEL_STREAM_BUFFER_MODE) == CAMEL_STREAM_BUFFER_WRITE) {
|
|
int written = camel_stream_write(sbf->stream, sbf->buf, sbf->ptr-sbf->buf);
|
|
if (written > 0) {
|
|
sbf->ptr += written;
|
|
}
|
|
} else {
|
|
/* nothing to do for read mode 'flush' */
|
|
}
|
|
|
|
camel_stream_flush(sbf->stream);
|
|
}
|
|
|
|
static gboolean
|
|
stream_eos (CamelStream *stream)
|
|
{
|
|
CamelStreamBuffer *sbf = CAMEL_STREAM_BUFFER (stream);
|
|
|
|
return camel_stream_eos(sbf->stream) && sbf->ptr == sbf->end;
|
|
}
|
|
|
|
static void
|
|
stream_close (CamelStream *stream)
|
|
{
|
|
CamelStreamBuffer *sbf = CAMEL_STREAM_BUFFER (stream);
|
|
|
|
stream_flush(stream);
|
|
camel_stream_close(sbf->stream);
|
|
}
|
|
|
|
/**
|
|
* camel_stream_buffer_gets:
|
|
* @sbf: A CamelStreamBuffer.
|
|
* @buf: Memory to write the string to.
|
|
* @max: Maxmimum number of characters to store.
|
|
*
|
|
* Read a line of characters up to the next newline character or
|
|
* @max characters.
|
|
*
|
|
* If the newline character is encountered, then it will be
|
|
* included in the buffer @buf. The buffer will be #NUL terminated.
|
|
*
|
|
* Return value: The number of characters read, or 0 for end of file or
|
|
* file error.
|
|
**/
|
|
int camel_stream_buffer_gets(CamelStreamBuffer *sbf, char *buf, int max)
|
|
{
|
|
register char *outptr, *inptr, *inend, c, *outend;
|
|
int bytes_read;
|
|
|
|
outptr = buf;
|
|
inptr = sbf->ptr;
|
|
inend = sbf->end;
|
|
outend = buf+max-1; /* room for NUL */
|
|
|
|
do {
|
|
while (inptr<inend && outptr<outend) {
|
|
c = *inptr++;
|
|
*outptr++ = c;
|
|
if (c=='\n') {
|
|
*outptr = 0;
|
|
sbf->ptr = inptr;
|
|
return outptr-buf;
|
|
}
|
|
}
|
|
if (outptr == outend)
|
|
break;
|
|
|
|
bytes_read = camel_stream_read(sbf->stream, sbf->buf, sbf->size);
|
|
if (bytes_read>0) {
|
|
inptr = sbf->ptr = sbf->buf;
|
|
inend = sbf->end = sbf->buf + bytes_read;
|
|
}
|
|
} while (bytes_read>0);
|
|
|
|
sbf->ptr = inptr;
|
|
if (outptr<=outend)
|
|
*outptr = 0;
|
|
|
|
return outptr-buf;
|
|
}
|
|
|
|
/**
|
|
* camel_stream_buffer_read_line: read a complete line from the stream
|
|
* @sbf: A CamelStreamBuffer
|
|
*
|
|
* This function reads a complete newline-terminated line from the stream
|
|
* and returns it in allocated memory. The trailing newline (and carriage
|
|
* return if any) are not included in the returned string.
|
|
*
|
|
* Return value: the line read, which the caller must free when done with,
|
|
* or NULL on eof or error.
|
|
**/
|
|
char *
|
|
camel_stream_buffer_read_line (CamelStreamBuffer *sbf)
|
|
{
|
|
char *buf, *p;
|
|
int bufsiz, nread;
|
|
|
|
bufsiz = 80;
|
|
p = buf = g_malloc (bufsiz);
|
|
|
|
while (1) {
|
|
nread = camel_stream_buffer_gets (sbf, p, bufsiz - (p - buf));
|
|
if (nread == 0) {
|
|
g_free (buf);
|
|
return NULL;
|
|
}
|
|
|
|
p += nread;
|
|
if (*(p - 1) == '\n')
|
|
break;
|
|
|
|
nread = p - buf;
|
|
bufsiz *= 2;
|
|
buf = g_realloc (buf, bufsiz);
|
|
p = buf + nread;
|
|
}
|
|
|
|
*--p = '\0';
|
|
if (*(p - 1) == '\r')
|
|
*--p = '\0';
|
|
return buf;
|
|
}
|