X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/58d762ea573eb3cfea626bb52ea7a99e24b8a0aa..076ef5c84d05a564ed8031ced310336b3b331dfe:/charfuncs.c diff --git a/charfuncs.c b/charfuncs.c index f509fc8..8448aee 100644 --- a/charfuncs.c +++ b/charfuncs.c @@ -4,11 +4,10 @@ * Jonathan McDowell * * Copyright 2002 Project Purple - * - * $Id: charfuncs.c,v 1.4 2003/10/04 10:21:40 noodles Exp $ */ #include +#include #include #include #include @@ -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; - size_t 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; - size_t 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,7 +86,7 @@ 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) { return (fread(c, 1, count, stdin) != count); } @@ -94,7 +94,7 @@ int stdin_getchar(void *ctx, size_t count, unsigned char *c) /** * 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) { return (fwrite(c, 1, count, stdout) != count); }