code: buffer.c annotate

annotate buffer.c @ 46:b71851428849

Better buffer_clear bis

author	David Demelier <markand@malikania.fr>
date	Wed, 05 Oct 2011 19:46:31 +0200
parents	86dbd57a39de
children	fea13579acbe

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
28 904a373aa120 Buffer security fix. Also switched to == NULL statement instead of ! as David Demelier <markand@malikania.fr> parents: 21 diff changeset	37 if ((buf = malloc(sizeof (struct buffer))) == NULL)
0 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;
28 904a373aa120 Buffer security fix. Also switched to == NULL statement instead of ! as David Demelier <markand@malikania.fr> parents: 21 diff changeset	42 buf->size = buf->bsize + 1;
0 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
28 904a373aa120 Buffer security fix. Also switched to == NULL statement instead of ! as David Demelier <markand@malikania.fr> parents: 21 diff changeset	45 if ((buf->data = calloc(buf->size, 1)) == NULL) {
904a373aa120 Buffer security fix. Also switched to == NULL statement instead of ! as David Demelier <markand@malikania.fr> parents: 21 diff changeset	46 free(buf);
904a373aa120 Buffer security fix. Also switched to == NULL statement instead of ! as David Demelier <markand@malikania.fr> parents: 21 diff changeset	47 return NULL;
904a373aa120 Buffer security fix. Also switched to == NULL statement instead of ! as David Demelier <markand@malikania.fr> parents: 21 diff changeset	48 }
904a373aa120 Buffer security fix. Also switched to == NULL statement instead of ! as David Demelier <markand@malikania.fr> parents: 21 diff changeset	49
904a373aa120 Buffer security fix. Also switched to == NULL statement instead of ! as David Demelier <markand@malikania.fr> parents: 21 diff changeset	50 if (str != NULL && buffer_strcat(buf, str) < 0) {
0 a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	51 free(buf);
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	52 return NULL;
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 return buf;
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 /*
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	59 * Concatenate the string into the buffer.
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
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	62 int
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	63 buffer_strcat(struct buffer buf, const char str)
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	64 {
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	65 size_t length;
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 length = strlen(str);
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	68 if (buffer_grow(buf, length) < 0)
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	69 return -1;
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	70
21 ae4128d16c92 Improve security and FIXED size buffer David Demelier <markand@malikania.fr> parents: 15 diff changeset	71 if (!(buf->flags & BUFFER_AUTO))
0 a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	72 length = buf->size - buf->length - 1;
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	73
21 ae4128d16c92 Improve security and FIXED size buffer David Demelier <markand@malikania.fr> parents: 15 diff changeset	74 strncpy(buf->data + buf->length, str, length);
0 a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	75 buf->length = strlen(buf->data);
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	76
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	77 return 0;
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	78 }
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	79
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	80 /*
1 22d7bb03e569 for buffer: David Demelier <markand@malikania.fr> parents: 0 diff changeset	81 * Append the character c to the end of buffer.
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
22d7bb03e569 for buffer: David Demelier <markand@malikania.fr> parents: 0 diff changeset	84 int
22d7bb03e569 for buffer: David Demelier <markand@malikania.fr> parents: 0 diff changeset	85 buffer_putc(struct buffer *buf, char c)
22d7bb03e569 for buffer: David Demelier <markand@malikania.fr> parents: 0 diff changeset	86 {
22d7bb03e569 for buffer: David Demelier <markand@malikania.fr> parents: 0 diff changeset	87 if (buffer_grow(buf, 1) < 0)
22d7bb03e569 for buffer: David Demelier <markand@malikania.fr> parents: 0 diff changeset	88 return -1;
22d7bb03e569 for buffer: David Demelier <markand@malikania.fr> parents: 0 diff changeset	89
21 ae4128d16c92 Improve security and FIXED size buffer David Demelier <markand@malikania.fr> parents: 15 diff changeset	90 if (!(buf->flags & BUFFER_AUTO) && buf->size - buf->length - 1 <= 2)
ae4128d16c92 Improve security and FIXED size buffer David Demelier <markand@malikania.fr> parents: 15 diff changeset	91 return -1;
ae4128d16c92 Improve security and FIXED size buffer David Demelier <markand@malikania.fr> parents: 15 diff changeset	92
1 22d7bb03e569 for buffer: David Demelier <markand@malikania.fr> parents: 0 diff changeset	93 buf->data[buf->length++] = c;
22d7bb03e569 for buffer: David Demelier <markand@malikania.fr> parents: 0 diff changeset	94 buf->data[buf->length] = '\0';
22d7bb03e569 for buffer: David Demelier <markand@malikania.fr> parents: 0 diff changeset	95
22d7bb03e569 for buffer: David Demelier <markand@malikania.fr> parents: 0 diff changeset	96 return 0;
22d7bb03e569 for buffer: David Demelier <markand@malikania.fr> parents: 0 diff changeset	97 }
22d7bb03e569 for buffer: David Demelier <markand@malikania.fr> parents: 0 diff changeset	98
22d7bb03e569 for buffer: David Demelier <markand@malikania.fr> parents: 0 diff changeset	99 /*
0 a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	100 * Concatenate the byte pointer into the buffer.
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
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	103 int
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	104 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	105 {
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	106 if (buffer_grow(buf, size) < 0)
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	107 return -1;
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 /* Do not truncate void pointer */
21 ae4128d16c92 Improve security and FIXED size buffer David Demelier <markand@malikania.fr> parents: 15 diff changeset	110 if (!(buf->flags & BUFFER_AUTO) && size > (buf->size - buf->length - 1))
0 a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	111 return -1;
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 memcpy(buf->data + buf->length, data, size);
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	114 buf->length += size;
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 return 0;
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	117 }
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 /*
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	120 * 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	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 int
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	124 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	125 {
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	126 va_list ap_save;
1 22d7bb03e569 for buffer: David Demelier <markand@malikania.fr> parents: 0 diff changeset	127 int nb, result = 1;
0 a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	128
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	129 /*
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	130 * 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	131 * should be printed...
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	132 */
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	133 if (buf->flags & BUFFER_AUTO) {
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	134 do {
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	135 va_copy(ap_save, ap);
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	136 nb = vsnprintf(buf->data + buf->length,
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	137 buf->size - buf->length - 1, fmt, ap_save);
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	138
41 5252fa9b5cb1 Little update for buffer David Demelier <markand@malikania.fr> parents: 28 diff changeset	139 if (nb == -1 \|\| (size_t) nb >= buf->size - buf->length - 1) {
0 a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	140 if (buffer_grow(buf, buf->size + buf->bsize))
1 22d7bb03e569 for buffer: David Demelier <markand@malikania.fr> parents: 0 diff changeset	141 result = -1;
0 a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	142 } else
1 22d7bb03e569 for buffer: David Demelier <markand@malikania.fr> parents: 0 diff changeset	143 result = 0;
22d7bb03e569 for buffer: David Demelier <markand@malikania.fr> parents: 0 diff changeset	144 } while (result == 1);
22d7bb03e569 for buffer: David Demelier <markand@malikania.fr> parents: 0 diff changeset	145
22d7bb03e569 for buffer: David Demelier <markand@malikania.fr> parents: 0 diff changeset	146 va_end(ap_save);
22d7bb03e569 for buffer: David Demelier <markand@malikania.fr> parents: 0 diff changeset	147 } else {
22d7bb03e569 for buffer: David Demelier <markand@malikania.fr> parents: 0 diff changeset	148 result = 0;
0 a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	149 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	150 fmt, ap);
1 22d7bb03e569 for buffer: David Demelier <markand@malikania.fr> parents: 0 diff changeset	151 }
0 a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	152
1 22d7bb03e569 for buffer: David Demelier <markand@malikania.fr> parents: 0 diff changeset	153 buf->length = strlen(buf->data);
0 a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	154
1 22d7bb03e569 for buffer: David Demelier <markand@malikania.fr> parents: 0 diff changeset	155 return result;
0 a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	156 }
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 /*
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	159 * 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	160 */
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	161
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	162 int
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	163 buffer_printf(struct buffer buf, const char fmt, ...)
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 va_list ap;
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	166 int status;
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 va_start(ap, fmt);
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	169 status = buffer_vprintf(buf, fmt, ap);
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	170 va_end(ap);
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 return status;
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	173 }
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 /*
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	176 * 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	177 */
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	178
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	179 int
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	180 buffer_shrink(struct buffer *buf)
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	181 {
28 904a373aa120 Buffer security fix. Also switched to == NULL statement instead of ! as David Demelier <markand@malikania.fr> parents: 21 diff changeset	182 if ((buf->data = realloc(buf->data, buf->length + 1)) == NULL)
0 a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	183 return -1;
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	184
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	185 buf->size = buf->length + 1;
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 return 0;
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	188 }
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 /*
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	191 * 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	192 */
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	193
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	194 char *
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	195 buffer_end(struct buffer *buf)
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 char *data;
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 data = buf->data;
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	200 free(buf);
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 return data;
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	203 }
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 /*
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	206 * Reset the struct buffer.
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
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	209 void
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	210 buffer_clear(struct buffer *buf)
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	211 {
46 b71851428849 Better buffer_clear bis David Demelier <markand@malikania.fr> parents: 45 diff changeset	212 memset(buf->data, 0, buf->size);
0 a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	213 buf->length = 0;
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
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	216 void
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	217 buffer_free(struct buffer *buf)
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	218 {
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	219 buffer_clear(buf);
45 86dbd57a39de Do not free data in buffer_clear, we may want reusing David Demelier <markand@malikania.fr> parents: 41 diff changeset	220
86dbd57a39de Do not free data in buffer_clear, we may want reusing David Demelier <markand@malikania.fr> parents: 41 diff changeset	221 if (buf->data)
86dbd57a39de Do not free data in buffer_clear, we may want reusing David Demelier <markand@malikania.fr> parents: 41 diff changeset	222 free(buf->data);
86dbd57a39de Do not free data in buffer_clear, we may want reusing David Demelier <markand@malikania.fr> parents: 41 diff changeset	223
0 a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	224 free(buf);
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	225 }
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	226
1 22d7bb03e569 for buffer: David Demelier <markand@malikania.fr> parents: 0 diff changeset	227 /*
22d7bb03e569 for buffer: David Demelier <markand@malikania.fr> parents: 0 diff changeset	228 * 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	229 * 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	230 * functions returns -1 otherwise 0 is returned.
22d7bb03e569 for buffer: David Demelier <markand@malikania.fr> parents: 0 diff changeset	231 */
22d7bb03e569 for buffer: David Demelier <markand@malikania.fr> parents: 0 diff changeset	232
0 a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	233 static int
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	234 buffer_grow(struct buffer *buf, size_t needed)
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	235 {
15 520939b40002 Do not increate buf->size on realloc failure David Demelier <markand@malikania.fr> parents: 5 diff changeset	236 size_t newlen;
520939b40002 Do not increate buf->size on realloc failure David Demelier <markand@malikania.fr> parents: 5 diff changeset	237
0 a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	238 if ((buf->size - buf->length) > needed)
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	239 return 0;
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	240
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	241 if (buf->flags & BUFFER_AUTO) {
15 520939b40002 Do not increate buf->size on realloc failure David Demelier <markand@malikania.fr> parents: 5 diff changeset	242 newlen = buf->size;
21 ae4128d16c92 Improve security and FIXED size buffer David Demelier <markand@malikania.fr> parents: 15 diff changeset	243 while (newlen - buf->length - 1 <= needed)
15 520939b40002 Do not increate buf->size on realloc failure David Demelier <markand@malikania.fr> parents: 5 diff changeset	244 newlen += buf->bsize;
0 a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	245
28 904a373aa120 Buffer security fix. Also switched to == NULL statement instead of ! as David Demelier <markand@malikania.fr> parents: 21 diff changeset	246 if ((buf->data = realloc(buf->data, newlen)) == NULL)
0 a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	247 return -1;
15 520939b40002 Do not increate buf->size on realloc failure David Demelier <markand@malikania.fr> parents: 5 diff changeset	248
520939b40002 Do not increate buf->size on realloc failure David Demelier <markand@malikania.fr> parents: 5 diff changeset	249 buf->size = newlen;
21 ae4128d16c92 Improve security and FIXED size buffer David Demelier <markand@malikania.fr> parents: 15 diff changeset	250 memset(buf->data + buf->length, 0, buf->size - buf->length);
ae4128d16c92 Improve security and FIXED size buffer David Demelier <markand@malikania.fr> parents: 15 diff changeset	251 }
0 a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	252
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	253 return 0;
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	254 }

Mercurial > code

annotate buffer.c @ 46:b71851428849