From 84133598d00157f8129b99f4885171539bbfa8f5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rapha=C3=ABl=20Droz?= Date: Sun, 23 Sep 2012 15:43:24 +0200 Subject: [PATCH] vCard parser: handles the 'N'ame field as a fallback when no 'FN' is provided --- filter.c | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/filter.c b/filter.c index c5c69cf..7966f7e 100644 --- a/filter.c +++ b/filter.c @@ -1339,7 +1339,7 @@ palmcsv_parse_file(FILE *in) */ static char *vcard_fields[] = { - "FN", /* NAME */ + "FN", /* FORMATTED NAME */ "EMAIL", /* EMAIL */ "ADR", /* ADDRESS */ "ADR", /* ADDRESS2 - not used */ @@ -1354,6 +1354,7 @@ static char *vcard_fields[] = { "NICKNAME", /* NICK */ "URL", /* URL */ "NOTE", /* NOTES */ + "N", /* NAME: special case/mapping in vcard_parse_line() */ NULL /* not implemented: ANNIVERSARY, ITEM_FIELDS */ }; @@ -1483,6 +1484,28 @@ vcard_parse_address(list_item item, char *line) xfree(value); } +static void +vcard_parse_name(list_item item, char *line) +{ + // store the "N" field into "NAME" *if* no "FN:" + // value has already been stored here + if(item[0]) return; + + int i = -1; + item[0] = vcard_get_line_element(line, VCARD_VALUE); + // "N:" can be multivalued => replace ';' separators by ' ' + while(item[0][++i]) if(item[0][i] == ';') item[0][i] = ' '; + + // http://www.daniweb.com/software-development/c/code/216919 + char *original = item[0], *p = original; + int trimmed = 0; + do { + if (*original != ' ' || trimmed) { + trimmed = 1; *p++ = *original; + } + } while(*original++); +} + static void vcard_parse_phone(list_item item, char *line) { @@ -1534,6 +1557,8 @@ vcard_parse_line(list_item item, char *line) vcard_parse_address(item, line); else if(0 == strcmp(key, "TEL")) vcard_parse_phone(item, line); + else if(0 == strcmp(key, "N")) + vcard_parse_name(item, line); else item[i] = vcard_get_line_element(line, VCARD_VALUE); return; -- 2.39.2