Prompt cosmetics.
[mymail.git] / mymail.c
index f3fc8d5..b890b4b 100644 (file)
--- a/mymail.c
+++ b/mymail.c
 #include <limits.h>
 #include <dirent.h>
 #include <regex.h>
+#include <time.h>
 
 #define MYMAIL_DB_MAGIC_TOKEN "mymail_index_file"
-#define VERSION "0.9"
+#define VERSION "0.9.1"
 
-#define MAX_NB_SEARCH_REQUESTS 10
+#define MAX_NB_SEARCH_CONDITIONS 10
 
 #define BUFFER_SIZE 65536
+#define TOKEN_BUFFER_SIZE 1024
 
-char *db_filename;
-char *db_filename_regexp_string;
-char *db_root_path;
-char *db_filename_list;
+regex_t leading_from_line_regexp;
+
+/* Global variables! */
 
 int paranoid;
-int action_index;
+int quiet;
+char *default_search_field;
 
 /********************************************************************/
 
 enum {
   ID_MAIL = 0,
+  ID_LEADING_LINE,
   ID_FROM,
   ID_TO,
   ID_SUBJECT,
   ID_DATE,
   ID_PARTICIPANT,
+  ID_BODY,
+  ID_INTERVAL,
   MAX_ID
 };
 
 static char *field_names[] = {
   "mail",
+  "lead",
   "from",
   "to",
   "subject",
   "date",
-  "part"
+  "part",
+  "body",
+  "interval"
 };
 
 /********************************************************************/
 
