kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-08-14 01:49:05 +00:00
Code Issues Projects Releases Wiki Activity

FS-4614 --resolve update to dynamic line buffer and use internal buffering to boot for file I/O on preprocessing XML

Browse Source
This commit is contained in:
Anthony Minessale
2012-09-18 15:39:23 -05:00
parent 1b2b456510
commit c5204c2128
4 changed files with 163 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

97
src/switch_utils.c
View File

@@ -453,6 +453,103 @@ SWITCH_DECLARE(switch_size_t) switch_fd_read_line(int fd, char *buf, switch_size
return total;
}
#define DLINE_BLOCK_SIZE 1024
#define DLINE_MAX_SIZE 1048576
SWITCH_DECLARE(switch_size_t) switch_fd_read_dline(int fd, char **buf, switch_size_t *len)
{
char c, *p;
int cur;
switch_size_t total = 0;
char *data = *buf;
switch_size_t ilen = *len;
if (!data) {
*len = ilen = DLINE_BLOCK_SIZE;
data = malloc(ilen);
memset(data, 0, ilen);
}
p = data;
while ((cur = read(fd, &c, 1)) == 1) {
if (total + 2 >= ilen) {
if (ilen + DLINE_BLOCK_SIZE > DLINE_MAX_SIZE) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Single line limit reached!\n");
break;
}
ilen += DLINE_BLOCK_SIZE;
data = realloc(data, ilen);
switch_assert(data);
p = data + total;
}
total += cur;
*p++ = c;
if (c == '\r' || c == '\n') {
break;
}
}
*p++ = '\0';
*len = ilen;
*buf = data;
return total;
}
SWITCH_DECLARE(switch_size_t) switch_fp_read_dline(FILE *fd, char **buf, switch_size_t *len)
{
char c, *p;
switch_size_t total = 0;
char *data = *buf;
switch_size_t ilen = *len;
if (!data) {
*len = ilen = DLINE_BLOCK_SIZE;
data = malloc(ilen);
memset(data, 0, ilen);
}
p = data;
//while ((c = fgetc(fd)) != EOF) {
while (fread(&c, 1, 1, fd) == 1) {
if (total + 2 >= ilen) {
if (ilen + DLINE_BLOCK_SIZE > DLINE_MAX_SIZE) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Single line limit reached!\n");
break;
}
ilen += DLINE_BLOCK_SIZE;
data = realloc(data, ilen);
switch_assert(data);
p = data + total;
}
total++;
*p++ = c;
if (c == '\r' || c == '\n') {
break;
}
}
*p++ = '\0';
*len = ilen;
*buf = data;
return total;
}
SWITCH_DECLARE(char *) switch_amp_encode(char *s, char *buf, switch_size_t len)
{
char *p, *q;