/*
* charfuncs.c - Routines for dealing with character streams.
*
- * Jonathan McDowell <noodles@earth.li>
+ * Copyright 2002 Jonathan McDowell <noodles@earth.li>
*
- * Copyright 2002 Project Purple
+ * 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; version 2 of the License.
*
- * $Id: charfuncs.c,v 1.3 2003/09/30 17:15:39 noodles Exp $
+ * 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 <stdio.h>
+#include <string.h>
#include <sys/types.h>
#include <sys/uio.h>
#include <unistd.h>
#include "charfuncs.h"
-/**
- * buffer_fetchchar - Fetches a char from a buffer.
+/*
+ * Fetches a char from a buffer.
* @ctx: Our buffer context structure.
* @count: The number of characters to get from the buffer.
* @c: Where to put the characters retrieved.
*/
-int buffer_fetchchar(void *ctx, size_t count, unsigned char *c)
+int buffer_fetchchar(void *ctx, size_t count, void *c)
{
struct buffer_ctx *buf = NULL;
- int i;
buf = (struct buffer_ctx *) ctx;
- for (i = 0; i < count; i++) {
- c[i] = buf->buffer[buf->offset++];
+
+ if (buf->offset + count > buf->size) {
+ return 1;
}
+
+ memcpy(c, &buf->buffer[buf->offset], count);
+ buf->offset += count;
- return (((buf->offset) == (buf->size)) ? 1 : 0);
+ return 0;
}
-/**
+/*
* buffer_putchar - Puts a char to a buffer.
* @ctx: Our buffer context structure.
* @count: The number of characters to put into the buffer.
* fill it then we double the size of the current buffer and then add the
* rest.
*/
-int buffer_putchar(void *ctx, size_t count, unsigned char *c)
+int buffer_putchar(void *ctx, size_t count, void *c)
{
struct buffer_ctx *buf = NULL;
size_t newsize = 0;
- int i;
buf = (struct buffer_ctx *) ctx;
buf->buffer = realloc(buf->buffer, newsize);
buf->size = newsize;
}
-
- for (i = 0; i < count; i++) {
- buf->buffer[buf->offset++] = c[i];
- }
+ memcpy(&buf->buffer[buf->offset], c, count);
+ buf->offset += count;
+
return 1;
}
-/**
- * file_fetchchar - Fetches a char from a file.
+/*
+ * Fetches a char from a file.
*/
-int file_fetchchar(void *fd, size_t count, unsigned char *c)
+int file_fetchchar(void *fd, size_t count, void *c)
{
return !(read( *(int *) fd, c, count));
}
-/**
- * file_putchar - Puts a char to a file.
+/*
+ * Puts a char to a file.
*/
-int file_putchar(void *fd, size_t count, unsigned char *c)
+int file_putchar(void *fd, size_t count, void *c)
{
return !(write( *(int *) fd, c, count));
}
-/**
- * stdin_getchar - Gets a char from stdin.
+/*
+ * Gets a char from stdin.
*/
-int stdin_getchar(void *ctx, size_t count, unsigned char *c)
+int stdin_getchar(void *ctx, size_t count, void *c)
{
- int ic = 0;
-
- while ((count > 0) && (ic != EOF)) {
- ic = getchar();
- *c = ic;
- c++;
- count--;
- }
-
- return (ic == EOF);
+ return (fread(c, 1, count, stdin) != count);
}
-/**
- * stdout_putchar - Puts a char to stdout.
+/*
+ * Puts a char to stdout.
*/
-int stdout_putchar(void *ctx, size_t count, unsigned char *c)
+int stdout_putchar(void *ctx, size_t count, void *c)
{
- int i;
-
- for (i = 0; i < count; i++) {
- putchar(c[i]);
- }
- return 0;
+ return (fwrite(c, 1, count, stdout) != count);
}