-struct search_request {
+struct search_condition {
   int field_id;
   int negation;
   regex_t regexp;
+  time_t interval_start, interval_stop;
 };
 
 /********************************************************************/
@@ -97,9 +106,15 @@ struct parsable_field {
 };
 
 static struct parsable_field fields_to_parse[] = {
+  {
+    ID_LEADING_LINE,
+    "^From ",
+    { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
+  },
+
   {
     ID_FROM,
-    "^\\(From \\|[Ff][Rr][Oo][Mm]:\\|[R][r][E][e][P][p][L][l][Y][y]-[T][t][O][o]:\\)",
+    "^\\([Ff][Rr][Oo][Mm]:\\|[Rr][Ee][Pp][Ll][Yy]-[Tt][Oo]:\\|[Ss][Ee][Nn][Dd][Ee][Rr]:\\)",
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
   },
 
@@ -129,11 +144,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) {
@@ -165,20 +185,42 @@ void print_usage(FILE *out) {
   print_version(out);
   fprintf(out, "Written by Francois Fleuret <francois@fleuret.org>.\n");
   fprintf(out, "\n");
-  fprintf(out, "Usage: mymail [options] [<mbox dir1> [<mbox dir2> ...]]\n");
+  fprintf(out, "Usage: mymail [options] [<mbox dir1> [<mbox dir2> ...]|<db file1> [<db file2> ...]]\n");
   fprintf(out, "\n");
   fprintf(out, " -h, --help\n");
   fprintf(out, "         show this help\n");
   fprintf(out, " -v, --version\n");
   fprintf(out, "         print the version number\n");
-  fprintf(out, " -i, --index\n");
-  fprintf(out, "         index mails\n");
+  fprintf(out, " -q, --quiet\n");
+  fprintf(out, "         do not print information during search\n");
+  fprintf(out, " -p <db filename pattern>, --db-pattern <db filename pattern>\n");
+  fprintf(out, "         set the db filename pattern for recursive search\n");
+  fprintf(out, " -r <db root path>, --db-root <db root path>\n");
+  fprintf(out, "         set the db root path for recursive search\n");
+  fprintf(out, " -l <db filename list>, --db-list <db filename list>\n");
+  fprintf(out, "         set the semicolon-separated list of db files for search\n");
   fprintf(out, " -s <search pattern>, --search <search pattern>\n");
-  fprintf(out, "         search for matching mails in the data-base file\n");
+  fprintf(out, "         search for matching mails in the db file\n");
   fprintf(out, " -d <db filename>, --db-file <db filename>\n");
-  fprintf(out, "         set the data-base file\n");
-  fprintf(out, " -r <db root path>, --db-root <db root path>\n");
-  fprintf(out, "         set the data-base root path for recursive search\n");
+  fprintf(out, "         set the db filename for indexing\n");
+  fprintf(out, " -i, --index\n");
+  fprintf(out, "         index mails\n");
+  fprintf(out, " -o <output filename>, --output <output filename>\n");
+  fprintf(out, "         set the result file, use stdout if unset\n");
+  fprintf(out, " -a <search field>, --default-search <search field>\n");
+  fprintf(out, "         set the default search field\n");
+}
+
+/*********************************************************************/
+
+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;
 }
 
 /*********************************************************************/
@@ -190,80 +232,248 @@ int ignore_entry(const char *name) {
     (name[0] == '.' && name[1] != '/');
 }
 
-int mbox_line_match_search(struct search_request *request,
-                           int mbox_id, char *mbox_value) {
+int is_a_leading_from_line(int last_mbox_line_was_empty, char *mbox_line) {
   return
-    (request->field_id == mbox_id ||
-     (request->field_id == ID_PARTICIPANT && (mbox_id == ID_FROM || mbox_id == ID_TO)))
-    &&
-    regexec(&request->regexp, mbox_value, 0, 0, 0) == 0;
+
+    /*
+
+      The mbox man page in qmail documentation states:
+
+       > The reader should not attempt to take advantage of the fact
+       > that every From_ line (past the beginning of the file) is
+       > preceded by a blank line.
+
+    */
+
+    /* last_mbox_line_was_empty && */
+    strncmp(mbox_line, "From ", 5) == 0 &&
+    regexec(&leading_from_line_regexp, mbox_line, 0, 0, 0) == 0;
 }
 
-void search_in_db(int nb_search_requests,
-                  struct search_request *search_requests,
-                  FILE *db_file) {
-  int hits[MAX_NB_SEARCH_REQUESTS];
+int mbox_line_match_search(struct search_condition *condition,
+                           int mbox_id, char *mbox_value) {
+
+  if(condition->field_id == ID_INTERVAL) {
+    if(mbox_id == ID_LEADING_LINE) {
+      char *c;
+      time_t t;
+      struct tm tm;
+
+      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)
+
+       ||
+
+       (condition->field_id == ID_PARTICIPANT && (mbox_id == ID_LEADING_LINE ||
+                                                  mbox_id == ID_FROM ||
+                                                  mbox_id == ID_TO))
+       ||
+
+       (condition->field_id == ID_FROM && mbox_id == ID_LEADING_LINE)
+
+       )
+      &&
+      regexec(&condition->regexp, mbox_value, 0, 0, 0) == 0;
+  }
+}
+
+void update_body_hits(char *mail_filename, int position_in_mail,
+                      int nb_search_conditions, struct search_condition *search_conditions,
+                      int nb_body_conditions,
+                      int *hits) {
+  FILE *mail_file;
+  int header, n;
+  int last_mbox_line_was_empty;
+  char raw_mbox_line[BUFFER_SIZE];
+  int nb_body_hits;
+
+  nb_body_hits = 0;
+
+  header = 1;
+  mail_file = fopen(mail_filename, "r");
+
+  if(!mail_file) {
+    fprintf(stderr,
+            "mymail: Cannot open mbox '%s' for body scan.\n",
+            mail_filename);
+    exit(EXIT_FAILURE);
+  }
+
+  fseek(mail_file, position_in_mail, SEEK_SET);
+
+  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(!header) {
+        for(n = 0; n < nb_search_conditions; n++) {
+          if(search_conditions[n].field_id == ID_BODY && !hits[n]) {
+            hits[n] =
+              (regexec(&search_conditions[n].regexp, raw_mbox_line, 0, 0, 0) == 0);
+            if(hits[n]) {
+              nb_body_hits++;
+            }
+          }
+        }
+      }
+
+      if(!fgets(raw_mbox_line, BUFFER_SIZE, mail_file) ||
+         (is_a_leading_from_line(last_mbox_line_was_empty, raw_mbox_line)))
+        break;
+    }
+  }
+
+  fclose(mail_file);
+}
+
+void 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];
   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 *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;
+
+  if(!quiet) {
+    printf("Searching in '%s' ... ", db_filename);
+    fflush(stdout);
+  }
+
+  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;
 
