DeforaOS/Phone
DeforaOS/Phone
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Convert the phone book names from the GSM alphabet to ISO

Browse Source
This commit is contained in:
Pierre Pronchery 2014-09-17 18:25:00 +02:00
parent bd3ba6534d
commit 712b6cffc9
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/modems/hayes.c
View File

@ -221,6 +221,7 @@ static char * _hayes_message_to_pdu(Hayes * hayes, HayesChannel * channel,
/* conversions */ /* conversions */
static unsigned char _hayes_convert_char_to_iso(unsigned char c); static unsigned char _hayes_convert_char_to_iso(unsigned char c);
static char * _hayes_convert_number_to_address(char const * number); static char * _hayes_convert_number_to_address(char const * number);
static void _hayes_convert_string_to_iso(char * str);
/* parser */ /* parser */
static int _hayes_parse(Hayes * hayes, HayesChannel * channel); static int _hayes_parse(Hayes * hayes, HayesChannel * channel);
@ -1000,6 +1001,17 @@ static char * _hayes_convert_number_to_address(char const * number)
} }
/* hayes_convert_string_to_iso */
static void _hayes_convert_string_to_iso(char * str)
{
unsigned char * ustr = (unsigned char *)str;
size_t i;
for(i = 0; str[i] != '\0'; i++)
ustr[i] = _hayes_convert_char_to_iso(ustr[i]);
}
/* parser */ /* parser */
/* hayes_parse */ /* hayes_parse */
static int _parse_do(Hayes * hayes, HayesChannel * channel); static int _parse_do(Hayes * hayes, HayesChannel * channel);
@ -3793,14 +3805,15 @@ static void _on_code_cpbr(HayesChannel * channel, char const * answer)
channel->contact_number = strdup(number); channel->contact_number = strdup(number);
event->contact.number = channel->contact_number; event->contact.number = channel->contact_number;
name[sizeof(name) - 1] = '\0'; name[sizeof(name) - 1] = '\0';
#if 1 /* FIXME is it really always in ISO-8859-1? */ #if 1 /* FIXME is it really always in GSM? */
_hayes_convert_string_to_iso(name);
#endif
if((p = g_convert(name, -1, "UTF-8", "ISO-8859-1", NULL, NULL, NULL)) if((p = g_convert(name, -1, "UTF-8", "ISO-8859-1", NULL, NULL, NULL))
!= NULL) != NULL)
{ {
snprintf(name, sizeof(name), "%s", p); snprintf(name, sizeof(name), "%s", p);
g_free(p); g_free(p);
} }
#endif
free(channel->contact_name); free(channel->contact_name);
channel->contact_name = strdup(name); channel->contact_name = strdup(name);
event->contact.name = channel->contact_name; event->contact.name = channel->contact_name;