X-Git-Url: https://www.fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=mymail.c;h=c1b09be84869c7fe58f395aceb4bd753e6da6241;hb=1ed39d135312a0c698adf82d81a1723a9141bca3;hp=a29fedbd24855124bb8b4f3e1af2617d312f6fe7;hpb=b956ec62e047fc0cd39b88bc5ee4066982cd93e0;p=mymail.git diff --git a/mymail.c b/mymail.c index a29fedb..c1b09be 100644 --- a/mymail.c +++ b/mymail.c @@ -46,7 +46,7 @@ #include #define MYMAIL_DB_MAGIC_TOKEN "mymail_index_file" -#define MYMAIL_VERSION "0.9.8" +#define MYMAIL_VERSION "0.9.9" #define MYMAIL_DB_FORMAT_VERSION 1 @@ -57,12 +57,20 @@ #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$" +/********************************************************************/ + +struct alias_node { + char *alias, *value; + struct alias_node *next; +}; + /* Global variables! */ int global_quiet; int global_use_leading_time; - +int global_nb_mails_max; regex_t global_leading_from_line_regexp; +struct alias_node *global_alias_list; /********************************************************************/ @@ -186,6 +194,18 @@ char *default_value(char *current_value, } } +/********************************************************************/ + +void *safe_malloc(size_t n) { + void *p = malloc(n); + if(!p && n != 0) { + fprintf(stderr, + "selector: cannot allocate memory: %s\n", strerror(errno)); + exit(EXIT_FAILURE); + } + return p; +} + FILE *safe_fopen(const char *path, const char *mode, const char *comment) { FILE *result = fopen(path, mode); if(result) { @@ -229,12 +249,14 @@ 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"); fprintf(out, " -o , --output \n"); fprintf(out, " set the result file, use stdout if unset\n"); + fprintf(out, " -n , --nb-mails-max \n"); + 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"); } @@ -396,6 +418,8 @@ void update_time(int db_key, const char *db_value, time_t *t) { const char *c; struct tm tm; + memset(&tm, 0, sizeof(struct tm)); + if(db_key == ID_LEADING_LINE) { c = db_value; while(*c && *c != ' ') c++; while(*c && *c == ' ') c++; @@ -416,6 +440,7 @@ void update_time(int db_key, const char *db_value, time_t *t) { } int search_in_db(const char *db_filename, + int nb_extracted_mails, int nb_search_conditions, struct search_condition *search_conditions, FILE *output_file) { @@ -430,13 +455,10 @@ int search_in_db(const char *db_filename, 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(!global_quiet) { printf("Searching in '%s' ... ", db_filename); fflush(stdout); @@ -481,7 +503,8 @@ int search_in_db(const char *db_filename, strcpy(current_mail_filename, ""); - while(fgets(raw_db_line, BUFFER_SIZE, db_file)) { + while(nb_extracted_mails < global_nb_mails_max && + fgets(raw_db_line, BUFFER_SIZE, db_file)) { db_value = parse_token(db_key_string, TOKEN_BUFFER_SIZE, ' ', raw_db_line); if(strcmp("mail", db_key_string) == 0) { @@ -520,14 +543,14 @@ int search_in_db(const char *db_filename, } } - 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(nb_extracted_mails < global_nb_mails_max && + current_mail_filename[0] && + 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); @@ -541,6 +564,7 @@ int search_in_db(const char *db_filename, } int recursive_search_in_db(const char *entry_name, regex_t *db_filename_regexp, + int nb_extracted_mails, int nb_search_conditions, struct search_condition *search_conditions, FILE *output_file) { @@ -548,7 +572,6 @@ int recursive_search_in_db(const char *entry_name, regex_t *db_filename_regexp, struct dirent *dir_e; struct stat sb; char subname[PATH_MAX + 1]; - int nb_extracted_mails = 0; if(lstat(entry_name, &sb) != 0) { fprintf(stderr, @@ -563,12 +586,14 @@ int recursive_search_in_db(const char *entry_name, regex_t *db_filename_regexp, dir = opendir(entry_name); if(dir) { - while((dir_e = readdir(dir))) { + while((dir_e = readdir(dir)) && + nb_extracted_mails < global_nb_mails_max) { if(!ignore_entry(dir_e->d_name)) { snprintf(subname, PATH_MAX, "%s/%s", entry_name, dir_e->d_name); - nb_extracted_mails += recursive_search_in_db(subname, db_filename_regexp, - nb_search_conditions, search_conditions, - output_file); + nb_extracted_mails = recursive_search_in_db(subname, db_filename_regexp, + nb_extracted_mails, + nb_search_conditions, search_conditions, + output_file); } } closedir(dir); @@ -579,8 +604,10 @@ int recursive_search_in_db(const char *entry_name, regex_t *db_filename_regexp, while(*s) { if(*s == '/') { filename = s+1; } s++; } if(regexec(db_filename_regexp, filename, 0, 0, 0) == 0) { - nb_extracted_mails += - search_in_db(entry_name, nb_search_conditions, search_conditions, output_file); + nb_extracted_mails = + search_in_db(entry_name, + nb_extracted_mails, + nb_search_conditions, search_conditions, output_file); } } @@ -739,7 +766,7 @@ static struct option long_options[] = { { "version", no_argument, 0, 'v' }, { "quiet", no_argument, 0, 'q' }, { "use-leading-time", no_argument, 0, 't' }, - { "db-file-generate", 1, 0, 'd' }, + { "db-file-output", 1, 0, 'd' }, { "db-pattern", 1, 0, 'p' }, { "db-root", 1, 0, 'r' }, { "db-list", 1, 0, 'l' }, @@ -748,6 +775,7 @@ static struct option long_options[] = { { "index", 0, 0, 'i' }, { "output", 1, 0, 'o' }, { "default-search", 1, 0, 'a' }, + { "nb-mails-max", 1, 0, 'n' }, { 0, 0, 0, 0 } }; @@ -767,6 +795,7 @@ static struct time_criterion time_criteria[] = { { "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 }, @@ -803,6 +832,14 @@ void init_condition(struct search_condition *condition, const char *full_string, char full_search_field[TOKEN_BUFFER_SIZE], *search_field; unsigned int k, m; const char *string; + struct alias_node *a; + + for(a = global_alias_list; a; a = a->next) { + if(strcmp(full_string, a->alias) == 0) { + full_string = a->value; + break; + } + } string = parse_token(full_search_field, TOKEN_BUFFER_SIZE, ' ', full_string); search_field = full_search_field; @@ -887,6 +924,72 @@ void free_condition(struct search_condition *condition) { } } +const char *eat_space(const char *s) { + while(*s == ' ' || *s == '\t') { s++; } + return s; +} + +void read_rc_file(const char *rc_filename) { + char raw_line[BUFFER_SIZE]; + char command[TOKEN_BUFFER_SIZE], tmp_token[TOKEN_BUFFER_SIZE]; + + FILE *rc_file; + int line_number; + const char *s; + char *t; + + rc_file = fopen(rc_filename, "r"); + + if(rc_file) { + line_number = 1; + while(fgets(raw_line, BUFFER_SIZE, rc_file)) { + t = raw_line; + while(*t) { if(*t == '\n') { *t = '\0'; }; t++; } + + s = raw_line; + s = eat_space(s); + + if(*s && *s != '#') { + s = parse_token(command, TOKEN_BUFFER_SIZE, ' ', s); + + if(strcmp(command, "alias") == 0) { + struct alias_node *a = safe_malloc(sizeof(struct alias_node)); + a->next = global_alias_list; + global_alias_list = a; + if(s) { + s = eat_space(s); + s = parse_token(tmp_token, TOKEN_BUFFER_SIZE, '=', s); + a->alias = strdup(tmp_token); + if(s) { + s = eat_space(s); + a->value = strdup(s); + } else { + fprintf(stderr, "%s:%d syntax error, missing alias value.\n", + rc_filename, + line_number); + exit(EXIT_FAILURE); + } + } else { + fprintf(stderr, "%s:%d syntax error, missing alias key.\n", + rc_filename, + line_number); + exit(EXIT_FAILURE); + } + } else { + fprintf(stderr, "%s:%d syntax error, unknown command '%s'.\n", + rc_filename, + line_number, + command); + exit(EXIT_FAILURE); + } + } + + line_number++; + } + fclose(rc_file); + } +} + /*********************************************************************/ /*********************************************************************/ /*********************************************************************/ @@ -899,6 +1002,7 @@ int main(int argc, char **argv) { char *mbox_filename_regexp_string = 0; char *default_search_field; char output_filename[PATH_MAX + 1]; + char rc_filename[PATH_MAX + 1]; int action_index = 0; int error = 0, show_help = 0; const unsigned int nb_fields_to_parse = @@ -907,6 +1011,7 @@ int main(int argc, char **argv) { unsigned int f, n; unsigned int nb_search_conditions; struct search_condition search_conditions[MAX_NB_SEARCH_CONDITIONS]; + struct alias_node *a, *b; if(regcomp(&global_leading_from_line_regexp, LEADING_FROM_LINE_REGEXP_STRING, 0)) { fprintf(stderr, @@ -914,11 +1019,36 @@ int main(int argc, char **argv) { exit(EXIT_FAILURE); } + if(getenv("MYMAILRC")) { + sprintf(rc_filename, "%s", getenv("MYMAILRC")); + } else if(getenv("HOME")) { + sprintf(rc_filename, "%s/.mymailrc", getenv("HOME")); + } else { + rc_filename[0] = '\0'; + } + + global_alias_list = 0; global_quiet = 0; global_use_leading_time = 0; + global_nb_mails_max = 250; + default_search_field = 0; strncpy(output_filename, "", PATH_MAX); + if(rc_filename[0]) { + read_rc_file(rc_filename); + } + + /* + { + #warning Test code added on 2013 May 02 11:17:01 + struct alias_node *a; + for(a = global_alias_list; a; a = a->next) { + printf ("ALIAS [%s] [%s]\n", a->alias, a->value); + } + } + */ + setlocale(LC_ALL, ""); nb_search_conditions = 0; @@ -1005,6 +1135,10 @@ int main(int argc, char **argv) { default_search_field = optarg; break; + case 'n': + global_nb_mails_max = atoi(optarg); + break; + default: error = 1; break; @@ -1081,7 +1215,11 @@ int main(int argc, char **argv) { } } - fprintf(db_file, "%s version_%s format_%d raw\n", MYMAIL_DB_MAGIC_TOKEN, MYMAIL_VERSION, MYMAIL_DB_FORMAT_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, @@ -1131,9 +1269,10 @@ int main(int argc, char **argv) { exit(EXIT_FAILURE); } - nb_extracted_mails += recursive_search_in_db(db_root_path, &db_filename_regexp, - nb_search_conditions, search_conditions, - output_file); + nb_extracted_mails = recursive_search_in_db(db_root_path, &db_filename_regexp, + nb_extracted_mails, + nb_search_conditions, search_conditions, + output_file); regfree(&db_filename_regexp); } @@ -1150,8 +1289,10 @@ int main(int argc, char **argv) { s = parse_token(db_filename, PATH_MAX + 1, ';', s); if(db_filename[0]) { - nb_extracted_mails += - search_in_db(db_filename, nb_search_conditions, search_conditions, output_file); + nb_extracted_mails = + search_in_db(db_filename, + nb_extracted_mails, + nb_search_conditions, search_conditions, output_file); } } } @@ -1159,8 +1300,10 @@ int main(int argc, char **argv) { /* Search in all db files listed in the command arguments */ while(optind < argc) { - nb_extracted_mails += - search_in_db(argv[optind], nb_search_conditions, search_conditions, output_file); + nb_extracted_mails = + search_in_db(argv[optind], + nb_extracted_mails, + nb_search_conditions, search_conditions, output_file); optind++; } } @@ -1184,6 +1327,15 @@ int main(int argc, char **argv) { free_condition(&search_conditions[n]); } + a = global_alias_list; + while(a) { + b = a->next; + free(a->alias); + free(a->value); + free(a); + a = b; + } + free(db_filename); free(db_filename_regexp_string); free(db_root_path);