X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/0f4971d043c38bae1bfb95201622a1405110f899..584b44f3613a29ce27fc8b87cdd8654d3357ed4f:/charfuncs.c?ds=sidebyside

diff --git a/charfuncs.c b/charfuncs.c
index 3bfc3cc..778df1c 100644
--- a/charfuncs.c
+++ b/charfuncs.c
@@ -4,10 +4,10 @@
  * Jonathan McDowell <noodles@earth.li>
  *
  * Copyright 2002 Project Purple
- *
- * $Id: charfuncs.c,v 1.2 2003/06/04 20:57:07 noodles Exp $
  */
 
+#include <stdio.h>
+#include <string.h>
 #include <sys/types.h>
 #include <sys/uio.h>
 #include <unistd.h>
@@ -23,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);
 }
@@ -47,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;
 
@@ -58,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;
 }
 
@@ -81,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);
+}