X-Git-Url: https://the.earth.li/gitweb/?a=blobdiff_plain;f=charfuncs.c;h=59c8ca39e55d5cb519a063fe0bff0f3a1a9515b1;hb=HEAD;hp=c8a140ff2ff45686cac6804c522a83e033a70e62;hpb=394938c479925750ffe56c28d281945ba4003a14;p=onak.git

diff --git a/charfuncs.c b/charfuncs.c
index c8a140f..59c8ca3 100644
--- a/charfuncs.c
+++ b/charfuncs.c
@@ -1,38 +1,51 @@
 /*
  * 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.
+ *
+ * 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, see <https://www.gnu.org/licenses/>.
  */
 
 #include <stdio.h>
-#include <sys/types.h>
-#include <sys/uio.h>
+#include <string.h>
 #include <unistd.h>
 
+#include "build-config.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)
+size_t buffer_fetchchar(void *ctx, size_t count, void *c)
 {
 	struct buffer_ctx *buf = NULL;
-	size_t i;
 	
 	buf = (struct buffer_ctx *) ctx;
-	for (i = 0; i < count; i++) {
-		c[i] = buf->buffer[buf->offset++];
+
+	if (buf->offset + count > buf->size) {
+		count = buf->size - buf->offset;
 	}
 
-	return (((buf->offset) == (buf->size)) ? 1 : 0);
+	memcpy(c, &buf->buffer[buf->offset], count);
+	buf->offset += count;
+
+	return count;
 }
 
-/**
+/*
  *	buffer_putchar - Puts a char to a buffer.
  *	@ctx: Our buffer context structure.
  *	@count: The number of characters to put into the buffer.
@@ -42,11 +55,10 @@ int buffer_fetchchar(void *ctx, size_t count, unsigned char *c)
  *	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)
+size_t buffer_putchar(void *ctx, size_t count, void *c)
 {
 	struct buffer_ctx *buf = NULL;
 	size_t newsize = 0;
-	size_t i;
 	
 	buf = (struct buffer_ctx *) ctx;
 
@@ -57,42 +69,45 @@ int buffer_putchar(void *ctx, size_t count, unsigned char *c)
 		buf->buffer = realloc(buf->buffer, newsize);
 		buf->size = newsize;
 	}
-	
-	for (i = 0; i < count; i++) {
-		buf->buffer[buf->offset++] = c[i];
-	}
 
-	return 1;
+	memcpy(&buf->buffer[buf->offset], c, count);
+	buf->offset += count;
+	
+	return count;
 }
 
-/**
- *	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)
+size_t file_fetchchar(void *fd, size_t count, void *c)
 {
-	return !(read( *(int *) fd, c, count));
+	ssize_t ret = read( *(int *) fd, c, count);
+
+	return (ret > 0) ? ret : 0;
 }
 
-/**
- *	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)
+size_t file_putchar(void *fd, size_t count, void *c)
 {
-	return !(write( *(int *) fd, c, count));
+	size_t ret = write( *(int *) fd, c, count);
+
+	return (ret > 0) ? ret : 0;
 }
 
-/**
- *	stdin_getchar - Gets a char from stdin.
+/*
+ * Gets a char from stdin.
  */
-int stdin_getchar(void *ctx, size_t count, unsigned char *c)
+size_t stdin_getchar(__unused void *ctx, size_t count, void *c)
 {
-	return (fread(c, 1, count, stdin) != count);
+	return fread(c, 1, count, stdin);
 }
 
-/**
- *	stdout_putchar - Puts a char to stdout.
+/*
+ * Puts a char to stdout.
  */
-int stdout_putchar(void *ctx, size_t count, unsigned char *c)
+size_t stdout_putchar(__unused void *ctx, size_t count, void *c)
 {
-	return (fwrite(c, 1, count, stdout) != count);
+	return fwrite(c, 1, count, stdout);
 }