X-Git-Url: http://the.earth.li/gitweb/?a=blobdiff_plain;f=charfuncs.c;h=778df1ca477732fac168895fc3094e45af329ae4;hb=b29df6ee43968324d986717ac10d6e0656925196;hp=de68b661ae222d3e1f1e2b2716d9e53690c3eb14;hpb=62078c1601192c2594b954a122ac44a0c319c9bd;p=onak.git

diff --git a/charfuncs.c b/charfuncs.c
index de68b66..778df1c 100644
--- a/charfuncs.c
+++ b/charfuncs.c
@@ -6,6 +6,8 @@
  * Copyright 2002 Project Purple
  */
 
+#include <stdio.h>
+#include <string.h>
 #include <sys/types.h>
 #include <sys/uio.h>
 #include <unistd.h>
@@ -21,12 +23,11 @@
 int buffer_fetchchar(void *ctx, size_t count, unsigned char *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++];
-	}
+	
+	memcpy(c, &buf->buffer[buf->offset], count);
+	buf->offset += count;
 
 	return (((buf->offset) == (buf->size)) ? 1 : 0);
 }
@@ -45,7 +46,6 @@ int buffer_putchar(void *ctx, size_t count, unsigned char *c)
 {
 	struct buffer_ctx *buf = NULL;
 	size_t newsize = 0;
-	int i;
 	
 	buf = (struct buffer_ctx *) ctx;
 
@@ -56,11 +56,10 @@ 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];
-	}
 
+	memcpy(&buf->buffer[buf->offset], c, count);
+	buf->offset += count;
+	
 	return 1;
 }
 
@@ -79,3 +78,19 @@ int file_putchar(void *fd, size_t count, unsigned char *c)
 {
 	return !(write( *(int *) fd, c, count));
 }
+
+/**
+ *	stdin_getchar - Gets a char from stdin.
+ */
+int stdin_getchar(void *ctx, size_t count, unsigned char *c)
+{
+	return (fread(c, 1, count, stdin) != count);
+}
+
+/**
+ *	stdout_putchar - Puts a char to stdout.
+ */
+int stdout_putchar(void *ctx, size_t count, unsigned char *c)
+{
+	return (fwrite(c, 1, count, stdout) != count);
+}