security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-02 22:46:30 +02:00
Code Activity

common: New function split_fields_colon.

Browse source 
* 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:
Werner Koch 2017-07-17 13:00:44 +02:00
parent 58eafd11ed
commit 849467870e
No known key found for this signature in database
GPG key ID: E3FDFF218E45B72B
3 changed files with 116 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

76
common/t-stringhelp.c
View file

@ -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 *
stresc (char *s)
{
@ -996,6 +1071,7 @@ main (int argc, char **argv)
test_strsplit ();
test_strtokenize ();
test_split_fields ();
test_split_fields_colon ();
test_compare_version_strings ();
test_format_text ();