From c35b861ba366be8bcd944e283aa90e3e1eb4fbe6 Mon Sep 17 00:00:00 2001 From: Francois Fleuret Date: Wed, 6 Nov 2013 15:21:19 +0100 Subject: [PATCH] Added the -f, --do-not-discard-mails-in-the-future option. --- mymail.1 | 3 +++ mymail.c | 46 ++++++++++++++++++++++++++++++---------------- 2 files changed, 33 insertions(+), 16 deletions(-) diff --git a/mymail.1 b/mymail.1 index e32f5a1..06260a4 100644 --- a/mymail.1 +++ b/mymail.1 @@ -35,6 +35,9 @@ do not write information during the search use the time stamp from the leading line of each mail and not the Date: field .TP +\fB-f\fR, \fB--do-not-discard-mails-in-the-future\fR +keep mails with a date (more than 24h) in the future +.TP \fB-p \fR, \fB--db-pattern \fR set the db filename pattern for recursive search .TP diff --git a/mymail.c b/mymail.c index 8c211f0..770df43 100644 --- a/mymail.c +++ b/mymail.c @@ -71,8 +71,10 @@ struct alias_node { int global_quiet; int global_use_leading_time; int global_nb_mails_max; +int global_discard_mail_from_the_future; regex_t global_leading_from_line_regexp; struct alias_node *global_alias_list; +time_t global_current_time; /********************************************************************/ @@ -262,6 +264,8 @@ void print_usage(FILE *out) { 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, " -f, --do-not-discard-mails-in-the-future\n"); + fprintf(out, " do not ignore mails with a date more than 24h in the future\n"); fprintf(out, " -p , --db-pattern \n"); fprintf(out, " set the db filename pattern for recursive search\n"); fprintf(out, " -r , --db-root \n"); @@ -282,6 +286,7 @@ void print_usage(FILE *out) { fprintf(out, " set the maximum number of mails to extract\n"); fprintf(out, " -a , --default-search \n"); fprintf(out, " set the default search field\n"); + } /*********************************************************************/ @@ -516,7 +521,7 @@ int search_in_db(const char *db_filename, for(n = 0; n < nb_search_conditions; n++) { hits[n] = 0; } nb_body_conditions = 0; - need_time = 0; + need_time = global_discard_mail_from_the_future; mail_time = 0; for(n = 0; n < nb_search_conditions; n++) { @@ -541,14 +546,14 @@ int search_in_db(const char *db_filename, db_value = parse_token(db_key_string, TOKEN_BUFFER_SIZE, ' ', raw_db_line); if(strcmp("mail", db_key_string) == 0) { - if(current_mail_filename[0]) { - if(check_full_mail_match(current_mail_filename, - mail_time, - nb_search_conditions, search_conditions, - nb_body_conditions, hits, current_position_in_mail)) { - extract_mail(current_mail_filename, current_position_in_mail, output_file); - nb_extracted_mails++; - } + if(current_mail_filename[0] && + (!global_discard_mail_from_the_future || mail_time < global_current_time + 3600 * 24) && + check_full_mail_match(current_mail_filename, + mail_time, + nb_search_conditions, search_conditions, + nb_body_conditions, hits, current_position_in_mail)) { + extract_mail(current_mail_filename, current_position_in_mail, output_file); + nb_extracted_mails++; } for(n = 0; n < nb_search_conditions; n++) { hits[n] = 0; } @@ -576,8 +581,12 @@ int search_in_db(const char *db_filename, } } + printf("global_discard_mail_from_the_future = %d\n", + global_discard_mail_from_the_future); + if(nb_extracted_mails < global_nb_mails_max && current_mail_filename[0] && + (!global_discard_mail_from_the_future || mail_time < global_current_time + 3600 * 24) && check_full_mail_match(current_mail_filename, mail_time, nb_search_conditions, search_conditions, @@ -799,6 +808,7 @@ static struct option long_options[] = { { "version", no_argument, 0, 'v' }, { "quiet", no_argument, 0, 'q' }, { "use-leading-time", no_argument, 0, 't' }, + { "do-not-discard-mails-in-the-future", no_argument, 0, 'f' }, { "db-file-output", 1, 0, 'd' }, { "db-pattern", 1, 0, 'p' }, { "db-root", 1, 0, 'r' }, @@ -848,17 +858,15 @@ static struct time_criterion time_criteria[] = { /*********************************************************************/ time_t time_for_past_day(int day) { - time_t t; struct tm *tm; int delta_day; - t = time(0); - tm = localtime(&t); + tm = localtime(&global_current_time); if(day > 0) { delta_day = (7 + tm->tm_wday - day) % 7; } else { delta_day = - day; } - return t - (delta_day * 3600 * 24 + tm->tm_sec + 60 * tm->tm_min + 3600 * tm->tm_hour); + return global_current_time - (delta_day * 3600 * 24 + tm->tm_sec + 60 * tm->tm_min + 3600 * tm->tm_hour); } void init_condition(struct search_condition *condition, const char *full_string, @@ -896,9 +904,9 @@ void init_condition(struct search_condition *condition, const char *full_string, condition->time_start = time_for_past_day(time_criteria[k].past_week_day); condition->time_stop = condition->time_start + 3600 * 24; } else { - condition->time_start = time(0) - 3600 * time_criteria[k].start_hour; + condition->time_start = global_current_time - 3600 * time_criteria[k].start_hour; if(time_criteria[k].end_hour >= 0) { - condition->time_stop = time(0) - 3600 * time_criteria[k].end_hour; + condition->time_stop = global_current_time - 3600 * time_criteria[k].end_hour; } else { condition->time_stop = 0; } @@ -1065,6 +1073,8 @@ int main(int argc, char **argv) { global_quiet = 0; global_use_leading_time = 0; global_nb_mails_max = 250; + global_discard_mail_from_the_future = 1; + global_current_time = time(0); default_search_field = 0; strncpy(output_filename, "", PATH_MAX); @@ -1087,7 +1097,7 @@ int main(int argc, char **argv) { nb_search_conditions = 0; - while ((c = getopt_long(argc, argv, "hvqip:s:d:r:l:o:a:m:", + while ((c = getopt_long(argc, argv, "hvqtfip:s:d:r:l:o:a:m:", long_options, NULL)) != -1) { switch(c) { @@ -1108,6 +1118,10 @@ int main(int argc, char **argv) { global_use_leading_time = 1; break; + case 'f': + global_discard_mail_from_the_future = 0; + break; + case 'i': action_index = 1; break; -- 2.20.1