bashclub/piler
1
0
Fork 0
mirror of https://bitbucket.org/jsuto/piler.git synced 2024-12-26 05:50:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

parser fixes

Browse Source
This commit is contained in:
SJ 2013-03-24 01:20:12 +01:00
parent ec4fdaba8b
commit 93696c2985
4 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/config.h
View File

@ -13,7 +13,7 @@
#define VERSION "0.1.23-master-branch" #define VERSION "0.1.23-master-branch"
#define BUILD 777 #define BUILD 782
#define HOSTID "mailarchiver" #define HOSTID "mailarchiver"

11
src/extract.c
View File

@ -45,6 +45,7 @@ void remove_xml(char *buf, int *html){
#ifdef HAVE_ZIP #ifdef HAVE_ZIP
int extract_opendocument(struct session_data *sdata, struct _state *state, char *filename, char *prefix){ int extract_opendocument(struct session_data *sdata, struct _state *state, char *filename, char *prefix){
int errorp, i=0, len=0, html=0; int errorp, i=0, len=0, html=0;
int len2;
char buf[MAXBUFSIZE]; char buf[MAXBUFSIZE];
struct zip *z; struct zip *z;
struct zip_stat sb; struct zip_stat sb;
@ -60,14 +61,14 @@ int extract_opendocument(struct session_data *sdata, struct _state *state, char
zf = zip_fopen_index(z, i, 0); zf = zip_fopen_index(z, i, 0);
if(zf){ if(zf){
while((len = zip_fread(zf, buf, sizeof(buf))) > 0){ while((len = zip_fread(zf, buf, sizeof(buf)-2)) > 0){
remove_xml(buf, &html); remove_xml(buf, &html);
len = strlen(buf); len2 = strlen(buf);
if(state->bodylen < BIGBUFSIZE-len-1){ if(len2 > 0 && state->bodylen < BIGBUFSIZE-len2-1){
memcpy(&(state->b_body[state->bodylen]), buf, len); memcpy(&(state->b_body[state->bodylen]), buf, len2);
state->bodylen += len; state->bodylen += len2;
} }
memset(buf, 0, sizeof(buf)); memset(buf, 0, sizeof(buf));

20
src/parser.c
View File

@ -320,19 +320,17 @@ int parse_line(char *buf, struct _state *state, struct session_data *sdata, int
if(state->is_header == 0 && buf[0] != ' ' && buf[0] != '\t') state->message_state = MSG_BODY; if(state->is_header == 0 && buf[0] != ' ' && buf[0] != '\t') state->message_state = MSG_BODY;
if((state->content_type_is_set == 0 || state->is_header == 1) && strncasecmp(buf, "Content-Type:", strlen("Content-Type:")) == 0) state->message_state = MSG_CONTENT_TYPE;
else if(strncasecmp(buf, "Content-Transfer-Encoding:", strlen("Content-Transfer-Encoding:")) == 0) state->message_state = MSG_CONTENT_TRANSFER_ENCODING;
else if(strncasecmp(buf, "Content-Disposition:", strlen("Content-Disposition:")) == 0) state->message_state = MSG_CONTENT_DISPOSITION;
if(state->message_state == MSG_CONTENT_TYPE || state->message_state == MSG_CONTENT_TRANSFER_ENCODING) state->is_header = 1;
/* header checks */ /* header checks */
if(state->is_header == 1){ if(state->is_header == 1){
if(strncasecmp(buf, "From:", strlen("From:")) == 0) state->message_state = MSG_FROM; if(strncasecmp(buf, "From:", strlen("From:")) == 0) state->message_state = MSG_FROM;
else if(strncasecmp(buf, "Content-Type:", strlen("Content-Type:")) == 0) state->message_state = MSG_CONTENT_TYPE;
else if(strncasecmp(buf, "Content-Transfer-Encoding:", strlen("Content-Transfer-Encoding:")) == 0) state->message_state = MSG_CONTENT_TRANSFER_ENCODING;
else if(strncasecmp(buf, "Content-Disposition:", strlen("Content-Disposition:")) == 0) state->message_state = MSG_CONTENT_DISPOSITION;
else if(strncasecmp(buf, "To:", 3) == 0) state->message_state = MSG_TO; else if(strncasecmp(buf, "To:", 3) == 0) state->message_state = MSG_TO;
else if(strncasecmp(buf, "Cc:", 3) == 0) state->message_state = MSG_CC; else if(strncasecmp(buf, "Cc:", 3) == 0) state->message_state = MSG_CC;
else if(strncasecmp(buf, "Bcc:", 4) == 0) state->message_state = MSG_CC; else if(strncasecmp(buf, "Bcc:", 4) == 0) state->message_state = MSG_CC;
@ -358,9 +356,11 @@ int parse_line(char *buf, struct _state *state, struct session_data *sdata, int
} }
if(state->message_state == MSG_CONTENT_TYPE){
if((p = strcasestr(buf, "boundary"))){ if((p = strcasestr(buf, "boundary"))){
extract_boundary(p, state); extract_boundary(p, state);
} }
}
if(state->message_state == MSG_BODY && sdata->ms_journal == 1 && strncasecmp(buf, "Recipient:", strlen("Recipient:")) == 0){ if(state->message_state == MSG_BODY && sdata->ms_journal == 1 && strncasecmp(buf, "Recipient:", strlen("Recipient:")) == 0){
@ -426,7 +426,7 @@ int parse_line(char *buf, struct _state *state, struct session_data *sdata, int
p++; p++;
if(*p == ' ' || *p == '\t') p++; if(*p == ' ' || *p == '\t') p++;
snprintf(state->type, TINYBUFSIZE-1, "%s", p); snprintf(state->type, TINYBUFSIZE-1, "%s", p);
state->content_type_is_set = 1; //state->content_type_is_set = 1;
p = strchr(state->type, ';'); p = strchr(state->type, ';');
if(p) *p = '\0'; if(p) *p = '\0';
} }
@ -476,7 +476,9 @@ int parse_line(char *buf, struct _state *state, struct session_data *sdata, int
boundary_line = is_item_on_string(state->boundaries, buf); boundary_line = is_item_on_string(state->boundaries, buf);
if(!strstr(buf, "boundary=") && !strstr(buf, "boundary =") && boundary_line == 1){ if(!strstr(buf, "boundary=") && !strstr(buf, "boundary =") && boundary_line == 1){
state->content_type_is_set = 0; state->is_header = 1;
//state->content_type_is_set = 0;
if(state->has_to_dump == 1){ if(state->has_to_dump == 1){
if(take_into_pieces == 1 && state->fd != -1){ if(take_into_pieces == 1 && state->fd != -1){

3
src/test.c
View File

@ -72,7 +72,10 @@ int main(int argc, char **argv){
snprintf(sdata.filename, SMALLBUFSIZE-1, "%s", argv[1]); snprintf(sdata.filename, SMALLBUFSIZE-1, "%s", argv[1]);
snprintf(sdata.tmpframe, SMALLBUFSIZE-1, "%s.m", argv[1]); snprintf(sdata.tmpframe, SMALLBUFSIZE-1, "%s.m", argv[1]);
printf("parsing...\n");
state = parse_message(&sdata, 1, &data, &cfg); state = parse_message(&sdata, 1, &data, &cfg);
printf("post parsing...\n");
post_parse(&sdata, &state, &cfg); post_parse(&sdata, &state, &cfg);
printf("message-id: %s\n", state.message_id); printf("message-id: %s\n", state.message_id);