X-Git-Url: http://the.earth.li/gitweb/?a=blobdiff_plain;f=charfuncs.c;h=8448aee1be579956a71b2480850fb534685b15d1;hb=0211c730256c9bbaf10a569c88f7df0ef882311e;hp=778df1ca477732fac168895fc3094e45af329ae4;hpb=99c35bb21639a4d9e4d3da7434960525d2113ac2;p=onak.git

diff --git a/charfuncs.c b/charfuncs.c
index 778df1c..8448aee 100644
--- a/charfuncs.c
+++ b/charfuncs.c
@@ -20,16 +20,20 @@
  *	@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;
 }
 
 /**
@@ -42,7 +46,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;
@@ -66,7 +70,7 @@ int buffer_putchar(void *ctx, size_t count, unsigned char *c)
 /**
  *	file_fetchchar - 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));
 }
@@ -74,7 +78,7 @@ int file_fetchchar(void *fd, size_t count, unsigned char *c)
 /**
  *	file_putchar - 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));
 }
@@ -82,7 +86,7 @@ int file_putchar(void *fd, size_t count, unsigned char *c)
 /**
  *	stdin_getchar - 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);
 }
@@ -90,7 +94,7 @@ int stdin_getchar(void *ctx, size_t count, unsigned char *c)
 /**
  *	stdout_putchar - 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);
 }