X-Git-Url: http://the.earth.li/gitweb/?p=onak.git;a=blobdiff_plain;f=charfuncs.c;h=49b680129aea1e6fcbb559ca770e6e327dc42d62;hp=778df1ca477732fac168895fc3094e45af329ae4;hb=76f079e5ebdb34acaaa2462a8d915ee06d3c8425;hpb=99c35bb21639a4d9e4d3da7434960525d2113ac2

diff --git a/charfuncs.c b/charfuncs.c
index 778df1c..49b6801 100644
--- a/charfuncs.c
+++ b/charfuncs.c
@@ -1,38 +1,50 @@
 /*
  * 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 <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;
 	
 	buf = (struct buffer_ctx *) ctx;
+
+	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.
@@ -42,7 +54,7 @@ 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)
+int buffer_putchar(void *ctx, size_t count, void *c)
 {
 	struct buffer_ctx *buf = NULL;
 	size_t newsize = 0;
@@ -63,34 +75,34 @@ int buffer_putchar(void *ctx, size_t count, unsigned char *c)
 	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)
 {
 	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)
 {
 	return (fwrite(c, 1, count, stdout) != count);
 }