#include <time.h>
#define MYMAIL_DB_MAGIC_TOKEN "mymail_index_file"
-#define VERSION "0.9.2"
+#define VERSION "0.9.5"
#define MAX_NB_SEARCH_CONDITIONS 32
/* Global variables! */
-int paranoid;
int quiet;
-int ignore_dot_files;
regex_t leading_from_line_regexp;
MAX_ID
};
-static char *field_names[] = {
+static char *field_keys[] = {
"mail",
"lead",
"from",
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) {
char raw_db_line[BUFFER_SIZE];
char current_mail_filename[PATH_MAX + 1];
unsigned long int current_position_in_mail;
- char mbox_name[TOKEN_BUFFER_SIZE];
+ char mbox_key[TOKEN_BUFFER_SIZE];
const char *mbox_value;
int mbox_id;
int already_written, m, n;
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);
+ mbox_value = parse_token(mbox_key, TOKEN_BUFFER_SIZE, ' ', raw_db_line);
- if(strcmp("mail", mbox_name) == 0) {
+ if(strcmp("mail", mbox_key) == 0) {
char position_in_file_string[TOKEN_BUFFER_SIZE];
if(current_mail_filename[0]) {
/* 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);
- }
-
- 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++;
+ 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++;
+ }
}
}
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) {
+ if(strncmp(field_keys[m], mbox_key, strlen(mbox_key)) == 0) {
mbox_id = m;
}
}
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);
}
}
"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); }
}
in_header = 1;
new_header = 1;
{ "8h", 8, -1, -1 },
{ "today", 24, -1, -1 },
{ "24h", 24, -1, -1 },
+ { "48h", 48, -1, -1 },
{ "week", 24 * 7, -1, -1 },
{ "month", 24 * 31, -1, -1 },
{ "year", 24 * 365, -1, -1 },
/* No time condition matched, look for the search fields */
for(m = 0; (m < MAX_ID) && condition->field_id == -1; m++) {
- if(strncmp(field_names[m], search_field, strlen(search_field)) == 0) {
+ if(strncmp(field_keys[m], search_field, strlen(search_field)) == 0) {
condition->field_id = m;
}
}
if(condition->field_id == -1) {
if(default_search_field) {
for(m = 0; (m < MAX_ID) && condition->field_id == -1; m++) {
- if(strncmp(field_names[m],
+ if(strncmp(field_keys[m],
default_search_field, strlen(default_search_field)) == 0) {
condition->field_id = m;
}
if(condition->field_id == -1) {
fprintf(stderr,
- "mymail: Syntax error in field name \"%s\".\n",
+ "mymail: Syntax error in field key \"%s\".\n",
search_field);
exit(EXIT_FAILURE);
}
fprintf(stderr,
"mymail: Syntax error in regexp \"%s\" for field \"%s\".\n",
string,
- field_names[condition->field_id]);
+ field_keys[condition->field_id]);
exit(EXIT_FAILURE);
}
}
exit(EXIT_FAILURE);
}
- paranoid = 0;
quiet = 0;
default_search_field = 0;
- ignore_dot_files = 1;
strncpy(output_filename, "", PATH_MAX);
setlocale(LC_ALL, "");
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);
}
}