X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/047b8ed75bbac19ef33690bd44746718a8261439..e1385087ec060568a966a5305a9d88c24a2a0a55:/charfuncs.c

diff --git a/charfuncs.c b/charfuncs.c
index 52f1155..778df1c 100644
--- a/charfuncs.c
+++ b/charfuncs.c
@@ -4,11 +4,10 @@
  * Jonathan McDowell <noodles@earth.li>
  *
  * Copyright 2002 Project Purple
- *
- * $Id: charfuncs.c,v 1.3 2003/09/30 17:15:39 noodles Exp $
  */
 
 #include <stdio.h>
+#include <string.h>
 #include <sys/types.h>
 #include <sys/uio.h>
 #include <unistd.h>
@@ -24,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);
 }
@@ -48,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;
 
@@ -59,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;
 }
 
@@ -88,16 +84,7 @@ int file_putchar(void *fd, size_t count, unsigned char *c)
  */
 int stdin_getchar(void *ctx, size_t count, unsigned char *c)
 {
-	int ic = 0;
-
-	while ((count > 0) && (ic != EOF)) {
-		ic = getchar();
-		*c = ic;
-		c++;
-		count--;
-	}
-
-	return (ic == EOF);
+	return (fread(c, 1, count, stdin) != count);
 }
 
 /**
@@ -105,10 +92,5 @@ int stdin_getchar(void *ctx, size_t count, unsigned char *c)
  */
 int stdout_putchar(void *ctx, size_t count, unsigned char *c)
 {
-	int i;
-
-	for (i = 0; i < count; i++) {
-		putchar(c[i]);
-	}
-	return 0;
+	return (fwrite(c, 1, count, stdout) != count);
 }