code: buffer.c annotate

annotate buffer.c @ 15:520939b40002

Do not increate buf->size on realloc failure

author	David Demelier <markand@malikania.fr>
date	Thu, 08 Sep 2011 13:34:13 +0200
parents	0ed27735fa87
children	ae4128d16c92

rev	line source
0 a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	1 /*
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	2 * buffer.c -- safe unlimited size string
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	3 *
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	4 * Copyright (c) 2011, David Demelier <markand@malikania.fr>
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	5 *
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	6 * Permission to use, copy, modify, and/or distribute this software for any
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	7 * purpose with or without fee is hereby granted, provided that the above
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	8 * copyright notice and this permission notice appear in all copies.
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	9 *
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	10 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	11 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	12 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	13 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	14 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	15 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	16 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	17 */
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	18
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	19 #include <stdio.h>
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	20 #include <stdlib.h>
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	21 #include <stdarg.h>
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	22 #include <string.h>
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	23
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	24 #include "buffer.h"
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	25
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	26 static int buffer_grow(struct buffer *, size_t);
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	27
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	28 /*
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	29 * Initialize a new buffer with the optional `str' as begin of buffer.
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	30 */
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	31
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	32 struct buffer *
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	33 buffer_new(const char *str, size_t bsize, int flags)
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	34 {
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	35 struct buffer *buf;
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	36
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	37 if (!(buf = malloc(sizeof (struct buffer))))
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	38 return NULL;
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	39
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	40 memset(buf, 0, sizeof (struct buffer));
5 0ed27735fa87 Fix bad order David Demelier <markand@malikania.fr> parents: 4 diff changeset	41 buf->bsize = (bsize == 0) ? BUFFER_DEFAULT_BSIZE : bsize;
0 a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	42 buf->size = bsize + 1;
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	43 buf->flags = flags;
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	44
5 0ed27735fa87 Fix bad order David Demelier <markand@malikania.fr> parents: 4 diff changeset	45 if (!(buf->data = calloc(bsize + 1, 1)) \|\|
0ed27735fa87 Fix bad order David Demelier <markand@malikania.fr> parents: 4 diff changeset	46 (str && buffer_strcat(buf, str) < 0)) {
0 a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	47 free(buf);
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	48 return NULL;
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	49 }
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	50
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	51 return buf;
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	52 }
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	53
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	54 /*
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	55 * Concatenate the string into the buffer.
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	56 */
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	57
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	58 int
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	59 buffer_strcat(struct buffer buf, const char str)
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	60 {
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	61 size_t length;
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	62
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	63 length = strlen(str);
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	64 if (buffer_grow(buf, length) < 0)
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	65 return -1;
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	66
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	67 if (buf->flags & BUFFER_FIXED)
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	68 length = buf->size - buf->length - 1;
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	69
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	70 strncat(buf->data, str, length);
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	71 buf->length = strlen(buf->data);
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	72
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	73 return 0;
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	74 }
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	75
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	76 /*
1 22d7bb03e569 for buffer: David Demelier <markand@malikania.fr> parents: 0 diff changeset	77 * Append the character c to the end of buffer.
22d7bb03e569 for buffer: David Demelier <markand@malikania.fr> parents: 0 diff changeset	78 */
22d7bb03e569 for buffer: David Demelier <markand@malikania.fr> parents: 0 diff changeset	79
22d7bb03e569 for buffer: David Demelier <markand@malikania.fr> parents: 0 diff changeset	80 int
22d7bb03e569 for buffer: David Demelier <markand@malikania.fr> parents: 0 diff changeset	81 buffer_putc(struct buffer *buf, char c)
22d7bb03e569 for buffer: David Demelier <markand@malikania.fr> parents: 0 diff changeset	82 {
22d7bb03e569 for buffer: David Demelier <markand@malikania.fr> parents: 0 diff changeset	83 if (buffer_grow(buf, 1) < 0)
22d7bb03e569 for buffer: David Demelier <markand@malikania.fr> parents: 0 diff changeset	84 return -1;
22d7bb03e569 for buffer: David Demelier <markand@malikania.fr> parents: 0 diff changeset	85
22d7bb03e569 for buffer: David Demelier <markand@malikania.fr> parents: 0 diff changeset	86 buf->data[buf->length++] = c;
22d7bb03e569 for buffer: David Demelier <markand@malikania.fr> parents: 0 diff changeset	87 buf->data[buf->length] = '\0';
22d7bb03e569 for buffer: David Demelier <markand@malikania.fr> parents: 0 diff changeset	88
22d7bb03e569 for buffer: David Demelier <markand@malikania.fr> parents: 0 diff changeset	89 return 0;
22d7bb03e569 for buffer: David Demelier <markand@malikania.fr> parents: 0 diff changeset	90 }
22d7bb03e569 for buffer: David Demelier <markand@malikania.fr> parents: 0 diff changeset	91
22d7bb03e569 for buffer: David Demelier <markand@malikania.fr> parents: 0 diff changeset	92 /*
0 a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	93 * Concatenate the byte pointer into the buffer.
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	94 */
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	95
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	96 int
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	97 buffer_bcat(struct buffer buf, const void data, size_t size)
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	98 {
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	99 if (buffer_grow(buf, size) < 0)
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	100 return -1;
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	101
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	102 /* Do not truncate void pointer */
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	103 if (buf->flags & BUFFER_FIXED && size > (buf->size - buf->length - 1))
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	104 return -1;
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	105
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	106 memcpy(buf->data + buf->length, data, size);
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	107 buf->length += size;
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	108
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	109 return 0;
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	110 }
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	111
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	112 /*
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	113 * Print into the buffer using va_list from stdarg.h
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	114 */
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	115
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	116 int
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	117 buffer_vprintf(struct buffer buf, const char fmt, va_list ap)
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	118 {
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	119 va_list ap_save;
1 22d7bb03e569 for buffer: David Demelier <markand@malikania.fr> parents: 0 diff changeset	120 int nb, result = 1;
0 a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	121
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	122 /*
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	123 * vsnprintf on windows returns -1 instead of the number of bytes that
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	124 * should be printed...
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	125 */
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	126 if (buf->flags & BUFFER_AUTO) {
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	127 do {
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	128 va_copy(ap_save, ap);
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	129 nb = vsnprintf(buf->data + buf->length,
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	130 buf->size - buf->length - 1, fmt, ap_save);
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	131
1 22d7bb03e569 for buffer: David Demelier <markand@malikania.fr> parents: 0 diff changeset	132 if (nb == -1 \|\| nb >= buf->size - buf->length - 1) {
0 a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	133 if (buffer_grow(buf, buf->size + buf->bsize))
1 22d7bb03e569 for buffer: David Demelier <markand@malikania.fr> parents: 0 diff changeset	134 result = -1;
0 a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	135 } else
1 22d7bb03e569 for buffer: David Demelier <markand@malikania.fr> parents: 0 diff changeset	136 result = 0;
22d7bb03e569 for buffer: David Demelier <markand@malikania.fr> parents: 0 diff changeset	137 } while (result == 1);
22d7bb03e569 for buffer: David Demelier <markand@malikania.fr> parents: 0 diff changeset	138
22d7bb03e569 for buffer: David Demelier <markand@malikania.fr> parents: 0 diff changeset	139 va_end(ap_save);
22d7bb03e569 for buffer: David Demelier <markand@malikania.fr> parents: 0 diff changeset	140 } else {
22d7bb03e569 for buffer: David Demelier <markand@malikania.fr> parents: 0 diff changeset	141 result = 0;
0 a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	142 vsnprintf(buf->data + buf->length, buf->size - buf->length - 1,
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	143 fmt, ap);
1 22d7bb03e569 for buffer: David Demelier <markand@malikania.fr> parents: 0 diff changeset	144 }
0 a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	145
1 22d7bb03e569 for buffer: David Demelier <markand@malikania.fr> parents: 0 diff changeset	146 buf->length = strlen(buf->data);
0 a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	147
1 22d7bb03e569 for buffer: David Demelier <markand@malikania.fr> parents: 0 diff changeset	148 return result;
0 a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	149 }
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	150
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	151 /*
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	152 * Use printf(3) functions like to write into the buffer.
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	153 */
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	154
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	155 int
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	156 buffer_printf(struct buffer buf, const char fmt, ...)
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	157 {
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	158 va_list ap;
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	159 int status;
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	160
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	161 va_start(ap, fmt);
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	162 status = buffer_vprintf(buf, fmt, ap);
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	163 va_end(ap);
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	164
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	165 return status;
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	166 }
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	167
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	168 /*
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	169 * Reduce the data buffer to the exact size. Returns -1 on failure.
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	170 */
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	171
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	172 int
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	173 buffer_shrink(struct buffer *buf)
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	174 {
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	175 if (!(buf->data = realloc(buf->data, buf->length + 1)))
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	176 return -1;
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	177
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	178 buf->size = buf->length + 1;
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	179
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	180 return 0;
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	181 }
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	182
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	183 /*
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	184 * Returns the buffer data and then free the buffer object.
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	185 */
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	186
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	187 char *
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	188 buffer_end(struct buffer *buf)
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	189 {
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	190 char *data;
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	191
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	192 data = buf->data;
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	193 free(buf);
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	194
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	195 return data;
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	196 }
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	197
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	198 /*
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	199 * Reset the struct buffer.
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	200 */
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	201
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	202 void
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	203 buffer_clear(struct buffer *buf)
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	204 {
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	205 if (buf->data)
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	206 free(buf->data);
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	207
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	208 buf->length = 0;
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	209 buf->size = 0;
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	210 }
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	211
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	212 void
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	213 buffer_free(struct buffer *buf)
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	214 {
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	215 buffer_clear(buf);
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	216 free(buf);
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	217 }
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	218
1 22d7bb03e569 for buffer: David Demelier <markand@malikania.fr> parents: 0 diff changeset	219 /*
22d7bb03e569 for buffer: David Demelier <markand@malikania.fr> parents: 0 diff changeset	220 * Functions that tries to extend the buffer to the `needed' size if the buffer
22d7bb03e569 for buffer: David Demelier <markand@malikania.fr> parents: 0 diff changeset	221 * allows it. If the buffer is fixed size and there is not enough space the
22d7bb03e569 for buffer: David Demelier <markand@malikania.fr> parents: 0 diff changeset	222 * functions returns -1 otherwise 0 is returned.
22d7bb03e569 for buffer: David Demelier <markand@malikania.fr> parents: 0 diff changeset	223 */
22d7bb03e569 for buffer: David Demelier <markand@malikania.fr> parents: 0 diff changeset	224
0 a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	225 static int
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	226 buffer_grow(struct buffer *buf, size_t needed)
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	227 {
15 520939b40002 Do not increate buf->size on realloc failure David Demelier <markand@malikania.fr> parents: 5 diff changeset	228 size_t newlen;
520939b40002 Do not increate buf->size on realloc failure David Demelier <markand@malikania.fr> parents: 5 diff changeset	229
0 a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	230 if ((buf->size - buf->length) > needed)
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	231 return 0;
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	232
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	233 if (buf->flags & BUFFER_AUTO) {
15 520939b40002 Do not increate buf->size on realloc failure David Demelier <markand@malikania.fr> parents: 5 diff changeset	234 newlen = buf->size;
520939b40002 Do not increate buf->size on realloc failure David Demelier <markand@malikania.fr> parents: 5 diff changeset	235 while (newlen - buf->length - 1 < needed)
520939b40002 Do not increate buf->size on realloc failure David Demelier <markand@malikania.fr> parents: 5 diff changeset	236 newlen += buf->bsize;
0 a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	237
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	238 if (!(buf->data = realloc(buf->data, buf->size)))
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	239 return -1;
15 520939b40002 Do not increate buf->size on realloc failure David Demelier <markand@malikania.fr> parents: 5 diff changeset	240
520939b40002 Do not increate buf->size on realloc failure David Demelier <markand@malikania.fr> parents: 5 diff changeset	241 buf->size = newlen;
4 e19a50d6a5be Fix security if using bad flags David Demelier <markand@malikania.fr> parents: 1 diff changeset	242 } else
1 22d7bb03e569 for buffer: David Demelier <markand@malikania.fr> parents: 0 diff changeset	243 return (buf->bsize == buf->length) ? -1 : 0;
0 a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	244
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	245 memset(buf->data + buf->length, 0, buf->size - buf->length);
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	246
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	247 return 0;
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	248 }

Mercurial > code

annotate buffer.c @ 15:520939b40002