code: buffer.c annotate

annotate buffer.c @ 47:fea13579acbe

Some change in buffer

author	David Demelier <markand@malikania.fr>
date	Fri, 07 Oct 2011 16:10:33 +0200
parents	b71851428849
children	14c0b77f679b

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 /*
47 fea13579acbe Some change in buffer David Demelier <markand@malikania.fr> parents: 46 diff changeset	29 * Create a new buffer with initial size `length'. If type is set to BUFFER_AUTO
fea13579acbe Some change in buffer David Demelier <markand@malikania.fr> parents: 46 diff changeset	30 * the buffer will grow automatically increasing the size by `length' bytes. On
fea13579acbe Some change in buffer David Demelier <markand@malikania.fr> parents: 46 diff changeset	31 * BUFFER_FIXED type the buffer won't grow.
0 a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	32 */
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	33
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	34 struct buffer *
47 fea13579acbe Some change in buffer David Demelier <markand@malikania.fr> parents: 46 diff changeset	35 buffer_new(enum buffer_type type, int length)
0 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 struct buffer *buf;
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	38
28 904a373aa120 Buffer security fix. Also switched to == NULL statement instead of ! as David Demelier <markand@malikania.fr> parents: 21 diff changeset	39 if ((buf = malloc(sizeof (struct buffer))) == NULL)
0 a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	40 return NULL;
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	41
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	42 memset(buf, 0, sizeof (struct buffer));
47 fea13579acbe Some change in buffer David Demelier <markand@malikania.fr> parents: 46 diff changeset	43 buf->bsize = (length == 0) ? BUFFER_DEFAULT_BSIZE : length;
28 904a373aa120 Buffer security fix. Also switched to == NULL statement instead of ! as David Demelier <markand@malikania.fr> parents: 21 diff changeset	44 buf->size = buf->bsize + 1;
47 fea13579acbe Some change in buffer David Demelier <markand@malikania.fr> parents: 46 diff changeset	45 buf->type = type;
0 a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	46
28 904a373aa120 Buffer security fix. Also switched to == NULL statement instead of ! as David Demelier <markand@malikania.fr> parents: 21 diff changeset	47 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	48 free(buf);
904a373aa120 Buffer security fix. Also switched to == NULL statement instead of ! as David Demelier <markand@malikania.fr> parents: 21 diff changeset	49 return NULL;
904a373aa120 Buffer security fix. Also switched to == NULL statement instead of ! as David Demelier <markand@malikania.fr> parents: 21 diff changeset	50 }
904a373aa120 Buffer security fix. Also switched to == NULL statement instead of ! as David Demelier <markand@malikania.fr> parents: 21 diff changeset	51
0 a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	52 return buf;
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 /*
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	56 * Concatenate the string into the buffer.
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 int
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	60 buffer_strcat(struct buffer buf, const char str)
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 size_t length;
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	63
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	64 length = strlen(str);
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	65 if (buffer_grow(buf, length) < 0)
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	66 return -1;
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	67
47 fea13579acbe Some change in buffer David Demelier <markand@malikania.fr> parents: 46 diff changeset	68 if (buf->type == BUFFER_AUTO)
0 a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	69 length = buf->size - buf->length - 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 strncpy(buf->data + buf->length, str, length);
0 a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	72 buf->length = strlen(buf->data);
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	73
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	74 return 0;
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
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	77 /*
47 fea13579acbe Some change in buffer David Demelier <markand@malikania.fr> parents: 46 diff changeset	78 * Append the character `c' to the end of buffer.
1 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
22d7bb03e569 for buffer: David Demelier <markand@malikania.fr> parents: 0 diff changeset	81 int
22d7bb03e569 for buffer: David Demelier <markand@malikania.fr> parents: 0 diff changeset	82 buffer_putc(struct buffer *buf, char c)
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 if (buffer_grow(buf, 1) < 0)
22d7bb03e569 for buffer: David Demelier <markand@malikania.fr> parents: 0 diff changeset	85 return -1;
22d7bb03e569 for buffer: David Demelier <markand@malikania.fr> parents: 0 diff changeset	86
47 fea13579acbe Some change in buffer David Demelier <markand@malikania.fr> parents: 46 diff changeset	87 if (buf->type != BUFFER_AUTO && buf->size - buf->length - 1 <= 2)
21 ae4128d16c92 Improve security and FIXED size buffer David Demelier <markand@malikania.fr> parents: 15 diff changeset	88 return -1;
ae4128d16c92 Improve security and FIXED size buffer David Demelier <markand@malikania.fr> parents: 15 diff changeset	89
1 22d7bb03e569 for buffer: David Demelier <markand@malikania.fr> parents: 0 diff changeset	90 buf->data[buf->length++] = c;
22d7bb03e569 for buffer: David Demelier <markand@malikania.fr> parents: 0 diff changeset	91 buf->data[buf->length] = '\0';
22d7bb03e569 for buffer: David Demelier <markand@malikania.fr> parents: 0 diff changeset	92
22d7bb03e569 for buffer: David Demelier <markand@malikania.fr> parents: 0 diff changeset	93 return 0;
22d7bb03e569 for buffer: David Demelier <markand@malikania.fr> parents: 0 diff changeset	94 }
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 /*
0 a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	97 * Concatenate the byte pointer into the buffer.
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
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	100 int
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	101 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	102 {
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	103 if (buffer_grow(buf, size) < 0)
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 /* Do not truncate void pointer */
47 fea13579acbe Some change in buffer David Demelier <markand@malikania.fr> parents: 46 diff changeset	107 if (buf->type == BUFFER_AUTO && size > (buf->size - buf->length - 1))
0 a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	108 return -1;
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	109
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	110 memcpy(buf->data + buf->length, data, size);
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	111 buf->length += size;
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 return 0;
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 /*
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	117 * 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	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 int
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	121 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	122 {
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	123 va_list ap_save;
1 22d7bb03e569 for buffer: David Demelier <markand@malikania.fr> parents: 0 diff changeset	124 int nb, result = 1;
0 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 /*
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	127 * 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	128 * should be printed...
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	129 */
47 fea13579acbe Some change in buffer David Demelier <markand@malikania.fr> parents: 46 diff changeset	130 if (buf->type == BUFFER_AUTO) {
0 a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	131 do {
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	132 va_copy(ap_save, ap);
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	133 nb = vsnprintf(buf->data + buf->length,
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	134 buf->size - buf->length - 1, fmt, ap_save);
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	135
41 5252fa9b5cb1 Little update for buffer David Demelier <markand@malikania.fr> parents: 28 diff changeset	136 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	137 if (buffer_grow(buf, buf->size + buf->bsize))
1 22d7bb03e569 for buffer: David Demelier <markand@malikania.fr> parents: 0 diff changeset	138 result = -1;
0 a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	139 } else
1 22d7bb03e569 for buffer: David Demelier <markand@malikania.fr> parents: 0 diff changeset	140 result = 0;
22d7bb03e569 for buffer: David Demelier <markand@malikania.fr> parents: 0 diff changeset	141 } while (result == 1);
22d7bb03e569 for buffer: David Demelier <markand@malikania.fr> parents: 0 diff changeset	142
22d7bb03e569 for buffer: David Demelier <markand@malikania.fr> parents: 0 diff changeset	143 va_end(ap_save);
22d7bb03e569 for buffer: David Demelier <markand@malikania.fr> parents: 0 diff changeset	144 } else {
22d7bb03e569 for buffer: David Demelier <markand@malikania.fr> parents: 0 diff changeset	145 result = 0;
0 a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	146 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	147 fmt, ap);
1 22d7bb03e569 for buffer: David Demelier <markand@malikania.fr> parents: 0 diff changeset	148 }
0 a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	149
1 22d7bb03e569 for buffer: David Demelier <markand@malikania.fr> parents: 0 diff changeset	150 buf->length = strlen(buf->data);
0 a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	151
1 22d7bb03e569 for buffer: David Demelier <markand@malikania.fr> parents: 0 diff changeset	152 return result;
0 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 /*
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	156 * 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	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 int
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	160 buffer_printf(struct buffer buf, const char fmt, ...)
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 va_list ap;
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	163 int status;
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_start(ap, fmt);
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	166 status = buffer_vprintf(buf, fmt, ap);
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	167 va_end(ap);
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 return status;
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 /*
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	173 * 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	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 int
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	177 buffer_shrink(struct buffer *buf)
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	178 {
28 904a373aa120 Buffer security fix. Also switched to == NULL statement instead of ! as David Demelier <markand@malikania.fr> parents: 21 diff changeset	179 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	180 return -1;
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 buf->size = buf->length + 1;
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 return 0;
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 /*
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	188 * 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	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 char *
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	192 buffer_end(struct buffer *buf)
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 *data;
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	195
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	196 data = buf->data;
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	197 free(buf);
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 return data;
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 /*
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	203 * Reset the struct buffer.
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 void
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	207 buffer_clear(struct buffer *buf)
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	208 {
46 b71851428849 Better buffer_clear bis David Demelier <markand@malikania.fr> parents: 45 diff changeset	209 memset(buf->data, 0, buf->size);
0 a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	210 buf->length = 0;
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
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	213 void
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	214 buffer_free(struct buffer *buf)
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 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	217
86dbd57a39de Do not free data in buffer_clear, we may want reusing David Demelier <markand@malikania.fr> parents: 41 diff changeset	218 if (buf->data)
86dbd57a39de Do not free data in buffer_clear, we may want reusing David Demelier <markand@malikania.fr> parents: 41 diff changeset	219 free(buf->data);
86dbd57a39de Do not free data in buffer_clear, we may want reusing David Demelier <markand@malikania.fr> parents: 41 diff changeset	220
0 a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	221 free(buf);
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	222 }
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	223
1 22d7bb03e569 for buffer: David Demelier <markand@malikania.fr> parents: 0 diff changeset	224 /*
22d7bb03e569 for buffer: David Demelier <markand@malikania.fr> parents: 0 diff changeset	225 * 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	226 * 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	227 * functions returns -1 otherwise 0 is returned.
22d7bb03e569 for buffer: David Demelier <markand@malikania.fr> parents: 0 diff changeset	228 */
22d7bb03e569 for buffer: David Demelier <markand@malikania.fr> parents: 0 diff changeset	229
0 a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	230 static int
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	231 buffer_grow(struct buffer *buf, size_t needed)
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	232 {
15 520939b40002 Do not increate buf->size on realloc failure David Demelier <markand@malikania.fr> parents: 5 diff changeset	233 size_t newlen;
520939b40002 Do not increate buf->size on realloc failure David Demelier <markand@malikania.fr> parents: 5 diff changeset	234
0 a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	235 if ((buf->size - buf->length) > needed)
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	236 return 0;
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	237
47 fea13579acbe Some change in buffer David Demelier <markand@malikania.fr> parents: 46 diff changeset	238 if (buf->type == BUFFER_AUTO) {
15 520939b40002 Do not increate buf->size on realloc failure David Demelier <markand@malikania.fr> parents: 5 diff changeset	239 newlen = buf->size;
21 ae4128d16c92 Improve security and FIXED size buffer David Demelier <markand@malikania.fr> parents: 15 diff changeset	240 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	241 newlen += buf->bsize;
0 a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	242
28 904a373aa120 Buffer security fix. Also switched to == NULL statement instead of ! as David Demelier <markand@malikania.fr> parents: 21 diff changeset	243 if ((buf->data = realloc(buf->data, newlen)) == NULL)
0 a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	244 return -1;
15 520939b40002 Do not increate buf->size on realloc failure David Demelier <markand@malikania.fr> parents: 5 diff changeset	245
520939b40002 Do not increate buf->size on realloc failure David Demelier <markand@malikania.fr> parents: 5 diff changeset	246 buf->size = newlen;
21 ae4128d16c92 Improve security and FIXED size buffer David Demelier <markand@malikania.fr> parents: 15 diff changeset	247 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	248 }
0 a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	249
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	250 return 0;
a20beb164de8 Added buffer.c and buffer.h: David Demelier <markand@malikania.fr> parents: diff changeset	251 }

Mercurial > code

annotate buffer.c @ 47:fea13579acbe