Add /pks/hashquery

[onak.git] / charfuncs.c

diff --git a/charfuncs.c b/charfuncs.c
index 52f1155b4c173219a60089729a54fd208848cf38..8448aee1be579956a71b2480850fb534685b15d1 100644 (file)
--- 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>
@@ -21,17 +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;
-       int i;
        
        buf = (struct buffer_ctx *) ctx;
-       for (i = 0; i < count; i++) {
-               c[i] = buf->buffer[buf->offset++];
+
+       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;
 }
 
 /**
@@ -44,11 +46,10 @@ 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;
-       int i;
        
        buf = (struct buffer_ctx *) ctx;
 
@@ -59,18 +60,17 @@ 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;
 }
 
 /**
  *     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));
 }
@@ -78,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));
 }
@@ -86,29 +86,15 @@ 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)
 {
-       int ic = 0;
-
-       while ((count > 0) && (ic != EOF)) {
-               ic = getchar();
-               *c = ic;
-               c++;
-               count--;
-       }
-
-       return (ic == EOF);
+       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)
+int stdout_putchar(void *ctx, size_t count, void *c)
 {
-       int i;
-
-       for (i = 0; i < count; i++) {
-               putchar(c[i]);
-       }
-       return 0;
+       return (fwrite(c, 1, count, stdout) != count);
 }