X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=mymail.c;h=692e0a3a48ad67c95744f23f464faa1b69015260;hb=8cee89a392dc0a2e1379ae9b56d03c4bf70e0254;hp=21ad5eabff678aaad71b8bb24b164803369f06ea;hpb=622b0a6df1bcb8e072facf472e4568609ab2a321;p=mymail.git diff --git a/mymail.c b/mymail.c index 21ad5ea..692e0a3 100644 --- a/mymail.c +++ b/mymail.c @@ -45,9 +45,9 @@ #include #define MYMAIL_DB_MAGIC_TOKEN "mymail_index_file" -#define VERSION "0.9" +#define VERSION "0.9.1" -#define MAX_NB_SEARCH_REQUESTS 10 +#define MAX_NB_SEARCH_CONDITIONS 10 #define BUFFER_SIZE 65536 @@ -55,9 +55,11 @@ char *db_filename; char *db_filename_regexp_string; char *db_root_path; char *db_filename_list; +char output_filename[PATH_MAX + 1]; int paranoid; int action_index; +int quiet; /********************************************************************/ @@ -68,6 +70,7 @@ enum { ID_SUBJECT, ID_DATE, ID_PARTICIPANT, + ID_BODY, MAX_ID }; @@ -77,12 +80,13 @@ static char *field_names[] = { "to", "subject", "date", - "part" + "part", + "body" }; /********************************************************************/ -struct search_request { +struct search_condition { int field_id; int negation; regex_t regexp; @@ -171,6 +175,8 @@ void print_usage(FILE *out) { fprintf(out, " show this help\n"); fprintf(out, " -v, --version\n"); fprintf(out, " print the version number\n"); + fprintf(out, " -q, --quiet\n"); + fprintf(out, " do not print information during search\n"); fprintf(out, " -p , --db-pattern \n"); fprintf(out, " set the db filename pattern for recursive search\n"); fprintf(out, " -r , --db-root \n"); @@ -183,6 +189,8 @@ void print_usage(FILE *out) { fprintf(out, " set the db filename for indexing\n"); fprintf(out, " -i, --index\n"); fprintf(out, " index mails\n"); + fprintf(out, " -o , --output \n"); + fprintf(out, " set the result file, use stdout if unset\n"); } /*********************************************************************/ @@ -194,19 +202,21 @@ int ignore_entry(const char *name) { (name[0] == '.' && name[1] != '/'); } -int mbox_line_match_search(struct search_request *request, +int mbox_line_match_search(struct search_condition *condition, int mbox_id, char *mbox_value) { return - (request->field_id == mbox_id || - (request->field_id == ID_PARTICIPANT && (mbox_id == ID_FROM || mbox_id == ID_TO))) + (condition->field_id == mbox_id || + (condition->field_id == ID_PARTICIPANT && (mbox_id == ID_FROM || mbox_id == ID_TO))) && - regexec(&request->regexp, mbox_value, 0, 0, 0) == 0; + regexec(&condition->regexp, mbox_value, 0, 0, 0) == 0; } -void search_in_db(int nb_search_requests, - struct search_request *search_requests, - FILE *db_file) { - int hits[MAX_NB_SEARCH_REQUESTS]; +void search_in_db(FILE *db_file, + int nb_search_conditions, + struct search_condition *search_conditions, + FILE *output_file) { + + int hits[MAX_NB_SEARCH_CONDITIONS]; char raw_db_line[BUFFER_SIZE]; char raw_mbox_line[BUFFER_SIZE]; char current_mail_filename[PATH_MAX + 1]; @@ -215,11 +225,21 @@ void search_in_db(int nb_search_requests, int mbox_id; int already_written, m, n; int last_mbox_line_was_empty; + int nb_body_conditions, nb_fulfilled_body_conditions; current_position_in_mail = 0; already_written = 0; - for(n = 0; n < nb_search_requests; n++) { hits[n] = 0; } + for(n = 0; n < nb_search_conditions; n++) { hits[n] = 0; } + + nb_body_conditions = 0; + for(n = 0; n < nb_search_conditions; n++) { + if(search_conditions[n].field_id == ID_BODY) { + nb_body_conditions++; + } + } + + strcpy(current_mail_filename, ""); while(fgets(raw_db_line, BUFFER_SIZE, db_file)) { mbox_name = raw_db_line; @@ -229,39 +249,96 @@ void search_in_db(int nb_search_requests, char *position_in_file_string; char *mail_filename; - for(n = 0; n < nb_search_requests && xor(hits[n], search_requests[n].negation); n++); + if(current_mail_filename[0]) { - /* for(n = 0; n < nb_search_requests && */ - /* ((hits[n] && !search_requests[n].negation) || */ - /* (!hits[n] && search_requests[n].negation)); n++); */ + /* We first check all conditions but the body ones */ - if(n == nb_search_requests) { - FILE *mail_file; + for(n = 0; n < nb_search_conditions && + ((search_conditions[n].field_id == ID_BODY) || + xor(hits[n], search_conditions[n].negation)); n++); - mail_file = fopen(current_mail_filename, "r"); + if(n == nb_search_conditions) { - if(!mail_file) { - fprintf(stderr, "mymail: Cannot open mbox '%s'.\n", current_mail_filename); - exit(EXIT_FAILURE); - } + /* all conditions but the body ones are fine, check the body + ones */ + + nb_fulfilled_body_conditions = 0; + + if(nb_body_conditions > 0) { + FILE *mail_file; + int header; - fseek(mail_file, current_position_in_mail, SEEK_SET); + header = 1; + mail_file = fopen(current_mail_filename, "r"); - if(fgets(raw_mbox_line, BUFFER_SIZE, mail_file)) { - last_mbox_line_was_empty = 1; - printf("%s", raw_mbox_line); - 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); + if(!mail_file) { + fprintf(stderr, + "mymail: Cannot open mbox '%s' for body scan.\n", + current_mail_filename); + exit(EXIT_FAILURE); + } + + fseek(mail_file, current_position_in_mail, SEEK_SET); + + if(fgets(raw_mbox_line, BUFFER_SIZE, mail_file)) { + while(nb_fulfilled_body_conditions < nb_body_conditions) { + last_mbox_line_was_empty = (raw_mbox_line[0] == '\n'); + + if(last_mbox_line_was_empty) { header = 0; } + + if(!header) { + for(n = 0; n < nb_search_conditions; n++) { + if(search_conditions[n].field_id == ID_BODY && !hits[n]) { + hits[n] = + (regexec(&search_conditions[n].regexp, raw_mbox_line, 0, 0, 0) == 0); + if(hits[n]) { + nb_fulfilled_body_conditions++; + } + } + } + } + + if(!fgets(raw_mbox_line, BUFFER_SIZE, mail_file) || + (last_mbox_line_was_empty && strncmp(raw_mbox_line, "From ", 5) == 0)) + break; + } + } + + fclose(mail_file); } - } - fclose(mail_file); + if(nb_body_conditions == nb_fulfilled_body_conditions) { + FILE *mail_file; + + mail_file = fopen(current_mail_filename, "r"); + + if(!mail_file) { + fprintf(stderr, + "mymail: Cannot open mbox '%s' for mail extraction.\n", + current_mail_filename); + exit(EXIT_FAILURE); + } + + fseek(mail_file, current_position_in_mail, SEEK_SET); + + if(fgets(raw_mbox_line, BUFFER_SIZE, mail_file)) { + last_mbox_line_was_empty = 1; + fprintf(output_file, "%s", raw_mbox_line); + 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'); + fprintf(output_file, "%s", raw_mbox_line); + } + } + + fclose(mail_file); + } + } } - for(n = 0; n < nb_search_requests; n++) { hits[n] = 0; } + for(n = 0; n < nb_search_conditions; n++) { hits[n] = 0; } position_in_file_string = mbox_value; mail_filename = segment_next_field(mbox_value); @@ -279,8 +356,8 @@ void search_in_db(int nb_search_requests, mbox_id = m; } } - for(n = 0; n < nb_search_requests; n++) { - hits[n] |= mbox_line_match_search(&search_requests[n], + for(n = 0; n < nb_search_conditions; n++) { + hits[n] |= mbox_line_match_search(&search_conditions[n], mbox_id, mbox_value); } } @@ -288,7 +365,9 @@ void search_in_db(int nb_search_requests, } void recursive_search_in_db(const char *entry_name, regex_t *db_filename_regexp, - int nb_search_requests, struct search_request *search_requests) { + int nb_search_conditions, + struct search_condition *search_conditions, + FILE *output_file) { DIR *dir; struct dirent *dir_e; struct stat sb; @@ -310,7 +389,8 @@ void recursive_search_in_db(const char *entry_name, regex_t *db_filename_regexp, if(!ignore_entry(dir_e->d_name)) { snprintf(subname, PATH_MAX, "%s/%s", entry_name, dir_e->d_name); recursive_search_in_db(subname, db_filename_regexp, - nb_search_requests, search_requests); + nb_search_conditions, search_conditions, + output_file); } } closedir(dir); @@ -323,6 +403,11 @@ void recursive_search_in_db(const char *entry_name, regex_t *db_filename_regexp, if(regexec(db_filename_regexp, filename, 0, 0, 0) == 0) { FILE *db_file = fopen(entry_name, "r"); + if(!quiet) { + printf("Searching in '%s' ... ", entry_name); + fflush(stdout); + } + if(!db_file) { fprintf(stderr, "mymail: Cannot open \"%s\" for reading: %s\n", @@ -345,9 +430,14 @@ void recursive_search_in_db(const char *entry_name, regex_t *db_filename_regexp, exit(EXIT_FAILURE); } - search_in_db(nb_search_requests, search_requests, db_file); + search_in_db(db_file, nb_search_conditions, search_conditions, output_file); fclose(db_file); + + if(!quiet) { + printf("done.\n"); + fflush(stdout); + } } } } @@ -499,12 +589,14 @@ enum { static struct option long_options[] = { { "help", no_argument, 0, 'h' }, { "version", no_argument, 0, 'v' }, + { "quiet", no_argument, 0, 'q' }, { "db-file", 1, 0, 'd' }, { "db-pattern", 1, 0, 'p' }, { "db-root", 1, 0, 'r' }, { "db-list", 1, 0, 'l' }, { "search", 1, 0, 's' }, { "index", 0, 0, 'i' }, + { "output", 1, 0, 'o' }, { 0, 0, 0, 0 } }; @@ -515,24 +607,22 @@ 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_requests; - char *search_request_strings[MAX_NB_SEARCH_REQUESTS]; - - /* for(f = 0; f < argc; f++) { */ - /* printf("arg %d \"%s\"\n", f, argv[f]); */ - /* } */ + int nb_search_conditions; + char *search_condition_strings[MAX_NB_SEARCH_CONDITIONS]; + FILE *output_file; paranoid = 0; action_index = 0; db_filename = 0; db_root_path = 0; db_filename_list = 0; + quiet = 0; setlocale(LC_ALL, ""); - nb_search_requests = 0; + nb_search_conditions = 0; - while ((c = getopt_long(argc, argv, "hvip:s:d:r:l:", + while ((c = getopt_long(argc, argv, "hvqip:s:d:r:l:o:", long_options, NULL)) != -1) { switch(c) { @@ -545,6 +635,10 @@ int main(int argc, char **argv) { print_version(stdout); break; + case 'q': + quiet = 1; + break; + case 'i': action_index = 1; break; @@ -557,6 +651,10 @@ int main(int argc, char **argv) { db_filename_regexp_string = strdup(optarg); break; + case 'o': + strncpy(output_filename, optarg, PATH_MAX); + break; + case 'r': db_root_path = strdup(optarg); break; @@ -566,11 +664,11 @@ int main(int argc, char **argv) { break; case 's': - if(nb_search_requests == MAX_NB_SEARCH_REQUESTS) { + if(nb_search_conditions == MAX_NB_SEARCH_CONDITIONS) { fprintf(stderr, "mymail: Too many search patterns.\n"); exit(EXIT_FAILURE); } - search_request_strings[nb_search_requests++] = strdup(optarg); + search_condition_strings[nb_search_conditions++] = strdup(optarg); break; default: @@ -615,6 +713,21 @@ int main(int argc, char **argv) { } } + if(output_filename[0]) { + output_file = fopen(output_filename, "w"); + + if(!output_file) { + fprintf(stderr, + "mymail: Cannot open result file \"%s\" for writing: %s\n", + output_filename, + strerror(errno)); + exit(EXIT_FAILURE); + } + } else { + output_file = stdout; + quiet = 1; + } + if(error) { print_usage(stderr); exit(EXIT_FAILURE); @@ -668,43 +781,43 @@ int main(int argc, char **argv) { else { - if(nb_search_requests > 0) { - struct search_request search_requests[MAX_NB_SEARCH_REQUESTS]; + if(nb_search_conditions > 0) { + struct search_condition search_conditions[MAX_NB_SEARCH_CONDITIONS]; char *search_field, *search_regexp_string; int m, 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]); + for(n = 0; n < nb_search_conditions; n++) { + search_field = search_condition_strings[n]; + search_regexp_string = segment_next_field(search_condition_strings[n]); if(search_field[0] == '!') { search_field++; - search_requests[n].negation = 1; + search_conditions[n].negation = 1; } else { - search_requests[n].negation = 0; + search_conditions[n].negation = 0; } - search_requests[n].field_id = -1; - for(m = 0; (m < MAX_ID) && search_requests[n].field_id == -1; m++) { + search_conditions[n].field_id = -1; + for(m = 0; (m < MAX_ID) && search_conditions[n].field_id == -1; m++) { if(strncmp(field_names[m], search_field, strlen(search_field)) == 0) { - search_requests[n].field_id = m; + search_conditions[n].field_id = m; } } - if(search_requests[n].field_id == -1) { + if(search_conditions[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, + if(regcomp(&search_conditions[n].regexp, search_regexp_string, REG_ICASE)) { fprintf(stderr, "mymail: Syntax error in regexp \"%s\" for field \"%s\".\n", search_regexp_string, - field_names[search_requests[n].field_id]); + field_names[search_conditions[n].field_id]); exit(EXIT_FAILURE); } } @@ -723,7 +836,8 @@ int main(int argc, char **argv) { } recursive_search_in_db(db_root_path, &db_filename_regexp, - nb_search_requests, search_requests); + nb_search_conditions, search_conditions, + output_file); regfree(&db_filename_regexp); } @@ -754,7 +868,7 @@ int main(int argc, char **argv) { exit(EXIT_FAILURE); } - search_in_db(nb_search_requests, search_requests, db_file); + search_in_db(db_file, nb_search_conditions, search_conditions, output_file); fclose(db_file); } @@ -774,19 +888,23 @@ int main(int argc, char **argv) { exit(EXIT_FAILURE); } - search_in_db(nb_search_requests, search_requests, db_file); + search_in_db(db_file, nb_search_conditions, search_conditions, output_file); fclose(db_file); optind++; } - for(n = 0; n < nb_search_requests; n++) { - regfree(&search_requests[n].regexp); - free(search_request_strings[n]); + for(n = 0; n < nb_search_conditions; n++) { + regfree(&search_conditions[n].regexp); + free(search_condition_strings[n]); } } } + if(output_file != stdout) { + fclose(output_file); + } + free(db_filename); free(db_filename_regexp_string); free(db_root_path);