X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?p=mymail.git;a=blobdiff_plain;f=mymail.c;h=5e2cb21ed5d3b455691eca41e09d42fca90a5b49;hp=50e5ba517fd3b195a9558ce4f7d71906de10896f;hb=7b9e0f6566b6a597dc83f79dd405e0ddd520a7ff;hpb=6535d20729f93dcfb759a8a9147f122857166d88 diff --git a/mymail.c b/mymail.c index 50e5ba5..5e2cb21 100644 --- a/mymail.c +++ b/mymail.c @@ -57,9 +57,10 @@ /* Global variables! */ -int quiet; +int global_quiet; +int global_use_leading_time; -regex_t leading_from_line_regexp; +regex_t global_leading_from_line_regexp; /********************************************************************/ @@ -210,6 +211,9 @@ void print_usage(FILE *out) { fprintf(out, " print the version number\n"); fprintf(out, " -q, --quiet\n"); fprintf(out, " do not print information during search\n"); + fprintf(out, " -t, --use-leading-time\n"); + fprintf(out, " use the time stamp from the leading line of each mail and not the Date:\n"); + fprintf(out, " field\n"); fprintf(out, " -p , --db-pattern \n"); fprintf(out, " set the db filename pattern for recursive search\n"); fprintf(out, " -r , --db-root \n"); @@ -242,28 +246,40 @@ int ignore_entry(const char *name) { int is_a_leading_from_line(char *mbox_line) { return strncmp(mbox_line, "From ", 5) == 0 && - regexec(&leading_from_line_regexp, mbox_line, 0, 0, 0) == 0; + regexec(&global_leading_from_line_regexp, mbox_line, 0, 0, 0) == 0; } int mbox_line_match_search(struct search_condition *condition, int mbox_id, const char *mbox_value) { if(condition->field_id == ID_INTERVAL) { - if(mbox_id == ID_LEADING_LINE) { - const char *c; - time_t t; - struct tm tm; - - c = mbox_value; - while(*c && *c != ' ') c++; while(*c && *c == ' ') c++; - strptime(c, "%a %b %e %k:%M:%S %Y", &tm); - t = mktime(&tm); - - return (t >= condition->interval_start && - (condition->interval_stop == 0 || - t <= condition->interval_stop)); + const char *c; + time_t t; + struct tm tm; + if(global_use_leading_time) { + if(mbox_id == ID_LEADING_LINE) { + c = mbox_value; + while(*c && *c != ' ') c++; while(*c && *c == ' ') c++; + strptime(c, "%a %b %e %k:%M:%S %Y", &tm); + t = mktime(&tm); + return (t >= condition->interval_start && + (condition->interval_stop == 0 || + t <= condition->interval_stop)); + } else { + return 0; + } } else { - return 0; + if(mbox_id == ID_DATE) { + if(!strptime(mbox_value, "%a, %d %b %Y %k:%M:%S", &tm)) { + strptime(mbox_value, "%d %b %Y %k:%M:%S", &tm); + } + t = mktime(&tm); + return (t >= condition->interval_start && + (condition->interval_stop == 0 || + t <= condition->interval_stop)); + } else { + return 0; + } } } else { return @@ -354,6 +370,45 @@ void extract_mail(const char *mail_filename, unsigned long int position_in_mail, fclose(mail_file); } +int check_full_mail_match(char *current_mail_filename, + int nb_search_conditions, + struct search_condition *search_conditions, + int nb_body_conditions, + int *hits, + int current_position_in_mail) { + int n, nb_fulfilled_body_conditions; + + /* We first check all conditions but the body ones */ + + for(n = 0; n < nb_search_conditions && + ((search_conditions[n].field_id == ID_BODY) || + xor(hits[n], search_conditions[n].negation)); n++); + + if(n == nb_search_conditions) { + + /* Now check the body ones */ + + nb_fulfilled_body_conditions = 0; + + if(nb_body_conditions > 0) { + update_body_hits(current_mail_filename, current_position_in_mail, + nb_search_conditions, search_conditions, + nb_body_conditions, + hits); + + for(n = 0; n < nb_search_conditions; n++) { + if(search_conditions[n].field_id == ID_BODY && + xor(hits[n], search_conditions[n].negation)) { + nb_fulfilled_body_conditions++; + } + } + } + return nb_body_conditions == nb_fulfilled_body_conditions; + } else { + return 0; + } +} + int search_in_db(const char *db_filename, int nb_search_conditions, struct search_condition *search_conditions, @@ -367,13 +422,13 @@ int search_in_db(const char *db_filename, const char *mbox_value; int mbox_id; int already_written, m, n; - int nb_body_conditions, nb_fulfilled_body_conditions; + int nb_body_conditions; FILE *db_file; int nb_extracted_mails; nb_extracted_mails = 0; - if(!quiet) { + if(!global_quiet) { printf("Searching in '%s' ... ", db_filename); fflush(stdout); } @@ -417,44 +472,14 @@ int search_in_db(const char *db_filename, if(strcmp("mail", mbox_key) == 0) { char position_in_file_string[TOKEN_BUFFER_SIZE]; - - if(current_mail_filename[0]) { - - /* We first check all conditions but the body ones */ - - for(n = 0; n < nb_search_conditions && - ((search_conditions[n].field_id == ID_BODY) || - xor(hits[n], search_conditions[n].negation)); n++); - - if(n == nb_search_conditions) { - - /* Now check the body ones */ - - nb_fulfilled_body_conditions = 0; - - if(nb_body_conditions > 0) { - update_body_hits(current_mail_filename, current_position_in_mail, - nb_search_conditions, search_conditions, - nb_body_conditions, - hits); - - for(n = 0; n < nb_search_conditions; n++) { - if(search_conditions[n].field_id == ID_BODY && - xor(hits[n], search_conditions[n].negation)) { - nb_fulfilled_body_conditions++; - } - } - } - - if(nb_body_conditions == nb_fulfilled_body_conditions) { - nb_extracted_mails++; - extract_mail(current_mail_filename, current_position_in_mail, output_file); - } - } + if(current_mail_filename[0] && + check_full_mail_match(current_mail_filename, + nb_search_conditions, search_conditions, + nb_body_conditions, hits, current_position_in_mail)) { + nb_extracted_mails++; + extract_mail(current_mail_filename, current_position_in_mail, output_file); } - for(n = 0; n < nb_search_conditions; n++) { hits[n] = 0; } - mbox_value = parse_token(position_in_file_string, TOKEN_BUFFER_SIZE, ' ', mbox_value); mbox_value = parse_token(current_mail_filename, TOKEN_BUFFER_SIZE, '\n', mbox_value); current_position_in_mail = atol(position_in_file_string); @@ -475,9 +500,17 @@ int search_in_db(const char *db_filename, } } + if(current_mail_filename[0] && + check_full_mail_match(current_mail_filename, + nb_search_conditions, search_conditions, + nb_body_conditions, hits, current_position_in_mail)) { + nb_extracted_mails++; + extract_mail(current_mail_filename, current_position_in_mail, output_file); + } + fclose(db_file); - if(!quiet) { + if(!global_quiet) { printf("done.\n"); fflush(stdout); } @@ -568,16 +601,29 @@ void index_mbox(const char *mbox_filename, while(fgets(raw_mbox_line, BUFFER_SIZE, file)) { if(is_a_leading_from_line(raw_mbox_line)) { + /* This starts a new mail */ if(in_header) { fprintf(stderr, "Got a ^\"From \" in the header in %s:%lu.\n", mbox_filename, position_in_file); fprintf(stderr, "%s", raw_mbox_line); } + + /* printf("LEADING_LINE %s", raw_mbox_line); */ + in_header = 1; new_header = 1; } else if(raw_mbox_line[0] == '\n') { - if(in_header) { in_header = 0; } + if(in_header) { + in_header = 0; + /* We leave the header, index the current line */ + if(full_line[0]) { + /* printf("INDEX %s\n", full_line); */ + index_one_mbox_line(nb_fields_to_parse, fields_to_parse, full_line, db_file); + } + end_of_full_line = full_line; + *end_of_full_line = '\0'; + } } if(in_header) { @@ -587,6 +633,7 @@ void index_mbox(const char *mbox_filename, } if(raw_mbox_line[0] == ' ' || raw_mbox_line[0] == '\t') { + /* Continuation of a line */ char *start = raw_mbox_line; while(*start == ' ' || *start == '\t') start++; *(end_of_full_line++) = ' '; @@ -598,17 +645,10 @@ void index_mbox(const char *mbox_filename, } else { - /* - if(!((raw_mbox_line[0] >= 'a' && raw_mbox_line[0] <= 'z') || - (raw_mbox_line[0] >= 'A' && raw_mbox_line[0] <= 'Z'))) { - fprintf(stderr, - "Header line syntax error %s:%lu.\n", - mbox_filename, position_in_file); - fprintf(stderr, "%s", raw_mbox_line); - } - */ + /* Start a new header line, not a continuation */ if(full_line[0]) { + /* printf("INDEX %s\n", full_line); */ index_one_mbox_line(nb_fields_to_parse, fields_to_parse, full_line, db_file); } @@ -676,6 +716,7 @@ static struct option long_options[] = { { "help", no_argument, 0, 'h' }, { "version", no_argument, 0, 'v' }, { "quiet", no_argument, 0, 'q' }, + { "use-leading-time", no_argument, 0, 't' }, { "db-file-generate", 1, 0, 'd' }, { "db-pattern", 1, 0, 'p' }, { "db-root", 1, 0, 'r' }, @@ -699,7 +740,6 @@ struct time_criterion { static struct time_criterion time_criteria[] = { { "8h", 8, -1, -1 }, - { "today", 24, -1, -1 }, { "24h", 24, -1, -1 }, { "48h", 48, -1, -1 }, { "week", 24 * 7, -1, -1 }, @@ -708,6 +748,7 @@ static struct time_criterion time_criteria[] = { { "yesterday", 48, 24, -1 }, + { "today", -1, -1, 0 }, { "monday", -1, -1, 1 }, { "tuesday", -1, -1, 2 }, { "wednesday", -1, -1, 3 }, @@ -726,8 +767,11 @@ time_t time_for_past_day(int day) { int delta_day; t = time(0); tm = localtime(&t); - delta_day = (7 + tm->tm_wday - day) % 7; - if(delta_day == 0) { delta_day = 7; } + if(day > 0) { + delta_day = (7 + tm->tm_wday - day) % 7; + } else { + delta_day = 0; + } return t - (delta_day * 3600 * 24 + tm->tm_sec + 60 * tm->tm_min + 3600 * tm->tm_hour); } @@ -790,6 +834,7 @@ void init_condition(struct search_condition *condition, const char *full_string, } } string = full_string; + if(string[0] == '!') { string++; } } } @@ -839,13 +884,14 @@ int main(int argc, char **argv) { unsigned int nb_search_conditions; struct search_condition search_conditions[MAX_NB_SEARCH_CONDITIONS]; - if(regcomp(&leading_from_line_regexp, LEADING_FROM_LINE_REGEXP_STRING, 0)) { + if(regcomp(&global_leading_from_line_regexp, LEADING_FROM_LINE_REGEXP_STRING, 0)) { fprintf(stderr, "mymail: Cannot compile leading \"from\" line regexp. That is strange.\n"); exit(EXIT_FAILURE); } - quiet = 0; + global_quiet = 0; + global_use_leading_time = 0; default_search_field = 0; strncpy(output_filename, "", PATH_MAX); @@ -867,7 +913,11 @@ int main(int argc, char **argv) { break; case 'q': - quiet = 1; + global_quiet = 1; + break; + + case 't': + global_use_leading_time = 1; break; case 'i': @@ -1039,7 +1089,7 @@ int main(int argc, char **argv) { output_file = safe_fopen(output_filename, "w", "result mbox"); } else { output_file = stdout; - quiet = 1; + global_quiet = 1; } if(nb_search_conditions > 0) { @@ -1091,7 +1141,7 @@ int main(int argc, char **argv) { } } - if(!quiet) { + if(!global_quiet) { if(nb_extracted_mails > 0) { printf("Found %d matching mails.\n", nb_extracted_mails); } else { @@ -1116,7 +1166,7 @@ int main(int argc, char **argv) { free(db_filename_list); free(mbox_filename_regexp_string); - regfree(&leading_from_line_regexp); + regfree(&global_leading_from_line_regexp); exit(EXIT_SUCCESS); }