X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/99c35bb21639a4d9e4d3da7434960525d2113ac2..4860ab5af538fd20c7e92e01b883dbbc556863a5:/charfuncs.c diff --git a/charfuncs.c b/charfuncs.c index 778df1c..fab53a2 100644 --- a/charfuncs.c +++ b/charfuncs.c @@ -1,9 +1,20 @@ /* * charfuncs.c - Routines for dealing with character streams. * - * Jonathan McDowell + * Copyright 2002 Jonathan McDowell * - * Copyright 2002 Project Purple + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the Free + * Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, write to the Free Software Foundation, Inc., 51 + * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include @@ -20,16 +31,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; buf = (struct buffer_ctx *) ctx; + + 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; } /** @@ -42,7 +57,7 @@ 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; @@ -66,7 +81,7 @@ int buffer_putchar(void *ctx, size_t count, unsigned char *c) /** * 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)); } @@ -74,7 +89,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)); } @@ -82,7 +97,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); } @@ -90,7 +105,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); }