foxiepaws
/
weechat
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed string_explode function, when string ends with separator(s)

v2.8-utf8proc
Sebastien Helleu 2008-03-13 22:50:01 +01:00
parent 88133a7b9a
commit 5d740b882c
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/core/wee-string.c
View File

@ -448,16 +448,18 @@ string_explode (char *string, char *separators, int keep_eol,
while ((ptr = strpbrk (ptr, separators)))
{
while (ptr[0] && (strchr (separators, ptr[0]) != NULL))
{
ptr++;
i++;
}
if (ptr[0])
i++;
}
n_items = i;
if ((num_items_max != 0) && (n_items > num_items_max))
n_items = num_items_max;
array =
(char **)malloc ((n_items + 1) * sizeof (char *));
array = (char **)malloc ((n_items + 1) * sizeof (char *));
ptr1 = string;
ptr2 = string;
@ -465,11 +467,19 @@ string_explode (char *string, char *separators, int keep_eol,
for (i = 0; i < n_items; i++)
{
while (ptr1[0] && (strchr (separators, ptr1[0]) != NULL))
{
ptr1++;
}
if (i == (n_items - 1) || (ptr2 = strpbrk (ptr1, separators)) == NULL)
{
if ((ptr2 = strchr (ptr1, '\r')) == NULL)
{
if ((ptr2 = strchr (ptr1, '\n')) == NULL)
{
ptr2 = strchr (ptr1, '\0');
}
}
}
if ((ptr1 == NULL) || (ptr2 == NULL))
{
@ -480,7 +490,9 @@ string_explode (char *string, char *separators, int keep_eol,
if (ptr2 - ptr1 > 0)
{
if (keep_eol)
{
array[i] = strdup (ptr1);
}
else
{
array[i] =