Now deals properly with multi-lines header lines. Does not deal with multipart mails.

[mymail.git] / mymail.c

diff --git a/mymail.c b/mymail.c
index 5b821bc..125366a 100644 (file)
--- a/mymail.c
+++ b/mymail.c
@@ -21,13 +21,13 @@
 
 /*
 
-   This command is a dumb mail indexer. It can either (1) scan
-   directories containing mbox files, and create a db file containing
-   for each mail a list of fields computed from the header, or (2)
-   read such a db file and get all the mails matching regexp-defined
-   conditions on the fields.
+  This command is a dumb mail indexer. It can either (1) scan
+  directories containing mbox files, and create a db file containing
+  for each mail a list of fields computed from the header, or (2)
+  read such a db file and get all the mails matching regexp-defined
+  conditions on the fields.
 
-   It is low-tech, simple, light and fast.
+  It is low-tech, simple, light and fast.
 
 */
 
@@ -134,7 +134,7 @@ void search_in_db(const char *search_name, const char *search_regexp_string,
     }
 
     else if(!already_written) {
-     if(strcmp(search_name, name) == 0 && regexec(&regexp, value, 0, 0, 0) == 0) {
+      if(strcmp(search_name, name) == 0 && regexec(&regexp, value, 0, 0, 0) == 0) {
         FILE *mail_file;
         mail_file = fopen(current_mail_filename, "r");
         if(!mail_file) {
@@ -160,10 +160,24 @@ void search_in_db(const char *search_name, const char *search_regexp_string,
 
 /*********************************************************************/
 
-void read_file(const char *input_filename,
-               int nb_fields_to_parse, struct parsable_field *fields_to_parse,
-               FILE *db_file) {
-  char raw_line[BUFFER_SIZE];
+void index_one_mbox_line(int nb_fields_to_parse, struct parsable_field *fields_to_parse,
+                         char *raw_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) {
+      fprintf(db_file, "%s %s\n",
+              fields_to_parse[f].name,
+              raw_line + matches.rm_eo);
+    }
+  }
+}
+
+void index_mbox(const char *input_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 *end_of_full_line;
   FILE *file;
   int in_header, new_header;
   unsigned long int position_in_file;
@@ -196,20 +210,46 @@ void read_file(const char *input_filename,
       if(in_header) { in_header = 0; }
     }
 
+    /* printf("PARSE %d %s", in_header, raw_line); */
+
     if(in_header) {
-      int f;
-      regmatch_t matches;
       if(new_header) {
         fprintf(db_file, "mail %lu %s\n", position_in_file, input_filename);
         new_header = 0;
       }
-      for(f = 0; f < nb_fields_to_parse; f++) {
-        if(regexec(&fields_to_parse[f].regexp, raw_line, 1, &matches, 0) == 0) {
-          fprintf(db_file, "%s %s",
-                  fields_to_parse[f].name,
-                  raw_line + matches.rm_eo);
+
+      if(raw_line[0] == ' ' || raw_line[0] == '\t') {
+        char *start = raw_line;
+        while(*start == ' ' || *start == '\t') start++;
+        *(end_of_full_line++) = ' ';
+        strcpy(end_of_full_line, start);
+        while(*end_of_full_line && *end_of_full_line != '\n') {
+          end_of_full_line++;
         }
+        *end_of_full_line = '\0';
       }
+
+      else {
+        /* if(!((raw_line[0] >= 'a' && raw_line[0] <= 'z') || */
+             /* (raw_line[0] >= 'A' && raw_line[0] <= 'Z'))) { */
+          /* fprintf(stderr, */
+                  /* "Header line syntax error %s:%lu.\n", */
+                  /* input_filename, position_in_file); */
+          /* fprintf(stderr, "%s", raw_line); */
+        /* } */
+
+        if(full_line[0]) {
+          index_one_mbox_line(nb_fields_to_parse, fields_to_parse, full_line, db_file);
+        }
+
+        end_of_full_line = full_line;
+        strcpy(end_of_full_line, raw_line);
+        while(*end_of_full_line && *end_of_full_line != '\n') {
+          end_of_full_line++;
+        }
+        *end_of_full_line = '\0';
+      }
+
     }
 
     position_in_file += strlen(raw_line);
@@ -253,7 +293,7 @@ void process_entry(const char *dir_name,
     }
     closedir(dir);
   } else {
-    read_file(dir_name, nb_fields_to_parse, fields_to_parse, db_file);
+    index_mbox(dir_name, nb_fields_to_parse, fields_to_parse, db_file);
   }
 }
 
@@ -261,8 +301,7 @@ void process_entry(const char *dir_name,
 
 /* For long options that have no equivalent short option, use a
    non-character as a pseudo short option, starting with CHAR_MAX + 1.  */
-enum
-{
+enum {
   OPT_BASH_MODE = CHAR_MAX + 1
 };
 
@@ -394,9 +433,9 @@ int main(int argc, char **argv) {
       }
 
       /* printf("Starting search in %s for field \"%s\" matching \"%s\".\n", */
-             /* db_filename, */
-             /* search_name, */
-             /* search_regexp_string); */
+      /* db_filename, */
+      /* search_name, */
+      /* search_regexp_string); */
 
       db_file = fopen(db_filename, "r");