mirror of git://git.gnupg.org/gnupg.git
common: New function split_fields_colon.
* common/stringhelp.c (split_fields_colon): New. * common/t-stringhelp.c (test_split_fields_colon): New test. (main): Call that test. Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
parent
58eafd11ed
commit
849467870e
|
@ -1339,6 +1339,42 @@ split_fields (char *string, char **array, int arraysize)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/* Split a string into colon delimited fields A pointer to each field
|
||||||
|
* is stored in ARRAY. Stop splitting at ARRAYSIZE fields. The
|
||||||
|
* function modifies STRING. The number of parsed fields is returned.
|
||||||
|
* Note that leading and trailing spaces are not removed from the fields.
|
||||||
|
* Example:
|
||||||
|
*
|
||||||
|
* char *fields[2];
|
||||||
|
* if (split_fields (string, fields, DIM (fields)) < 2)
|
||||||
|
* return // Not enough args.
|
||||||
|
* foo (fields[0]);
|
||||||
|
* foo (fields[1]);
|
||||||
|
*/
|
||||||
|
int
|
||||||
|
split_fields_colon (char *string, char **array, int arraysize)
|
||||||
|
{
|
||||||
|
int n = 0;
|
||||||
|
char *p, *pend;
|
||||||
|
|
||||||
|
p = string;
|
||||||
|
do
|
||||||
|
{
|
||||||
|
if (n == arraysize)
|
||||||
|
break;
|
||||||
|
array[n++] = p;
|
||||||
|
pend = strchr (p, ':');
|
||||||
|
if (!pend)
|
||||||
|
break;
|
||||||
|
*pend++ = 0;
|
||||||
|
p = pend;
|
||||||
|
}
|
||||||
|
while (*p);
|
||||||
|
|
||||||
|
return n;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/* Version number parsing. */
|
/* Version number parsing. */
|
||||||
|
|
||||||
|
|
|
@ -151,6 +151,10 @@ char **strtokenize (const char *string, const char *delim);
|
||||||
* provided ARRAY. */
|
* provided ARRAY. */
|
||||||
int split_fields (char *string, char **array, int arraysize);
|
int split_fields (char *string, char **array, int arraysize);
|
||||||
|
|
||||||
|
/* Split STRING into colon delimited fields and store them in the
|
||||||
|
* provided ARRAY. */
|
||||||
|
int split_fields_colon (char *string, char **array, int arraysize);
|
||||||
|
|
||||||
/* Return True if MYVERSION is greater or equal than REQ_VERSION. */
|
/* Return True if MYVERSION is greater or equal than REQ_VERSION. */
|
||||||
int compare_version_strings (const char *my_version, const char *req_version);
|
int compare_version_strings (const char *my_version, const char *req_version);
|
||||||
|
|
||||||
|
|
|
@ -761,6 +761,81 @@ test_split_fields (void)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
static void
|
||||||
|
test_split_fields_colon (void)
|
||||||
|
{
|
||||||
|
struct {
|
||||||
|
const char *s;
|
||||||
|
int nfields;
|
||||||
|
const char *fields_expected[10];
|
||||||
|
} tv[] = {
|
||||||
|
{
|
||||||
|
"a:bc:cde:fghi:jklmn: foo ", 6,
|
||||||
|
{ "a", "bc", "cde", "fghi", "jklmn", " foo ", NULL }
|
||||||
|
},
|
||||||
|
{
|
||||||
|
" a:bc: def ", 2,
|
||||||
|
{ " a", "bc", NULL }
|
||||||
|
},
|
||||||
|
{
|
||||||
|
" a:bc :def ", 3,
|
||||||
|
{ " a", "bc ", "def ", NULL }
|
||||||
|
},
|
||||||
|
{
|
||||||
|
" a:bc: def ", 4,
|
||||||
|
{ " a", "bc", " def ", NULL }
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"", 0,
|
||||||
|
{ NULL }
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
int tidx;
|
||||||
|
char *fields[10];
|
||||||
|
int field_count_expected, nfields, field_count, i;
|
||||||
|
char *s2;
|
||||||
|
|
||||||
|
for (tidx = 0; tidx < DIM(tv); tidx++)
|
||||||
|
{
|
||||||
|
nfields = tv[tidx].nfields;
|
||||||
|
assert (nfields <= DIM (fields));
|
||||||
|
|
||||||
|
/* Count the fields. */
|
||||||
|
for (field_count_expected = 0;
|
||||||
|
tv[tidx].fields_expected[field_count_expected];
|
||||||
|
field_count_expected ++)
|
||||||
|
;
|
||||||
|
if (field_count_expected > nfields)
|
||||||
|
field_count_expected = nfields;
|
||||||
|
|
||||||
|
/* We need to copy s since split_fields modifies in place. */
|
||||||
|
s2 = xstrdup (tv[tidx].s);
|
||||||
|
field_count = split_fields_colon (s2, fields, nfields);
|
||||||
|
|
||||||
|
if (field_count != field_count_expected)
|
||||||
|
{
|
||||||
|
printf ("%s: tidx %d: expected %d, got %d\n",
|
||||||
|
__func__, tidx, field_count_expected, field_count);
|
||||||
|
fail (tidx * 1000);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
for (i = 0; i < field_count_expected; i ++)
|
||||||
|
if (strcmp (tv[tidx].fields_expected[i], fields[i]))
|
||||||
|
{
|
||||||
|
printf ("%s: tidx %d, field %d: expected '%s', got '%s'\n",
|
||||||
|
__func__,
|
||||||
|
tidx, i, tv[tidx].fields_expected[i], fields[i]);
|
||||||
|
fail (tidx * 1000 + i + 1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
xfree (s2);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
static char *
|
static char *
|
||||||
stresc (char *s)
|
stresc (char *s)
|
||||||
{
|
{
|
||||||
|
@ -996,6 +1071,7 @@ main (int argc, char **argv)
|
||||||
test_strsplit ();
|
test_strsplit ();
|
||||||
test_strtokenize ();
|
test_strtokenize ();
|
||||||
test_split_fields ();
|
test_split_fields ();
|
||||||
|
test_split_fields_colon ();
|
||||||
test_compare_version_strings ();
|
test_compare_version_strings ();
|
||||||
test_format_text ();
|
test_format_text ();
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue