X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/047b8ed75bbac19ef33690bd44746718a8261439..8b4052ad6015aa9f54c9c824f28655f230d09d8d:/charfuncs.c?ds=sidebyside

diff --git a/charfuncs.c b/charfuncs.c
index 52f1155..c8a140f 100644
--- a/charfuncs.c
+++ b/charfuncs.c
@@ -4,8 +4,6 @@
  * 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>
@@ -24,7 +22,7 @@
 int buffer_fetchchar(void *ctx, size_t count, unsigned char *c)
 {
 	struct buffer_ctx *buf = NULL;
-	int i;
+	size_t i;
 	
 	buf = (struct buffer_ctx *) ctx;
 	for (i = 0; i < count; i++) {
@@ -48,7 +46,7 @@ int buffer_putchar(void *ctx, size_t count, unsigned char *c)
 {
 	struct buffer_ctx *buf = NULL;
 	size_t newsize = 0;
-	int i;
+	size_t i;
 	
 	buf = (struct buffer_ctx *) ctx;
 
@@ -88,16 +86,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 +94,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);
 }