-  for(n = 0; n < nb_search_requests; n++) { hits[n] = 0; }
+  for(n = 0; n < nb_search_conditions; n++) { hits[n] = 0; }
+
+  nb_body_conditions = 0;
+  for(n = 0; n < nb_search_conditions; n++) {
+    if(search_conditions[n].field_id == ID_BODY) {
+      nb_body_conditions++;
+    }
+  }
+
+  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];
 
-      for(n = 0; n < nb_search_requests && xor(hits[n], search_requests[n].negation); n++);
+      if(current_mail_filename[0]) {
 
-      /* for(n = 0; n < nb_search_requests && */
-            /* ((hits[n] && !search_requests[n].negation) || */
-             /* (!hits[n] && search_requests[n].negation)); n++); */
+        /* We first check all conditions but the body ones */
 
-      if(n == nb_search_requests) {
-        FILE *mail_file;
+        for(n = 0; n < nb_search_conditions &&
+              ((search_conditions[n].field_id == ID_BODY) ||
+               xor(hits[n], search_conditions[n].negation)); n++);
 
-        mail_file = fopen(current_mail_filename, "r");
+        if(n == nb_search_conditions) {
 
-        if(!mail_file) {
-          fprintf(stderr, "mymail: Cannot open mbox '%s'.\n", current_mail_filename);
-          exit(EXIT_FAILURE);
-        }
+          /* all conditions but the body ones are fine, 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);
+          }
 
-        fseek(mail_file, current_position_in_mail, SEEK_SET);
+          nb_fulfilled_body_conditions = 0;
 
-        if(fgets(raw_mbox_line, BUFFER_SIZE, mail_file)) {
-          last_mbox_line_was_empty = 1;
-          printf("%s", raw_mbox_line);
-          while(1) {
-            if(!fgets(raw_mbox_line, BUFFER_SIZE, mail_file) ||
-               (last_mbox_line_was_empty && strncmp(raw_mbox_line, "From ", 5) == 0)) break;
-            last_mbox_line_was_empty = (raw_mbox_line[0] == '\n');
-            printf("%s", raw_mbox_line);
+          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++;
+            }
           }
-        }
 
-        fclose(mail_file);
+          if(nb_body_conditions == nb_fulfilled_body_conditions) {
+            FILE *mail_file;
+
+            mail_file = fopen(current_mail_filename, "r");
+
+            if(!mail_file) {
+              fprintf(stderr,
+                      "mymail: Cannot open mbox '%s' for mail extraction.\n",
+                      current_mail_filename);
+              exit(EXIT_FAILURE);
+            }
+
+            fseek(mail_file, current_position_in_mail, SEEK_SET);
+
+            if(fgets(raw_mbox_line, BUFFER_SIZE, mail_file)) {
+              last_mbox_line_was_empty = 0;
+              fprintf(output_file, "%s", raw_mbox_line);
+              while(1) {
+                if(!fgets(raw_mbox_line, BUFFER_SIZE, mail_file) ||
+                   (is_a_leading_from_line(last_mbox_line_was_empty, raw_mbox_line))
+                   )
+                  break;
+                last_mbox_line_was_empty = (raw_mbox_line[0] == '\n');
+                fprintf(output_file, "%s", raw_mbox_line);
+              }
+            }
+
+            fclose(mail_file);
+          }
+        }
       }
 
-      for(n = 0; n < nb_search_requests; n++) { hits[n] = 0; }
+      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;
     }
@@ -275,20 +485,28 @@ void search_in_db(int nb_search_requests,
           mbox_id = m;
         }
       }
-      for(n = 0; n < nb_search_requests; n++) {
-        hits[n] |= mbox_line_match_search(&search_requests[n],
+      for(n = 0; n < nb_search_conditions; n++) {
+        hits[n] |= mbox_line_match_search(&search_conditions[n],
                                           mbox_id, mbox_value);
       }
     }
   }
+
+  fclose(db_file);
+
+  if(!quiet) {
+    printf("done.\n");
+    fflush(stdout);
+  }
 }
 
 void recursive_search_in_db(const char *entry_name, regex_t *db_filename_regexp,
-                            int nb_search_requests, struct search_request *search_requests) {
+                            int nb_search_conditions,
+                            struct search_condition *search_conditions,
+                            FILE *output_file) {
   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) {
@@ -306,7 +524,8 @@ void recursive_search_in_db(const char *entry_name, regex_t *db_filename_regexp,
       if(!ignore_entry(dir_e->d_name)) {
         snprintf(subname, PATH_MAX, "%s/%s", entry_name, dir_e->d_name);
         recursive_search_in_db(subname, db_filename_regexp,
-                               nb_search_requests, search_requests);
+                               nb_search_conditions, search_conditions,
+                               output_file);
       }
     }
     closedir(dir);
@@ -317,33 +536,7 @@ 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(!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(nb_search_requests, search_requests, db_file);
-
-      fclose(db_file);
+      search_in_db(entry_name, nb_search_conditions, search_conditions, output_file);
     }
   }
 }
@@ -389,7 +582,7 @@ void index_mbox(const char *mbox_filename,
   last_mbox_line_was_empty = 1;
 
   while(fgets(raw_mbox_line, BUFFER_SIZE, file)) {
-    if(last_mbox_line_was_empty && strncmp(raw_mbox_line, "From ", 5) == 0) {
+    if(is_a_leading_from_line(last_mbox_line_was_empty, raw_mbox_line)) {
       if(in_header) {
         fprintf(stderr,
                 "Got a ^\"From \" in the header in %s:%lu.\n",
@@ -495,40 +688,204 @@ enum {
 static struct option long_options[] = {
   { "help", no_argument, 0, 'h' },
   { "version", no_argument, 0, 'v' },
+  { "quiet", no_argument, 0, 'q' },
   { "db-file", 1, 0, 'd' },
   { "db-pattern", 1, 0, 'p' },
   { "db-root", 1, 0, 'r' },
   { "db-list", 1, 0, 'l' },
   { "search", 1, 0, 's' },
   { "index", 0, 0, 'i' },
+  { "output", 1, 0, 'o' },
+  { "default-search", 1, 0, 'a' },
   { 0, 0, 0, 0 }
 };
 
 /*********************************************************************/
 
+void init_condition(struct search_condition *condition, char *full_string) {
+  char full_search_field[TOKEN_BUFFER_SIZE], *search_field;
+  int m;
+  char *string;
+
+  string = parse_token(full_search_field, TOKEN_BUFFER_SIZE, ' ', full_string);
+  search_field = full_search_field;
+
+  if(search_field[0] == '!') {
+    search_field++;
+    condition->negation = 1;
+  } else {
+    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, "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;
+  }
+
+  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;
+  }
+
+  /* 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;
+  }
+
+  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;
+  }
+
+  else {
+
+    /* header-related conditions */
+
+    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) {
+      if(default_search_field) {
+        for(m = 0; (m < MAX_ID) && condition->field_id == -1; m++) {
+          if(strncmp(field_names[m],
+                     default_search_field, strlen(default_search_field)) == 0) {
+            condition->field_id = m;
+          }
+        }
+        string = full_string;
+      }
+    }
+
+    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) {
+  char *db_filename;
+  char *db_filename_regexp_string;
+  char *db_root_path;
+  char *db_filename_list;
+  char output_filename[PATH_MAX + 1];
+  int action_index;
   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_requests;
-  char *search_request_strings[MAX_NB_SEARCH_REQUESTS];
-
-  /* for(f = 0; f < argc; f++) { */
-  /* printf("arg %d \"%s\"\n", f, argv[f]); */
-  /* } */
+  int f, n;
+  int 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\\|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$",
+             0)) {
+    fprintf(stderr,
+            "mymail: Cannot compile leading \"from\" line regexp. That is strange.\n");
+    exit(EXIT_FAILURE);
+  }
 
   paranoid = 0;
   action_index = 0;
   db_filename = 0;
