X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=mymail.c;h=88e09549769aa819540c9571d11047eea49287e5;hb=93e55a350d0053c490a31e4a671925eb9c2fb6ee;hp=b114e8b0d057b1118012bbb42f07eaf0bf153c09;hpb=3702c6913e188ff3a7f7904a882c2737d3651ff6;p=mymail.git diff --git a/mymail.c b/mymail.c index b114e8b..88e0954 100644 --- a/mymail.c +++ b/mymail.c @@ -45,17 +45,26 @@ #include #define MYMAIL_DB_MAGIC_TOKEN "mymail_index_file" -#define VERSION "0.1" +#define VERSION "0.9" -#define MAX_NB_SEARCH_PATTERNS 10 +#define MAX_NB_SEARCH_REQUESTS 10 #define BUFFER_SIZE 65536 +char *db_filename; +char *db_root_path; + +int paranoid; +int action_index; + +/********************************************************************/ + enum { - ID_MAIL, + ID_MAIL = 0, ID_FROM, - ID_DEST, + ID_TO, ID_SUBJECT, + ID_DATE, ID_PARTICIPANT, MAX_ID }; @@ -63,28 +72,60 @@ enum { static char *field_names[] = { "mail", "from", - "dest", + "to", "subject", + "date", "part" }; +/********************************************************************/ + struct search_request { int field_id; int negation; regex_t regexp; }; +/********************************************************************/ + struct parsable_field { int id; char *regexp_string; regex_t regexp; }; -char *db_filename; -char *db_root_path; +static struct parsable_field fields_to_parse[] = { + { + ID_FROM, + "^\\(From \\|[Ff][Rr][Oo][Mm]:\\|[R][r][E][e][P][p][L][l][Y][y]-[T][t][O][o]:\\)", + { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } + }, -int paranoid; -int action_index; + { + ID_TO, + "^\\([Tt][Oo]\\|[Cc][Cc]\\|[Bb][Cc][Cc]\\): ", + { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } + }, + + { + ID_SUBJECT, + "^[Ss][Uu][Bb][Jj][Ee][Cc][Tt]: ", + { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } + }, + + { + ID_DATE, + "^[Dd][Aa][Tt][Ee]: ", + { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } + }, + +}; + +/********************************************************************/ + +int xor(int a, int b) { + return (a && !b) || (!a && b); +} char *segment_next_field(char *current) { while(*current && *current != ' ') current++; @@ -151,15 +192,15 @@ int mbox_line_match_search(struct search_request *request, int mbox_id, char *mbox_value) { return (request->field_id == mbox_id || - (request->field_id == ID_PARTICIPANT && (mbox_id == ID_FROM || mbox_id == ID_DEST))) + (request->field_id == ID_PARTICIPANT && (mbox_id == ID_FROM || mbox_id == ID_TO))) && regexec(&request->regexp, mbox_value, 0, 0, 0) == 0; } -void search_in_db(int nb_search_patterns, +void search_in_db(int nb_search_requests, struct search_request *search_requests, FILE *db_file) { - int hits[MAX_NB_SEARCH_PATTERNS]; + int hits[MAX_NB_SEARCH_REQUESTS]; char raw_db_line[BUFFER_SIZE]; char raw_mbox_line[BUFFER_SIZE]; char current_mail_filename[PATH_MAX + 1]; @@ -167,11 +208,12 @@ void search_in_db(int nb_search_patterns, char *mbox_name, *mbox_value; int mbox_id; int already_written, m, n; + int last_mbox_line_was_empty; current_position_in_mail = 0; already_written = 0; - for(n = 0; n < nb_search_patterns; n++) { hits[n] = 0; } + for(n = 0; n < nb_search_requests; n++) { hits[n] = 0; } while(fgets(raw_db_line, BUFFER_SIZE, db_file)) { mbox_name = raw_db_line; @@ -181,11 +223,13 @@ void search_in_db(int nb_search_patterns, char *position_in_file_string; char *mail_filename; - for(n = 0; n < nb_search_patterns && - ((hits[n] && !search_requests[n].negation) || - (!hits[n] && search_requests[n].negation)); n++); + for(n = 0; n < nb_search_requests && xor(hits[n], search_requests[n].negation); n++); - if(n == nb_search_patterns) { + /* for(n = 0; n < nb_search_requests && */ + /* ((hits[n] && !search_requests[n].negation) || */ + /* (!hits[n] && search_requests[n].negation)); n++); */ + + if(n == nb_search_requests) { FILE *mail_file; mail_file = fopen(current_mail_filename, "r"); @@ -198,9 +242,12 @@ void search_in_db(int nb_search_patterns, fseek(mail_file, current_position_in_mail, SEEK_SET); if(fgets(raw_mbox_line, BUFFER_SIZE, mail_file)) { + last_mbox_line_was_empty = 1; printf("%s", raw_mbox_line); - while(fgets(raw_mbox_line, BUFFER_SIZE, mail_file) && - strncmp(raw_mbox_line, "From ", 5)) { + while(1) { + if(!fgets(raw_mbox_line, BUFFER_SIZE, mail_file) || + (last_mbox_line_was_empty && strncmp(raw_mbox_line, "From ", 5) == 0)) break; + last_mbox_line_was_empty = (raw_mbox_line[0] == '\n'); printf("%s", raw_mbox_line); } } @@ -208,7 +255,7 @@ void search_in_db(int nb_search_patterns, fclose(mail_file); } - for(n = 0; n < nb_search_patterns; n++) { hits[n] = 0; } + for(n = 0; n < nb_search_requests; n++) { hits[n] = 0; } position_in_file_string = mbox_value; mail_filename = segment_next_field(mbox_value); @@ -226,7 +273,7 @@ void search_in_db(int nb_search_patterns, mbox_id = m; } } - for(n = 0; n < nb_search_patterns; n++) { + for(n = 0; n < nb_search_requests; n++) { hits[n] |= mbox_line_match_search(&search_requests[n], mbox_id, mbox_value); } @@ -235,7 +282,7 @@ void search_in_db(int nb_search_patterns, } void recursive_search_in_db(const char *entry_name, - int nb_search_patterns, + int nb_search_requests, struct search_request *search_requests) { DIR *dir; struct dirent *dir_e; @@ -258,7 +305,7 @@ void recursive_search_in_db(const char *entry_name, if(!ignore_entry(dir_e->d_name)) { snprintf(subname, PATH_MAX, "%s/%s", entry_name, dir_e->d_name); recursive_search_in_db(subname, - nb_search_patterns, + nb_search_requests, search_requests); } } @@ -292,7 +339,7 @@ void recursive_search_in_db(const char *entry_name, exit(EXIT_FAILURE); } - search_in_db(nb_search_patterns, search_requests, db_file); + search_in_db(nb_search_requests, search_requests, db_file); fclose(db_file); } @@ -320,7 +367,7 @@ void index_mbox(const char *mbox_filename, char raw_mbox_line[BUFFER_SIZE], full_line[BUFFER_SIZE]; char *end_of_full_line; FILE *file; - int in_header, new_header; + int in_header, new_header, last_mbox_line_was_empty; unsigned long int position_in_file; file = fopen(mbox_filename, "r"); @@ -337,9 +384,10 @@ void index_mbox(const char *mbox_filename, position_in_file = 0; end_of_full_line = 0; full_line[0] = '\0'; + last_mbox_line_was_empty = 1; while(fgets(raw_mbox_line, BUFFER_SIZE, file)) { - if(strncmp(raw_mbox_line, "From ", 5) == 0) { + if(last_mbox_line_was_empty && strncmp(raw_mbox_line, "From ", 5) == 0) { if(in_header) { fprintf(stderr, "Got a ^\"From \" in the header in %s:%lu.\n", @@ -349,10 +397,12 @@ void index_mbox(const char *mbox_filename, } in_header = 1; new_header = 1; - } else if(strncmp(raw_mbox_line, "\n", 1) == 0) { + } else if(raw_mbox_line[0] == '\n') { if(in_header) { in_header = 0; } } + last_mbox_line_was_empty = (raw_mbox_line[0] == '\n'); + if(in_header) { if(new_header) { fprintf(db_file, "mail %lu %s\n", position_in_file, mbox_filename); @@ -450,27 +500,6 @@ static struct option long_options[] = { { 0, 0, 0, 0 } }; -static struct parsable_field fields_to_parse[] = { - { - ID_FROM, - "^\\([Ff][Rr][Oo][Mm]:\\|From\\) *", - { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } - }, - - { - ID_DEST, - "^\\([Tt][Oo]\\|[Cc][Cc]\\|[Bb][Cc][Cc]\\): *", - { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } - }, - - { - ID_SUBJECT, - "^[Ss][Uu][Bb][Jj][Ee][Cc][Tt]: *", - { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } - }, - -}; - /*********************************************************************/ int main(int argc, char **argv) { @@ -478,8 +507,8 @@ int main(int argc, char **argv) { const int nb_fields_to_parse = sizeof(fields_to_parse) / sizeof(struct parsable_field); char c; int f; - int nb_search_patterns; - char *search_pattern[MAX_NB_SEARCH_PATTERNS]; + int nb_search_requests; + char *search_request_strings[MAX_NB_SEARCH_REQUESTS]; /* for(f = 0; f < argc; f++) { */ /* printf("arg %d \"%s\"\n", f, argv[f]); */ @@ -492,7 +521,7 @@ int main(int argc, char **argv) { setlocale(LC_ALL, ""); - nb_search_patterns = 0; + nb_search_requests = 0; while ((c = getopt_long(argc, argv, "hvip:s:d:r:", long_options, NULL)) != -1) { @@ -520,11 +549,11 @@ int main(int argc, char **argv) { break; case 's': - if(nb_search_patterns == MAX_NB_SEARCH_PATTERNS) { + if(nb_search_requests == MAX_NB_SEARCH_REQUESTS) { fprintf(stderr, "mymail: Too many search patterns.\n"); exit(EXIT_FAILURE); } - search_pattern[nb_search_patterns++] = strdup(optarg); + search_request_strings[nb_search_requests++] = strdup(optarg); break; default: @@ -551,13 +580,6 @@ int main(int argc, char **argv) { } } - if(!db_root_path) { - fprintf(stderr, - "mymail: db root path is not set\n"); - exit(EXIT_FAILURE); - } - - if(error) { print_usage(stderr); exit(EXIT_FAILURE); @@ -593,7 +615,7 @@ int main(int argc, char **argv) { } } - fprintf(db_file, "%s version_%s raw version\n", MYMAIL_DB_MAGIC_TOKEN, VERSION); + fprintf(db_file, "%s version_%s raw\n", MYMAIL_DB_MAGIC_TOKEN, VERSION); while(optind < argc) { recursive_index_mbox(db_file, @@ -611,16 +633,23 @@ int main(int argc, char **argv) { else { - if(nb_search_patterns > 0) { - struct search_request search_requests[MAX_NB_SEARCH_PATTERNS]; - char *search_regexp_string; + if(!db_root_path) { + fprintf(stderr, + "mymail: db root path is not set\n"); + exit(EXIT_FAILURE); + } + + if(nb_search_requests > 0) { + struct search_request search_requests[MAX_NB_SEARCH_REQUESTS]; + char *search_field, *search_regexp_string; int m, n; - for(n = 0; n < nb_search_patterns; n++) { - search_regexp_string = segment_next_field(search_pattern[n]); + for(n = 0; n < nb_search_requests; n++) { + search_field = search_request_strings[n]; + search_regexp_string = segment_next_field(search_request_strings[n]); - if(search_pattern[n][0] == '!') { - search_pattern[n]++; + if(search_field[0] == '!') { + search_field++; search_requests[n].negation = 1; } else { search_requests[n].negation = 0; @@ -628,11 +657,18 @@ int main(int argc, char **argv) { search_requests[n].field_id = -1; for(m = 0; (m < MAX_ID) && search_requests[n].field_id == -1; m++) { - if(strncmp(field_names[m], search_pattern[n], strlen(search_pattern[n])) == 0) { + if(strncmp(field_names[m], search_field, strlen(search_field)) == 0) { search_requests[n].field_id = m; } } + if(search_requests[n].field_id == -1) { + fprintf(stderr, + "mymail: Syntax error in field name \"%s\".\n", + search_field); + exit(EXIT_FAILURE); + } + if(regcomp(&search_requests[n].regexp, search_regexp_string, REG_ICASE)) { @@ -645,10 +681,11 @@ int main(int argc, char **argv) { } recursive_search_in_db(db_root_path, - nb_search_patterns, search_requests); + nb_search_requests, search_requests); - for(n = 0; n < nb_search_patterns; n++) { - free(search_pattern[n]); + for(n = 0; n < nb_search_requests; n++) { + regfree(&search_requests[n].regexp); + free(search_request_strings[n]); } } }