X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=mymail.c;h=313b8d53775e9ff9ac6a322e76477861689d8280;hb=a9a15a3dadb15300913fed3234ff5315cf99a4de;hp=c7d41d77d120d980ebede5558439ed06f5e6859e;hpb=ff95e19bacf5e4cd08c5cfba35b23a227ac34274;p=mymail.git diff --git a/mymail.c b/mymail.c index c7d41d7..313b8d5 100644 --- a/mymail.c +++ b/mymail.c @@ -47,6 +47,8 @@ #define MYMAIL_DB_MAGIC_TOKEN "mymail_index_file" #define VERSION "0.1" +#define MAX_NB_SEARCH_PATTERNS 10 + #define BUFFER_SIZE 65536 struct parsable_field { @@ -58,9 +60,6 @@ struct parsable_field { char *db_filename; char *db_root_path; -int multi_db_files; -char *search_pattern; - int paranoid; int action_index; @@ -84,7 +83,7 @@ void *safe_malloc(size_t n) { void *p = malloc(n); if(!p && n != 0) { fprintf(stderr, - "mymail: can not allocate memory: %s\n", strerror(errno)); + "mymail: cannot allocate memory: %s\n", strerror(errno)); exit(EXIT_FAILURE); } return p; @@ -100,7 +99,7 @@ void print_usage(FILE *out) { print_version(out); fprintf(out, "Written by Francois Fleuret .\n"); fprintf(out, "\n"); - fprintf(out, "Usage: mymail [options] [ [ ...]]\n"); + fprintf(out, "Usage: mymail [options] [ [ ...]]\n"); fprintf(out, "\n"); fprintf(out, " -h, --help\n"); fprintf(out, " show this help\n"); @@ -108,10 +107,12 @@ void print_usage(FILE *out) { fprintf(out, " print the version number\n"); fprintf(out, " -i, --index\n"); fprintf(out, " index mails\n"); - fprintf(out, " -d , --db-file \n"); - fprintf(out, " set the data-base file\n"); fprintf(out, " -s , --search \n"); fprintf(out, " search for matching mails in the data-base file\n"); + fprintf(out, " -d , --db-file \n"); + fprintf(out, " set the data-base file\n"); + fprintf(out, " -r , --db-root \n"); + fprintf(out, " set the data-base root path for recursive search\n"); } /*********************************************************************/ @@ -123,78 +124,100 @@ int ignore_entry(const char *name) { (name[0] == '.' && name[1] != '/'); } -void search_in_db(const char *search_name, const char *search_regexp_string, +void search_in_db(int nb_search_patterns, + char **search_name, char **search_regexp_string, FILE *db_file) { - - char raw_line[BUFFER_SIZE]; + int hits[MAX_NB_SEARCH_PATTERNS]; + char raw_db_line[BUFFER_SIZE]; + char raw_mbox_line[BUFFER_SIZE]; char current_mail_filename[PATH_MAX + 1]; unsigned long int current_position_in_mail; char *name, *value; - regex_t regexp; - int already_written; + regex_t regexp[MAX_NB_SEARCH_PATTERNS]; + int already_written, n; - if(regcomp(®exp, - search_regexp_string, - REG_ICASE)) { - fprintf(stderr, - "mymail: Syntax error in regexp \"%s\" for field \"%s\".\n", - search_regexp_string, - search_name); - exit(EXIT_FAILURE); + for(n = 0; n < nb_search_patterns; n++) { + if(regcomp(®exp[n], + search_regexp_string[n], + REG_ICASE)) { + fprintf(stderr, + "mymail: Syntax error in regexp \"%s\" for field \"%s\".\n", + search_regexp_string[n], + search_name[n]); + exit(EXIT_FAILURE); + } } current_position_in_mail = 0; already_written = 0; - while(fgets(raw_line, BUFFER_SIZE, db_file)) { - name = raw_line; - value = segment_next_field(raw_line); + for(n = 0; n < nb_search_patterns; n++) { hits[n] = 0; } + + while(fgets(raw_db_line, BUFFER_SIZE, db_file)) { + name = raw_db_line; + value = segment_next_field(raw_db_line); if(strcmp("mail", name) == 0) { - char *position_in_file_string = value; - char *mail_filename = segment_next_field(value); - current_position_in_mail = atol(position_in_file_string); - strcpy(current_mail_filename, mail_filename); - remove_eof(current_mail_filename); - already_written = 0; - } + char *position_in_file_string; + char *mail_filename; - else if(!already_written) { - if(strcmp(search_name, name) == 0 && regexec(®exp, value, 0, 0, 0) == 0) { + for(n = 0; n < nb_search_patterns && hits[n]; n++); + + if(n == nb_search_patterns) { FILE *mail_file; mail_file = fopen(current_mail_filename, "r"); if(!mail_file) { - fprintf(stderr, "mymail: Can not open '%s'.\n", current_mail_filename); + fprintf(stderr, "mymail: Cannot open mbox '%s'.\n", current_mail_filename); exit(EXIT_FAILURE); } fseek(mail_file, current_position_in_mail, SEEK_SET); - if(fgets(raw_line, BUFFER_SIZE, mail_file)) { - printf("%s", raw_line); - while(fgets(raw_line, BUFFER_SIZE, mail_file) && - strncmp(raw_line, "From ", 5)) { - printf("%s", raw_line); + if(fgets(raw_mbox_line, BUFFER_SIZE, mail_file)) { + printf("%s", raw_mbox_line); + while(fgets(raw_mbox_line, BUFFER_SIZE, mail_file) && + strncmp(raw_mbox_line, "From ", 5)) { + printf("%s", raw_mbox_line); } } fclose(mail_file); - already_written = 1; + } + + for(n = 0; n < nb_search_patterns; n++) { hits[n] = 0; } + + position_in_file_string = value; + mail_filename = segment_next_field(value); + current_position_in_mail = atol(position_in_file_string); + strcpy(current_mail_filename, mail_filename); + + remove_eof(current_mail_filename); + already_written = 0; + } + + else { + for(n = 0; n < nb_search_patterns; n++) { + hits[n] |= + (strncmp(search_name[n], name, strlen(search_name[n])) == 0 && + regexec(®exp[n], value, 0, 0, 0) == 0); } } } - regfree(®exp); + for(n = 0; n < nb_search_patterns; n++) { + regfree(®exp[n]); + } } void recursive_search_in_db(const char *entry_name, - const char *search_name, const char *search_regexp_string) { + int nb_search_patterns, + char **search_name, char **search_regexp_string) { DIR *dir; struct dirent *dir_e; struct stat sb; - char raw_line[BUFFER_SIZE]; + char raw_db_line[BUFFER_SIZE]; char subname[PATH_MAX + 1]; if(lstat(entry_name, &sb) != 0) { fprintf(stderr, - "mymail: Can not stat \"%s\": %s\n", + "mymail: Cannot stat \"%s\": %s\n", entry_name, strerror(errno)); exit(EXIT_FAILURE); @@ -206,7 +229,9 @@ void recursive_search_in_db(const char *entry_name, while((dir_e = readdir(dir))) { if(!ignore_entry(dir_e->d_name)) { snprintf(subname, PATH_MAX, "%s/%s", entry_name, dir_e->d_name); - recursive_search_in_db(subname, search_name, search_regexp_string); + recursive_search_in_db(subname, + nb_search_patterns, + search_name, search_regexp_string); } } closedir(dir); @@ -219,14 +244,14 @@ void recursive_search_in_db(const char *entry_name, if(!db_file) { fprintf(stderr, - "mymail: Can not open \"%s\" for reading: %s\n", + "mymail: Cannot open \"%s\" for reading: %s\n", db_filename, strerror(errno)); exit(EXIT_FAILURE); } - if(fgets(raw_line, BUFFER_SIZE, db_file)) { - if(strncmp(raw_line, MYMAIL_DB_MAGIC_TOKEN, strlen(MYMAIL_DB_MAGIC_TOKEN))) { + if(fgets(raw_db_line, BUFFER_SIZE, db_file)) { + if(strncmp(raw_db_line, MYMAIL_DB_MAGIC_TOKEN, strlen(MYMAIL_DB_MAGIC_TOKEN))) { fprintf(stderr, "mymail: Header line in '%s' does not match the mymail db format.\n", entry_name); @@ -234,12 +259,13 @@ void recursive_search_in_db(const char *entry_name, } } else { fprintf(stderr, - "mymail: Can not read the header line in '%s'.\n", + "mymail: Cannot read the header line in '%s'.\n", entry_name); exit(EXIT_FAILURE); } - search_in_db(search_name, search_regexp_string, db_file); + search_in_db(nb_search_patterns, search_name, search_regexp_string, + db_file); fclose(db_file); } @@ -249,14 +275,14 @@ void recursive_search_in_db(const char *entry_name, /*********************************************************************/ void index_one_mbox_line(int nb_fields_to_parse, struct parsable_field *fields_to_parse, - char *raw_line, FILE *db_file) { + char *raw_mbox_line, FILE *db_file) { regmatch_t matches; int f; for(f = 0; f < nb_fields_to_parse; f++) { - if(regexec(&fields_to_parse[f].regexp, raw_line, 1, &matches, 0) == 0) { + if(regexec(&fields_to_parse[f].regexp, raw_mbox_line, 1, &matches, 0) == 0) { fprintf(db_file, "%s %s\n", fields_to_parse[f].name, - raw_line + matches.rm_eo); + raw_mbox_line + matches.rm_eo); } } } @@ -264,7 +290,7 @@ void index_one_mbox_line(int nb_fields_to_parse, struct parsable_field *fields_t void index_mbox(const char *mbox_filename, int nb_fields_to_parse, struct parsable_field *fields_to_parse, FILE *db_file) { - char raw_line[BUFFER_SIZE], full_line[BUFFER_SIZE]; + char raw_mbox_line[BUFFER_SIZE], full_line[BUFFER_SIZE]; char *end_of_full_line; FILE *file; int in_header, new_header; @@ -273,7 +299,7 @@ void index_mbox(const char *mbox_filename, file = fopen(mbox_filename, "r"); if(!file) { - fprintf(stderr, "mymail: Can not open '%s'.\n", mbox_filename); + fprintf(stderr, "mymail: Cannot open '%s'.\n", mbox_filename); if(paranoid) { exit(EXIT_FAILURE); } return; } @@ -285,18 +311,18 @@ void index_mbox(const char *mbox_filename, end_of_full_line = 0; full_line[0] = '\0'; - while(fgets(raw_line, BUFFER_SIZE, file)) { - if(strncmp(raw_line, "From ", 5) == 0) { + while(fgets(raw_mbox_line, BUFFER_SIZE, file)) { + if(strncmp(raw_mbox_line, "From ", 5) == 0) { if(in_header) { fprintf(stderr, "Got a ^\"From \" in the header in %s:%lu.\n", mbox_filename, position_in_file); - fprintf(stderr, "%s", raw_line); + fprintf(stderr, "%s", raw_mbox_line); if(paranoid) { exit(EXIT_FAILURE); } } in_header = 1; new_header = 1; - } else if(strncmp(raw_line, "\n", 1) == 0) { + } else if(strncmp(raw_mbox_line, "\n", 1) == 0) { if(in_header) { in_header = 0; } } @@ -306,8 +332,8 @@ void index_mbox(const char *mbox_filename, new_header = 0; } - if(raw_line[0] == ' ' || raw_line[0] == '\t') { - char *start = raw_line; + if(raw_mbox_line[0] == ' ' || raw_mbox_line[0] == '\t') { + char *start = raw_mbox_line; while(*start == ' ' || *start == '\t') start++; *(end_of_full_line++) = ' '; strcpy(end_of_full_line, start); @@ -318,12 +344,12 @@ void index_mbox(const char *mbox_filename, } else { - /* if(!((raw_line[0] >= 'a' && raw_line[0] <= 'z') || */ - /* (raw_line[0] >= 'A' && raw_line[0] <= 'Z'))) { */ + /* 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_line); */ + /* fprintf(stderr, "%s", raw_mbox_line); */ /* } */ if(full_line[0]) { @@ -331,7 +357,7 @@ void index_mbox(const char *mbox_filename, } end_of_full_line = full_line; - strcpy(end_of_full_line, raw_line); + strcpy(end_of_full_line, raw_mbox_line); while(*end_of_full_line && *end_of_full_line != '\n') { end_of_full_line++; } @@ -340,7 +366,7 @@ void index_mbox(const char *mbox_filename, } - position_in_file += strlen(raw_line); + position_in_file += strlen(raw_mbox_line); } fclose(file); @@ -356,7 +382,7 @@ void recursive_index_mbox(FILE *db_file, if(lstat(entry_name, &sb) != 0) { fprintf(stderr, - "mymail: Can not stat \"%s\": %s\n", + "mymail: Cannot stat \"%s\": %s\n", entry_name, strerror(errno)); exit(EXIT_FAILURE); @@ -389,10 +415,9 @@ static struct option long_options[] = { { "help", no_argument, 0, 'h' }, { "version", no_argument, 0, 'v' }, { "db-file", 1, 0, 'd' }, - { "db-root", 1, 0, 'p' }, - { "search-pattern", 1, 0, 's' }, + { "db-root", 1, 0, 'r' }, + { "search", 1, 0, 's' }, { "index", 0, 0, 'i' }, - { "multi-db-files", 0, 0, 'm' }, { 0, 0, 0, 0 } }; @@ -417,22 +442,30 @@ static struct parsable_field fields_to_parse[] = { }; +/*********************************************************************/ + int main(int argc, char **argv) { int error = 0, show_help = 0; const int nb_fields_to_parse = sizeof(fields_to_parse) / sizeof(struct parsable_field); char c; int f; + int nb_search_patterns; + char *search_pattern[MAX_NB_SEARCH_PATTERNS]; + + /* for(f = 0; f < argc; f++) { */ + /* printf("arg %d \"%s\"\n", f, argv[f]); */ + /* } */ paranoid = 0; action_index = 0; - search_pattern = 0; db_filename = 0; db_root_path = 0; - multi_db_files = 0; setlocale(LC_ALL, ""); - while ((c = getopt_long(argc, argv, "hvimp:s:d:p:", + nb_search_patterns = 0; + + while ((c = getopt_long(argc, argv, "hvip:s:d:r:", long_options, NULL)) != -1) { switch(c) { @@ -449,24 +482,20 @@ int main(int argc, char **argv) { action_index = 1; break; - case 'm': - multi_db_files = 1; - break; - case 'd': db_filename = strdup(optarg); break; - case 'p': + case 'r': db_root_path = strdup(optarg); break; case 's': - if(search_pattern) { - fprintf(stderr, "mymail: Search pattern already defined.\n"); + if(nb_search_patterns == MAX_NB_SEARCH_PATTERNS) { + fprintf(stderr, "mymail: Too many search patterns.\n"); exit(EXIT_FAILURE); } - search_pattern = strdup(optarg); + search_pattern[nb_search_patterns++] = strdup(optarg); break; default: @@ -479,11 +508,7 @@ int main(int argc, char **argv) { char *default_db_filename = getenv("MYMAIL_DB_FILE"); if(!default_db_filename) { - if(multi_db_files) { - default_db_filename = "mymail.db"; - } else { - default_db_filename = "/tmp/mymail.db"; - } + default_db_filename = "mymail.db"; } db_filename = strdup(default_db_filename); @@ -492,17 +517,18 @@ int main(int argc, char **argv) { if(!db_root_path) { char *default_db_root_path = getenv("MYMAIL_DB_ROOT"); - if(!default_db_root_path) { - if(multi_db_files) { - default_db_root_path = "mymail.db"; - } else { - default_db_root_path = "/tmp/mymail.db"; - } + if(default_db_root_path) { + db_root_path = strdup(default_db_root_path); } + } - db_root_path = strdup(default_db_root_path); + if(!db_root_path) { + fprintf(stderr, + "mymail: db root path is not set\n"); + exit(EXIT_FAILURE); } + if(error) { print_usage(stderr); exit(EXIT_FAILURE); @@ -520,7 +546,7 @@ int main(int argc, char **argv) { if(!db_file) { fprintf(stderr, - "mymail: Can not open \"%s\" for writing: %s\n", + "mymail: Cannot open \"%s\" for writing: %s\n", db_filename, strerror(errno)); exit(EXIT_FAILURE); @@ -556,11 +582,15 @@ int main(int argc, char **argv) { else { - if(search_pattern) { - char *search_name; - char *search_regexp_string; - search_name = search_pattern; - search_regexp_string = segment_next_field(search_pattern); + if(nb_search_patterns > 0) { + char *search_name[MAX_NB_SEARCH_PATTERNS]; + char *search_regexp_string[MAX_NB_SEARCH_PATTERNS]; + int n; + + for(n = 0; n < nb_search_patterns; n++) { + search_name[n] = search_pattern[n]; + search_regexp_string[n] = segment_next_field(search_pattern[n]); + } if(!*search_regexp_string) { fprintf(stderr, @@ -568,9 +598,12 @@ int main(int argc, char **argv) { exit(EXIT_FAILURE); } - recursive_search_in_db(db_root_path, search_name, search_regexp_string); + recursive_search_in_db(db_root_path, + nb_search_patterns, search_name, search_regexp_string); - free(search_pattern); + for(n = 0; n < nb_search_patterns; n++) { + free(search_pattern[n]); + } } }