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

Passing more tests

Browse Source
This commit is contained in:
Pierre Pronchery 2012-10-16 03:22:06 +00:00
parent cf78ad6d03
commit d6edbc2e0c
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/helper.c
View File

@ -47,6 +47,7 @@ char * mailer_helper_get_email(char const * header)
return ret; return ret;
} }
if(sscanf(header, "%[^(](%[^)])", ret, buf) == 2 if(sscanf(header, "%[^(](%[^)])", ret, buf) == 2
|| sscanf(header, "<%[^>]>", ret) == 1
|| sscanf(header, "%[^<]<%[^>]>", buf, ret) == 2) || sscanf(header, "%[^<]<%[^>]>", buf, ret) == 2)
{ {
for(len = strlen(ret); len > 0 && isblank(ret[len - 1]); len--) for(len = strlen(ret); len > 0 && isblank(ret[len - 1]); len--)
@ -80,7 +81,14 @@ char * mailer_helper_get_name(char const * header)
free(ret); free(ret);
return NULL; return NULL;
} }
if(mailer_helper_is_email(header))
{
strcpy(ret, header);
free(buf);
return ret;
}
if(sscanf(header, "%[^(](%[^)])", buf, ret) != 2 if(sscanf(header, "%[^(](%[^)])", buf, ret) != 2
&& sscanf(header, "<%[^>]>", ret) != 1
&& sscanf(header, "%[^<]<%[^>]>", ret, buf) != 2) && sscanf(header, "%[^<]<%[^>]>", ret, buf) != 2)
{ {
free(buf); free(buf);