From: Francois Fleuret Date: Tue, 5 Feb 2013 07:52:32 +0000 (+0100) Subject: Major cosmetic changes. X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?p=mymail.git;a=commitdiff_plain;h=e2794d56046669841db12c418620a8fa062e13ad Major cosmetic changes. --- diff --git a/mymail.c b/mymail.c index b0c1216..a77e5e2 100644 --- a/mymail.c +++ b/mymail.c @@ -51,6 +51,7 @@ #define MAX_NB_SEARCH_CONDITIONS 10 #define BUFFER_SIZE 65536 +#define TOKEN_BUFFER_SIZE 1024 regex_t leading_from_line_regexp; @@ -149,11 +150,16 @@ int xor(int a, int b) { return (a && !b) || (!a && b); } -char *segment_next_field(char *current) { - while(*current && *current != ' ') current++; - *current = '\0'; current++; - while(*current && *current == ' ') current++; - return current; +char *parse_token(char *token_buffer, size_t token_buffer_size, + char separator, char *string) { + char *u = token_buffer; + while(u < token_buffer + token_buffer_size - 1 && *string && + *string != separator) { + *(u++) = *(string++); + } + while(*string == separator) string++; + *u = '\0'; + return string; } void remove_eof(char *c) { @@ -264,7 +270,7 @@ int mbox_line_match_search(struct search_condition *condition, } } -void search_in_db(FILE *db_file, +void search_in_db(const char *db_filename, int nb_search_conditions, struct search_condition *search_conditions, FILE *output_file) { @@ -274,11 +280,36 @@ void search_in_db(FILE *db_file, char raw_mbox_line[BUFFER_SIZE]; char current_mail_filename[PATH_MAX + 1]; unsigned long int current_position_in_mail; - char *mbox_name, *mbox_value; + char mbox_name[TOKEN_BUFFER_SIZE], *mbox_value; int mbox_id; int already_written, m, n; int last_mbox_line_was_empty; int nb_body_conditions, nb_fulfilled_body_conditions; + FILE *db_file; + + db_file = fopen(db_filename, "r"); + + if(!db_file) { + fprintf(stderr, + "mymail: Cannot open \"%s\" for reading: %s\n", + db_filename, + strerror(errno)); + exit(EXIT_FAILURE); + } + + 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", + db_filename); + exit(EXIT_FAILURE); + } + } else { + fprintf(stderr, + "mymail: Cannot read the header line in '%s'.\n", + db_filename); + exit(EXIT_FAILURE); + } current_position_in_mail = 0; already_written = 0; @@ -295,12 +326,10 @@ void search_in_db(FILE *db_file, strcpy(current_mail_filename, ""); while(fgets(raw_db_line, BUFFER_SIZE, db_file)) { - mbox_name = raw_db_line; - mbox_value = segment_next_field(raw_db_line); + mbox_value = parse_token(mbox_name, TOKEN_BUFFER_SIZE, ' ', raw_db_line); if(strcmp("mail", mbox_name) == 0) { - char *position_in_file_string; - char *mail_filename; + char position_in_file_string[TOKEN_BUFFER_SIZE]; if(current_mail_filename[0]) { @@ -396,11 +425,9 @@ void search_in_db(FILE *db_file, for(n = 0; n < nb_search_conditions; n++) { hits[n] = 0; } - position_in_file_string = mbox_value; - mail_filename = segment_next_field(mbox_value); + mbox_value = parse_token(position_in_file_string, TOKEN_BUFFER_SIZE, ' ', mbox_value); + mbox_value = parse_token(current_mail_filename, TOKEN_BUFFER_SIZE, ' ', mbox_value); current_position_in_mail = atol(position_in_file_string); - strcpy(current_mail_filename, mail_filename); - remove_eof(current_mail_filename); already_written = 0; } @@ -418,6 +445,8 @@ void search_in_db(FILE *db_file, } } } + + fclose(db_file); } void recursive_search_in_db(const char *entry_name, regex_t *db_filename_regexp, @@ -427,7 +456,6 @@ void recursive_search_in_db(const char *entry_name, regex_t *db_filename_regexp, DIR *dir; struct dirent *dir_e; struct stat sb; - char raw_db_line[BUFFER_SIZE]; char subname[PATH_MAX + 1]; if(lstat(entry_name, &sb) != 0) { @@ -457,38 +485,13 @@ void 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) { - FILE *db_file = fopen(entry_name, "r"); if(!quiet) { printf("Searching in '%s' ... ", entry_name); fflush(stdout); } - if(!db_file) { - fprintf(stderr, - "mymail: Cannot open \"%s\" for reading: %s\n", - db_filename, - strerror(errno)); - exit(EXIT_FAILURE); - } - - 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); - exit(EXIT_FAILURE); - } - } else { - fprintf(stderr, - "mymail: Cannot read the header line in '%s'.\n", - entry_name); - exit(EXIT_FAILURE); - } - - search_in_db(db_file, nb_search_conditions, search_conditions, output_file); - - fclose(db_file); + search_in_db(entry_name, nb_search_conditions, search_conditions, output_file); if(!quiet) { printf("done.\n"); @@ -659,26 +662,94 @@ static struct option long_options[] = { /*********************************************************************/ +void init_condition(struct search_condition *condition, char *string) { + char full_search_field[TOKEN_BUFFER_SIZE], *search_field; + int m; + + string = parse_token(full_search_field, TOKEN_BUFFER_SIZE, ' ', string); + search_field = full_search_field; + + if(search_field[0] == '!') { + search_field++; + condition->negation = 1; + } else { + condition->negation = 0; + } + + if(strcmp(search_field, "6h") == 0) { + condition->field_id = ID_INTERVAL; + condition->interval_start = time(0) - 3600 * 6; + 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; + } + + else if(strcmp(search_field, "yesterday") == 0) { + condition->field_id = ID_INTERVAL; + condition->interval_start = time(0) - 2 * 3600 * 24; + condition->interval_stop = time(0) - 3600 * 24; + } + + else { + 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; + } + } + + if(condition->field_id == -1) { + fprintf(stderr, + "mymail: Syntax error in field name \"%s\".\n", + search_field); + exit(EXIT_FAILURE); + } + + if(regcomp(&condition->regexp, + string, + REG_ICASE)) { + fprintf(stderr, + "mymail: Syntax error in regexp \"%s\" for field \"%s\".\n", + string, + field_names[condition->field_id]); + exit(EXIT_FAILURE); + } + } +} + +void free_condition(struct search_condition *condition) { + if(condition->field_id != ID_INTERVAL) { + regfree(&condition->regexp); + } +} + +/*********************************************************************/ +/*********************************************************************/ +/*********************************************************************/ + 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 f, n; int nb_search_conditions; - char *search_condition_strings[MAX_NB_SEARCH_CONDITIONS]; FILE *output_file; + struct search_condition search_conditions[MAX_NB_SEARCH_CONDITIONS]; if(regcomp(&leading_from_line_regexp, "^From [^ ]*@[^ ]* \\(Mon\\|Tue\\|Wed\\|Thu\\|Fri\\|Sat\\|Sun\\) \\(Jan\\|Feb\\|Mar\\|Apr\\|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$", 0)) { fprintf(stderr, - "mymail: Cannot compile leading from line regexp. That is strange.\n"); + "mymail: Cannot compile leading \"from\" line regexp. That is strange.\n"); exit(EXIT_FAILURE); } - /* printf("%d\n", regexec(&leading_from_line_regexp, "From root@idiap.ch Mon Apr 18 08:25:06 2011\n", 0, 0, 0)); */ - /* exit(EXIT_SUCCESS); */ - paranoid = 0; action_index = 0; db_filename = 0; @@ -736,7 +807,8 @@ int main(int argc, char **argv) { fprintf(stderr, "mymail: Too many search patterns.\n"); exit(EXIT_FAILURE); } - search_condition_strings[nb_search_conditions++] = strdup(optarg); + init_condition(&search_conditions[nb_search_conditions], optarg); + nb_search_conditions++; break; default: @@ -851,68 +923,6 @@ int main(int argc, char **argv) { else { if(nb_search_conditions > 0) { - struct search_condition search_conditions[MAX_NB_SEARCH_CONDITIONS]; - char *search_field, *search_regexp_string; - int m, n; - - for(n = 0; n < nb_search_conditions; n++) { - search_field = search_condition_strings[n]; - - if(search_field[0] == '!') { - search_field++; - search_conditions[n].negation = 1; - } else { - search_conditions[n].negation = 0; - } - - if(strcmp(search_field, "6h") == 0) { - search_conditions[n].field_id = ID_INTERVAL; - search_conditions[n].interval_start = time(0) - 3600 * 6; - search_conditions[n].interval_stop = 0; - } - - else if(strcmp(search_field, "24h") == 0 || - strcmp(search_field, "today") == 0) { - search_conditions[n].field_id = ID_INTERVAL; - search_conditions[n].interval_start = time(0) - 3600 * 24; - search_conditions[n].interval_stop = 0; - } - - else if(strcmp(search_field, "yesterday") == 0) { - search_conditions[n].field_id = ID_INTERVAL; - search_conditions[n].interval_start = time(0) - 2 * 3600 * 24; - search_conditions[n].interval_stop = time(0) - 3600 * 24; - } - - else { - search_regexp_string = segment_next_field(search_condition_strings[n]); - - search_conditions[n].field_id = -1; - - for(m = 0; (m < MAX_ID) && search_conditions[n].field_id == -1; m++) { - if(strncmp(field_names[m], search_field, strlen(search_field)) == 0) { - search_conditions[n].field_id = m; - } - } - - if(search_conditions[n].field_id == -1) { - fprintf(stderr, - "mymail: Syntax error in field name \"%s\".\n", - search_field); - exit(EXIT_FAILURE); - } - - if(regcomp(&search_conditions[n].regexp, - search_regexp_string, - REG_ICASE)) { - fprintf(stderr, - "mymail: Syntax error in regexp \"%s\" for field \"%s\".\n", - search_regexp_string, - field_names[search_conditions[n].field_id]); - exit(EXIT_FAILURE); - } - } - } /* Recursive search if db_root_path is set */ @@ -938,31 +948,15 @@ int main(int argc, char **argv) { if(db_filename_list) { char db_filename[PATH_MAX + 1]; - char *s, *t; - FILE *db_file; + char *s; s = db_filename_list; while(*s) { - t = db_filename; - while(*s == ';') { s++; } - while(*s && *s != ';') { *t++ = *s++; } - *t++ = '\0'; + s = parse_token(db_filename, PATH_MAX + 1, ';', s); if(db_filename[0]) { - db_file = fopen(db_filename, "r"); - - if(!db_file) { - fprintf(stderr, - "mymail: Cannot open \"%s\" for reading: %s\n", - argv[optind], - strerror(errno)); - exit(EXIT_FAILURE); - } - - search_in_db(db_file, nb_search_conditions, search_conditions, output_file); - - fclose(db_file); + search_in_db(db_filename, nb_search_conditions, search_conditions, output_file); } } } @@ -970,31 +964,16 @@ int main(int argc, char **argv) { /* Search in all db files listed in the command arguments */ while(optind < argc) { - FILE *db_file = fopen(argv[optind], "r"); - - if(!db_file) { - fprintf(stderr, - "mymail: Cannot open \"%s\" for reading: %s\n", - argv[optind], - strerror(errno)); - exit(EXIT_FAILURE); - } - - search_in_db(db_file, nb_search_conditions, search_conditions, output_file); - - fclose(db_file); + search_in_db(argv[optind], nb_search_conditions, search_conditions, output_file); optind++; } - - for(n = 0; n < nb_search_conditions; n++) { - if(search_conditions[n].field_id != ID_INTERVAL) { - regfree(&search_conditions[n].regexp); - } - free(search_condition_strings[n]); - } } } + for(n = 0; n < nb_search_conditions; n++) { + free_condition(&search_conditions[n]); + } + if(output_file != stdout) { fflush(output_file); fclose(output_file);