+  db_filename_regexp_string = 0;
   db_root_path = 0;
   db_filename_list = 0;
+  quiet = 0;
+  default_search_field = 0;
 
   setlocale(LC_ALL, "");
 
-  nb_search_requests = 0;
+  nb_search_conditions = 0;
 
-  while ((c = getopt_long(argc, argv, "hvip:s:d:r:l:",
+  while ((c = getopt_long(argc, argv, "hvqip:s:d:r:l:o:a:",
                           long_options, NULL)) != -1) {
 
     switch(c) {
@@ -541,6 +898,10 @@ int main(int argc, char **argv) {
       print_version(stdout);
       break;
 
+    case 'q':
+      quiet = 1;
+      break;
+
     case 'i':
       action_index = 1;
       break;
@@ -553,6 +914,10 @@ int main(int argc, char **argv) {
       db_filename_regexp_string = strdup(optarg);
       break;
 
+    case 'o':
+      strncpy(output_filename, optarg, PATH_MAX);
+      break;
+
     case 'r':
       db_root_path = strdup(optarg);
       break;
@@ -562,11 +927,16 @@ int main(int argc, char **argv) {
       break;
 
     case 's':
-      if(nb_search_requests == MAX_NB_SEARCH_REQUESTS) {
+      if(nb_search_conditions == MAX_NB_SEARCH_CONDITIONS) {
         fprintf(stderr, "mymail: Too many search patterns.\n");
         exit(EXIT_FAILURE);
       }
-      search_request_strings[nb_search_requests++] = strdup(optarg);
+      init_condition(&search_conditions[nb_search_conditions], optarg);
+      nb_search_conditions++;
+      break;
+
+    case 'a':
+      default_search_field = optarg;
       break;
 
     default:
@@ -611,6 +981,21 @@ int main(int argc, char **argv) {
     }
   }
 
+  if(output_filename[0]) {
+    output_file = fopen(output_filename, "w");
+
+    if(!output_file) {
+      fprintf(stderr,
+              "mymail: Cannot open result file \"%s\" for writing: %s\n",
+              output_filename,
+              strerror(errno));
+      exit(EXIT_FAILURE);
+    }
+  } else {
+    output_file = stdout;
+    quiet = 1;
+  }
+
   if(error) {
     print_usage(stderr);
     exit(EXIT_FAILURE);
@@ -655,6 +1040,7 @@ int main(int argc, char **argv) {
       optind++;
     }
 
+    fflush(db_file);
     fclose(db_file);
 
     for(f = 0; f < nb_fields_to_parse; f++) {
@@ -664,46 +1050,7 @@ int main(int argc, char **argv) {
 
   else {
 
-    if(nb_search_requests > 0) {
-      struct search_request search_requests[MAX_NB_SEARCH_REQUESTS];
-      char *search_field, *search_regexp_string;
-      int m, n;
-
-      for(n = 0; n < nb_search_requests; n++) {
-        search_field = search_request_strings[n];
-        search_regexp_string = segment_next_field(search_request_strings[n]);
-
-        if(search_field[0] == '!') {
-          search_field++;
-          search_requests[n].negation = 1;
-        } else {
-          search_requests[n].negation = 0;
-        }
-
-        search_requests[n].field_id = -1;
-        for(m = 0; (m < MAX_ID) && search_requests[n].field_id == -1; m++) {
-          if(strncmp(field_names[m], search_field, strlen(search_field)) == 0) {
-            search_requests[n].field_id = m;
-          }
-        }
-
-        if(search_requests[n].field_id == -1) {
-          fprintf(stderr,
-                  "mymail: Syntax error in field name \"%s\".\n",
-                  search_field);
-          exit(EXIT_FAILURE);
-        }
-
-        if(regcomp(&search_requests[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_requests[n].field_id]);
-          exit(EXIT_FAILURE);
-        }
-      }
+    if(nb_search_conditions > 0) {
 
       /* Recursive search if db_root_path is set */
 
@@ -719,7 +1066,8 @@ int main(int argc, char **argv) {
         }
 
         recursive_search_in_db(db_root_path, &db_filename_regexp,
-                               nb_search_requests, search_requests);
+                               nb_search_conditions, search_conditions,
+                               output_file);
 
         regfree(&db_filename_regexp);
       }
@@ -728,31 +1076,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(nb_search_requests, search_requests, db_file);
-
-            fclose(db_file);
+            search_in_db(db_filename, nb_search_conditions, search_conditions, output_file);
           }
         }
       }
@@ -760,33 +1092,27 @@ 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(nb_search_requests, search_requests, db_file);
-
-        fclose(db_file);
+        search_in_db(argv[optind], nb_search_conditions, search_conditions, output_file);
         optind++;
       }
-
-      for(n = 0; n < nb_search_requests; n++) {
-        regfree(&search_requests[n].regexp);
-        free(search_request_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);
+  }
+
   free(db_filename);
   free(db_filename_regexp_string);
   free(db_root_path);
   free(db_filename_list);
 
+  regfree(&leading_from_line_regexp);
+
   exit(EXIT_SUCCESS);
 }