subject reading fix

This commit is contained in:
SJ 2012-10-02 15:21:16 +02:00
parent 54d78670e1
commit 040394ec69
2 changed files with 11 additions and 3 deletions

View File

@ -13,7 +13,7 @@
#define VERSION "0.1.21" #define VERSION "0.1.21"
#define BUILD 711 #define BUILD 712
#define HOSTID "mailarchiver" #define HOSTID "mailarchiver"

View File

@ -393,7 +393,10 @@ int parse_line(char *buf, struct _state *state, struct session_data *sdata, int
if(state->is_1st_header == 1 && state->message_state == MSG_SUBJECT && strlen(state->b_subject) + strlen(buf) < MAXBUFSIZE-1){ if(state->is_1st_header == 1 && state->message_state == MSG_SUBJECT && strlen(state->b_subject) + strlen(buf) < MAXBUFSIZE-1){
if(state->b_subject[0] == '\0'){ if(state->b_subject[0] == '\0'){
strncat(state->b_subject, buf+strlen("Subject:"), MAXBUFSIZE-1); p = &buf[0];
if(strncmp(buf, "Subject:", strlen("Subject:")) == 0) p += strlen("Subject:");
strncat(state->b_subject, p, MAXBUFSIZE-1);
} }
else { else {
@ -588,7 +591,12 @@ int parse_line(char *buf, struct _state *state, struct session_data *sdata, int
if(does_it_seem_like_an_email_address(puf) == 1){ if(does_it_seem_like_an_email_address(puf) == 1){
q = strchr(puf, '@'); q = strchr(puf, '@');
if(q) memcpy(&(state->b_from_domain[strlen(state->b_from_domain)]), q+1, len); if(q){
memcpy(&(state->b_from_domain[strlen(state->b_from_domain)]), q+1, len);
/*if(strstr(sdata->mailfrom, "<>")){
}*/
}
if(is_email_address_on_my_domains(puf, cfg) == 1) sdata->internal_sender = 1; if(is_email_address_on_my_domains(puf, cfg) == 1) sdata->internal_sender = 1;