X-Git-Url: https://www.fleuret.org/cgi-bin/gitweb/gitweb.cgi?p=mymail.git;a=blobdiff_plain;f=mymail.c;h=88c01f509a5da89808282ef097696831815c96c9;hp=8926cd5a41dc8c0d04372d9813aaa798e0befc18;hb=00434484dd0b89eb91cb6ea9be03eeaee1f97751;hpb=25be1ba3ca97913b1e15eefeb124daa5c34ea5be diff --git a/mymail.c b/mymail.c index 8926cd5..88c01f5 100644 --- a/mymail.c +++ b/mymail.c @@ -46,22 +46,23 @@ #include #define MYMAIL_DB_MAGIC_TOKEN "mymail_index_file" -#define VERSION "0.9.2" +#define MYMAIL_VERSION "0.9.8" + +#define MYMAIL_DB_FORMAT_VERSION 1 #define MAX_NB_SEARCH_CONDITIONS 32 #define BUFFER_SIZE 65536 #define TOKEN_BUFFER_SIZE 1024 -#define LEADING_FROM_LINE_REGEXP_STRING "^From [^ ]* \\(Mon\\|Tue\\|Wed\\|Thu\\|Fri\\|Sat\\|Sun\\) \\(Jan\\|Feb\\|Mar\\|Apr\\|May\\|Jun\\|Jul\\|Aug\\|Sep\\|Oct\\|Nov\\|Dec\\) [ 123][0-9] [0-9][0-9]:[0-9][0-9]:[0-9][0-9] [0-9][0-9][0-9][0-9]\n$" - -regex_t leading_from_line_regexp; +#define LEADING_FROM_LINE_REGEXP_STRING "^From .*\\(Mon\\|Tue\\|Wed\\|Thu\\|Fri\\|Sat\\|Sun\\) \\(Jan\\|Feb\\|Mar\\|Apr\\|May\\|Jun\\|Jul\\|Aug\\|Sep\\|Oct\\|Nov\\|Dec\\) [ 0123][0-9] [0-9][0-9]:[0-9][0-9]:[0-9][0-9] [0-9][0-9][0-9][0-9]\n$" /* Global variables! */ -int paranoid; -int quiet; -int ignore_dot_files; +int global_quiet; +int global_use_leading_time; + +regex_t global_leading_from_line_regexp; /********************************************************************/ @@ -74,11 +75,11 @@ enum { ID_DATE, ID_PARTICIPANT, ID_BODY, - ID_INTERVAL, + ID_TIME_INTERVAL, MAX_ID }; -static char *field_names[] = { +static char *field_keys[] = { "mail", "lead", "from", @@ -93,10 +94,10 @@ static char *field_names[] = { /********************************************************************/ struct search_condition { - int field_id; + int db_key; + regex_t db_value_regexp; int negation; - regex_t regexp; - time_t interval_start, interval_stop; + time_t time_start, time_stop; }; /********************************************************************/ @@ -155,11 +156,15 @@ int xor(int a, int b) { const char *parse_token(char *token_buffer, size_t token_buffer_size, char separator, const char *string) { char *u = token_buffer; - while(u < token_buffer + token_buffer_size - 1 && *string && - *string != separator) { + + while(*string == separator) { string++; } + + while(u < token_buffer + token_buffer_size - 1 && *string && *string != separator) { *(u++) = *(string++); } - while(*string == separator) string++; + + while(*string == separator) { string++; } + *u = '\0'; return string; } @@ -183,7 +188,6 @@ char *default_value(char *current_value, FILE *safe_fopen(const char *path, const char *mode, const char *comment) { FILE *result = fopen(path, mode); - /* printf("Opening '%s' with mode \"%s\"\n", path, mode); */ if(result) { return result; } else { @@ -197,7 +201,7 @@ FILE *safe_fopen(const char *path, const char *mode, const char *comment) { /*********************************************************************/ void print_version(FILE *out) { - fprintf(out, "mymail version %s (%s)\n", VERSION, UNAME); + fprintf(out, "mymail version %s (%s)\n", MYMAIL_VERSION, UNAME); } void print_usage(FILE *out) { @@ -212,6 +216,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"); @@ -222,7 +229,7 @@ void print_usage(FILE *out) { fprintf(out, " set the mbox filename pattern for recursive search\n"); fprintf(out, " -s , --search \n"); fprintf(out, " search for matching mails in the db file\n"); - fprintf(out, " -d , --db-file-generate \n"); + fprintf(out, " -d , --db-file-output \n"); fprintf(out, " set the db filename for indexing\n"); fprintf(out, " -i, --index\n"); fprintf(out, " index mails\n"); @@ -234,72 +241,40 @@ void print_usage(FILE *out) { /*********************************************************************/ -time_t time_for_past_day(int day) { - time_t t; - struct tm *tm; - int delta_day; - t = time(0); - tm = localtime(&t); - delta_day = (7 + tm->tm_wday - day) % 7 + 1; - return t - delta_day * 3600 * 24 + tm->tm_sec + 60 * tm->tm_min + 3600 * tm->tm_hour; -} - -/*********************************************************************/ - int ignore_entry(const char *name) { return strcmp(name, ".") == 0 || strcmp(name, "..") == 0 || - (ignore_dot_files && name[0] == '.' && name[1] != '/'); + (name[0] == '.' && name[1] != '/'); } 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; +int db_line_match_search(struct search_condition *condition, + int db_key, const char *db_value) { - 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 - ( - - (condition->field_id == mbox_id) + return + ( + (condition->db_key == db_key) - || + || - (condition->field_id == ID_PARTICIPANT && (mbox_id == ID_LEADING_LINE || - mbox_id == ID_FROM || - mbox_id == ID_TO)) - || + (condition->db_key == ID_PARTICIPANT && (db_key == ID_LEADING_LINE || + db_key == ID_FROM || + db_key == ID_TO)) + || - (condition->field_id == ID_FROM && mbox_id == ID_LEADING_LINE) + (condition->db_key == ID_FROM && db_key == ID_LEADING_LINE) - ) + ) - && + && - regexec(&condition->regexp, mbox_value, 0, 0, 0) == 0; - } + regexec(&condition->db_value_regexp, db_value, 0, 0, 0) == 0; } void update_body_hits(char *mail_filename, int position_in_mail, @@ -320,16 +295,13 @@ void update_body_hits(char *mail_filename, int position_in_mail, if(fgets(raw_mbox_line, BUFFER_SIZE, mail_file)) { while(nb_body_hits < nb_body_conditions) { - /* last_mbox_line_was_empty = (raw_mbox_line[0] == '\n'); */ - /* if(last_mbox_line_was_empty) { header = 0; } */ - if(raw_mbox_line[0] == '\n') { header = 0; } if(!header) { for(n = 0; n < nb_search_conditions; n++) { - if(search_conditions[n].field_id == ID_BODY && !hits[n]) { + if(search_conditions[n].db_key == ID_BODY && !hits[n]) { hits[n] = - (regexec(&search_conditions[n].regexp, raw_mbox_line, 0, 0, 0) == 0); + (regexec(&search_conditions[n].db_value_regexp, raw_mbox_line, 0, 0, 0) == 0); if(hits[n]) { nb_body_hits++; } @@ -347,10 +319,12 @@ void update_body_hits(char *mail_filename, int position_in_mail, } void extract_mail(const char *mail_filename, unsigned long int position_in_mail, - FILE *output_file) { + FILE *output_file) { char raw_mbox_line[BUFFER_SIZE]; FILE *mail_file; + /* printf("Extract\n"); */ + mail_file = safe_fopen(mail_filename, "r", "mbox for mail extraction"); fseek(mail_file, position_in_mail, SEEK_SET); @@ -358,8 +332,7 @@ void extract_mail(const char *mail_filename, unsigned long int position_in_mail, fprintf(output_file, "%s", raw_mbox_line); while(1) { if(!fgets(raw_mbox_line, BUFFER_SIZE, mail_file) || - (is_a_leading_from_line(raw_mbox_line)) - ) + is_a_leading_from_line(raw_mbox_line)) break; fprintf(output_file, "%s", raw_mbox_line); } @@ -368,26 +341,103 @@ 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, + time_t mail_time, + 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; + + for(n = 0; n < nb_search_conditions; n++) { + if(search_conditions[n].db_key == ID_TIME_INTERVAL) { + hits[n] = (mail_time >= search_conditions[n].time_start && + (search_conditions[n].time_stop == 0 || + mail_time <= search_conditions[n].time_stop)); + } + } + + /* We first check all conditions but the body ones */ + + for(n = 0; n < nb_search_conditions && + ((search_conditions[n].db_key == 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].db_key == ID_BODY && + xor(hits[n], search_conditions[n].negation)) { + nb_fulfilled_body_conditions++; + } + } + } + return nb_body_conditions == nb_fulfilled_body_conditions; + } else { + return 0; + } +} + +/* We use the mail leading line time by default, and if we should and + can, we update with the Date: field */ + +void update_time(int db_key, const char *db_value, time_t *t) { + const char *c; + struct tm tm; + + if(db_key == ID_LEADING_LINE) { + c = db_value; + while(*c && *c != ' ') c++; while(*c && *c == ' ') c++; + /* printf("From %s", db_value); */ + strptime(c, "%a %b %e %k:%M:%S %Y", &tm); + *t = mktime(&tm); + } else { + if(!global_use_leading_time) { + if(db_key == ID_DATE) { + if(strptime(db_value, "%a, %d %b %Y %k:%M:%S", &tm) || + strptime(db_value, "%d %b %Y %k:%M:%S", &tm)) { + /* printf("Date: %s", db_value); */ + *t = mktime(&tm); + } + } + } + } +} + int search_in_db(const char *db_filename, int nb_search_conditions, struct search_condition *search_conditions, FILE *output_file) { - int hits[MAX_NB_SEARCH_CONDITIONS]; + FILE *db_file; char raw_db_line[BUFFER_SIZE]; char current_mail_filename[PATH_MAX + 1]; + char db_key_string[TOKEN_BUFFER_SIZE]; + char position_in_file_string[TOKEN_BUFFER_SIZE]; unsigned long int current_position_in_mail; - char mbox_name[TOKEN_BUFFER_SIZE]; - const char *mbox_value; - int mbox_id; - int already_written, m, n; - int nb_body_conditions, nb_fulfilled_body_conditions; - FILE *db_file; + const char *db_value; + int db_key; + int hits[MAX_NB_SEARCH_CONDITIONS]; + int nb_body_conditions, need_time; int nb_extracted_mails; + time_t mail_time; + + int m, n; nb_extracted_mails = 0; - if(!quiet) { + if(!global_quiet) { printf("Searching in '%s' ... ", db_filename); fflush(stdout); } @@ -413,85 +463,76 @@ int search_in_db(const char *db_filename, /* Then parse the said db file */ current_position_in_mail = 0; - already_written = 0; for(n = 0; n < nb_search_conditions; n++) { hits[n] = 0; } nb_body_conditions = 0; + need_time = 0; + mail_time = 0; + for(n = 0; n < nb_search_conditions; n++) { - if(search_conditions[n].field_id == ID_BODY) { + if(search_conditions[n].db_key == ID_BODY) { nb_body_conditions++; } + else if(search_conditions[n].db_key == ID_TIME_INTERVAL) { + need_time = 1; + } } strcpy(current_mail_filename, ""); while(fgets(raw_db_line, BUFFER_SIZE, db_file)) { - mbox_value = parse_token(mbox_name, TOKEN_BUFFER_SIZE, ' ', raw_db_line); - - if(strcmp("mail", mbox_name) == 0) { - char position_in_file_string[TOKEN_BUFFER_SIZE]; + 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]) { - - /* 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 */ - - if(nb_body_conditions > 0) { - update_body_hits(current_mail_filename, current_position_in_mail, - nb_search_conditions, search_conditions, - nb_body_conditions, - hits); - } - - nb_fulfilled_body_conditions = 0; - - 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(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; } - - 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); + db_value = parse_token(position_in_file_string, TOKEN_BUFFER_SIZE, ' ', db_value); + db_value = parse_token(current_mail_filename, PATH_MAX+1, '\n', db_value); current_position_in_mail = atol(position_in_file_string); - already_written = 0; } else { - mbox_id = -1; - for(m = 0; (m < MAX_ID) && mbox_id == -1; m++) { - if(strncmp(field_names[m], mbox_name, strlen(mbox_name)) == 0) { - mbox_id = m; + db_key = -1; + for(m = 0; (m < MAX_ID) && db_key == -1; m++) { + if(strncmp(field_keys[m], db_key_string, strlen(db_key_string)) == 0) { + db_key = m; } } + for(n = 0; n < nb_search_conditions; n++) { - hits[n] |= mbox_line_match_search(&search_conditions[n], - mbox_id, mbox_value); + hits[n] |= db_line_match_search(&search_conditions[n], + db_key, db_value); + } + + if(need_time) { + update_time(db_key, db_value, &mail_time); } } } + 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++; + } + } + fclose(db_file); - if(!quiet) { + if(!global_quiet) { printf("done.\n"); fflush(stdout); } @@ -548,14 +589,15 @@ int recursive_search_in_db(const char *entry_name, regex_t *db_filename_regexp, /*********************************************************************/ -void index_one_mbox_line(int nb_fields_to_parse, struct parsable_field *fields_to_parse, +void index_one_mbox_line(unsigned int nb_fields_to_parse, + struct parsable_field *fields_to_parse, char *raw_mbox_line, FILE *db_file) { regmatch_t matches; - int f; + unsigned int f; for(f = 0; f < nb_fields_to_parse; f++) { if(regexec(&fields_to_parse[f].regexp, raw_mbox_line, 1, &matches, 0) == 0) { fprintf(db_file, "%s %s\n", - field_names[fields_to_parse[f].id], + field_keys[fields_to_parse[f].id], raw_mbox_line + matches.rm_eo); } } @@ -581,17 +623,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); - if(paranoid) { exit(EXIT_FAILURE); } } + + /* 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) { @@ -601,6 +655,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++) = ' '; @@ -612,17 +667,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); } @@ -690,7 +738,8 @@ static struct option long_options[] = { { "help", no_argument, 0, 'h' }, { "version", no_argument, 0, 'v' }, { "quiet", no_argument, 0, 'q' }, - { "db-file-generate", 1, 0, 'd' }, + { "use-leading-time", no_argument, 0, 't' }, + { "db-file-output", 1, 0, 'd' }, { "db-pattern", 1, 0, 'p' }, { "db-root", 1, 0, 'r' }, { "db-list", 1, 0, 'l' }, @@ -702,12 +751,58 @@ static struct option long_options[] = { { 0, 0, 0, 0 } }; +struct time_criterion { + char *label; + int day_criterion; + int start_hour, end_hour; + int past_week_day; +}; + /*********************************************************************/ +static struct time_criterion time_criteria[] = { + + { "8h", 0, 8, -1, -1 }, + { "24h", 0, 24, -1, -1 }, + { "48h", 0, 48, -1, -1 }, + { "week", 0, 24 * 7, -1, -1 }, + { "month", 0, 24 * 31, -1, -1 }, + { "trimester", 0, 24 * 92, -1, -1 }, + { "year", 0, 24 * 365, -1, -1 }, + + { "yesterday", 1, -1, -1, -1 }, + { "today", 1, -1, -1, 0 }, + + { "monday", 1, -1, -1, 1 }, + { "tuesday", 1, -1, -1, 2 }, + { "wednesday", 1, -1, -1, 3 }, + { "thursday", 1, -1, -1, 4 }, + { "friday", 1, -1, -1, 5 }, + { "saturday", 1, -1, -1, 6 }, + { "sunday", 1, -1, -1, 7 }, + +}; + +/*********************************************************************/ + +time_t time_for_past_day(int day) { + time_t t; + struct tm *tm; + int delta_day; + t = time(0); + tm = localtime(&t); + 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); +} + void init_condition(struct search_condition *condition, const char *full_string, const char *default_search_field) { char full_search_field[TOKEN_BUFFER_SIZE], *search_field; - int m; + unsigned int k, m; const char *string; string = parse_token(full_search_field, TOKEN_BUFFER_SIZE, ' ', full_string); @@ -720,137 +815,76 @@ void init_condition(struct search_condition *condition, const char *full_string, condition->negation = 0; } - /* Recently */ - - if(strcmp(search_field, "8h") == 0) { - condition->field_id = ID_INTERVAL; - condition->interval_start = time(0) - 3600 * 8; - condition->interval_stop = 0; - } - - else if(strcmp(search_field, "24h") == 0 || - strcmp(search_field, "today") == 0) { - condition->field_id = ID_INTERVAL; - condition->interval_start = time(0) - 3600 * 24; - condition->interval_stop = 0; - } + condition->db_key = -1; - else if(strcmp(search_field, "week") == 0) { - condition->field_id = ID_INTERVAL; - condition->interval_start = time(0) - 3600 * 24 * 7; - condition->interval_stop = 0; - } - - else if(strcmp(search_field, "month") == 0) { - condition->field_id = ID_INTERVAL; - condition->interval_start = time(0) - 3600 * 24 * 31; - condition->interval_stop = 0; - } + /* Time condition */ - else if(strcmp(search_field, "year") == 0) { - condition->field_id = ID_INTERVAL; - condition->interval_start = time(0) - 3600 * 24 * 365; - condition->interval_stop = 0; - } - - /* Yesterday */ - - else if(strcmp(search_field, "yesterday") == 0) { - condition->field_id = ID_INTERVAL; - condition->interval_start = time(0) - 2 * 3600 * 24; - condition->interval_stop = condition->interval_start + 3600 * 24; - } - - /* Week days */ - - else if(strcmp(search_field, "monday") == 0) { - condition->field_id = ID_INTERVAL; - condition->interval_start = time_for_past_day(1); - condition->interval_stop = condition->interval_start + 3600 * 24; - } - - else if(strcmp(search_field, "tuesday") == 0) { - condition->field_id = ID_INTERVAL; - condition->interval_start = time_for_past_day(2); - condition->interval_stop = condition->interval_start + 3600 * 24; - } - - else if(strcmp(search_field, "wednesday") == 0) { - condition->field_id = ID_INTERVAL; - condition->interval_start = time_for_past_day(3); - condition->interval_stop = condition->interval_start + 3600 * 24; - } - - else if(strcmp(search_field, "thursday") == 0) { - condition->field_id = ID_INTERVAL; - condition->interval_start = time_for_past_day(4); - condition->interval_stop = condition->interval_start + 3600 * 24; - } - - else if(strcmp(search_field, "friday") == 0) { - condition->field_id = ID_INTERVAL; - condition->interval_start = time_for_past_day(5); - condition->interval_stop = condition->interval_start + 3600 * 24; - } - - else if(strcmp(search_field, "saturday") == 0) { - condition->field_id = ID_INTERVAL; - condition->interval_start = time_for_past_day(6); - condition->interval_stop = condition->interval_start + 3600 * 24; - } + for(k = 0; k < sizeof(time_criteria) / sizeof(struct time_criterion); k++) { + if(strcmp(time_criteria[k].label, search_field) == 0) { + condition->db_key = ID_TIME_INTERVAL; + if(time_criteria[k].day_criterion) { + 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; + if(time_criteria[k].end_hour >= 0) { + condition->time_stop = time(0) - 3600 * time_criteria[k].end_hour; + } else { + condition->time_stop = 0; + } + } - else if(strcmp(search_field, "sunday") == 0) { - condition->field_id = ID_INTERVAL; - condition->interval_start = time_for_past_day(7); - condition->interval_stop = condition->interval_start + 3600 * 24; + break; + } } - else { + if(condition->db_key == -1) { - /* header-related conditions */ + /* No time condition matched, look for the search fields */ - condition->field_id = -1; - - for(m = 0; (m < MAX_ID) && condition->field_id == -1; m++) { - if(strncmp(field_names[m], search_field, strlen(search_field)) == 0) { - condition->field_id = m; + for(m = 0; (m < MAX_ID) && condition->db_key == -1; m++) { + if(strncmp(field_keys[m], search_field, strlen(search_field)) == 0) { + condition->db_key = m; } } - if(condition->field_id == -1) { + /* None match, if there is a default search field, re-run the search with it */ + + if(condition->db_key == -1) { if(default_search_field) { - for(m = 0; (m < MAX_ID) && condition->field_id == -1; m++) { - if(strncmp(field_names[m], + for(m = 0; (m < MAX_ID) && condition->db_key == -1; m++) { + if(strncmp(field_keys[m], default_search_field, strlen(default_search_field)) == 0) { - condition->field_id = m; + condition->db_key = m; } } string = full_string; + if(string[0] == '!') { string++; } } } - if(condition->field_id == -1) { + if(condition->db_key == -1) { fprintf(stderr, - "mymail: Syntax error in field name \"%s\".\n", + "mymail: Syntax error in field key \"%s\".\n", search_field); exit(EXIT_FAILURE); } - if(regcomp(&condition->regexp, + if(regcomp(&condition->db_value_regexp, string, REG_ICASE)) { fprintf(stderr, "mymail: Syntax error in regexp \"%s\" for field \"%s\".\n", string, - field_names[condition->field_id]); + field_keys[condition->db_key]); exit(EXIT_FAILURE); } } } void free_condition(struct search_condition *condition) { - if(condition->field_id != ID_INTERVAL) { - regfree(&condition->regexp); + if(condition->db_key != ID_TIME_INTERVAL) { + regfree(&condition->db_value_regexp); } } @@ -868,22 +902,22 @@ int main(int argc, char **argv) { char output_filename[PATH_MAX + 1]; int action_index = 0; int error = 0, show_help = 0; - const int nb_fields_to_parse = sizeof(fields_to_parse) / sizeof(struct parsable_field); + const unsigned int nb_fields_to_parse = + sizeof(fields_to_parse) / sizeof(struct parsable_field); char c; - int f, n; - int nb_search_conditions; + unsigned int f, n; + 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); } - paranoid = 0; - quiet = 0; + global_quiet = 0; + global_use_leading_time = 0; default_search_field = 0; - ignore_dot_files = 1; strncpy(output_filename, "", PATH_MAX); setlocale(LC_ALL, ""); @@ -904,7 +938,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': @@ -983,7 +1021,7 @@ int main(int argc, char **argv) { db_filename_regexp_string = default_value(db_filename_regexp_string, "MYMAIL_DB_FILE", - "\.db$"); + "\\.db$"); db_root_path = default_value(db_root_path, "MYMAIL_DB_ROOT", @@ -1039,12 +1077,12 @@ int main(int argc, char **argv) { fprintf(stderr, "mymail: Syntax error in regexp \"%s\" for field \"%s\".\n", fields_to_parse[f].regexp_string, - field_names[fields_to_parse[f].id]); + field_keys[fields_to_parse[f].id]); exit(EXIT_FAILURE); } } - fprintf(db_file, "%s version_%s raw\n", MYMAIL_DB_MAGIC_TOKEN, VERSION); + fprintf(db_file, "%s version_%s format_%d raw\n", MYMAIL_DB_MAGIC_TOKEN, MYMAIL_VERSION, MYMAIL_DB_FORMAT_VERSION); while(optind < argc) { recursive_index_mbox(db_file, @@ -1076,7 +1114,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) { @@ -1128,7 +1166,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 { @@ -1153,7 +1191,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); }