From: Francois Fleuret <francois@fleuret.org>
Date: Mon, 28 Jan 2013 13:31:27 +0000 (+0100)
Subject: Update.
X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=commitdiff_plain;h=234fd9058ed477559401bd581d7dbf78ce08e3a5;p=mymail.git

Update.
---

diff --git a/mymail.c b/mymail.c
index 99a76d8..5b821bc 100644
--- a/mymail.c
+++ b/mymail.c
@@ -19,6 +19,18 @@
  *
  */
 
+/*
+
+   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.
+
+*/
+
 #define _GNU_SOURCE
 
 #include <stdio.h>
@@ -45,6 +57,7 @@ struct parsable_field {
 char *db_filename;
 char *search_pattern;
 
+int paranoid;
 int action_index;
 
 char *segment_next_field(char *current) {
@@ -145,7 +158,6 @@ void search_in_db(const char *search_name, const char *search_regexp_string,
   regfree(&regexp);
 }
 
-
 /*********************************************************************/
 
 void read_file(const char *input_filename,
@@ -160,7 +172,8 @@ void read_file(const char *input_filename,
 
   if(!file) {
     fprintf(stderr, "mymail: Can not open `%s'.\n", input_filename);
-    exit(EXIT_FAILURE);
+    if(paranoid) { exit(EXIT_FAILURE); }
+    return;
   }
 
   in_header = 0;
@@ -172,10 +185,10 @@ void read_file(const char *input_filename,
     if(strncmp(raw_line, "From ", 5) == 0) {
       if(in_header) {
         fprintf(stderr,
-                "Got a 'From ' in the header in %s:%lu.\n",
+                "Got a ^\"From \" in the header in %s:%lu.\n",
                 input_filename, position_in_file);
         fprintf(stderr, "%s", raw_line);
-        exit(EXIT_FAILURE);
+        if(paranoid) { exit(EXIT_FAILURE); }
       }
       in_header = 1;
       new_header = 1;
@@ -183,12 +196,6 @@ void read_file(const char *input_filename,
       if(in_header) { in_header = 0; }
     }
 
-    /* if(in_header) { */
-    /* printf("LINE.H %s", raw_line); */
-    /* } else { */
-    /* printf("LINE.B %s", raw_line); */
-    /* } */
-
     if(in_header) {
       int f;
       regmatch_t matches;
@@ -234,10 +241,6 @@ void process_entry(const char *dir_name,
     exit(EXIT_FAILURE);
   }
 
-  /* if(S_ISLNK(sb.st_mode)) { */
-    /* return; */
-  /* } */
-
   dir = opendir(dir_name);
 
   if(dir) {
@@ -250,9 +253,7 @@ void process_entry(const char *dir_name,
     }
     closedir(dir);
   } else {
-    /* if(S_ISREG(sb.st_mode)) { */
-      read_file(dir_name, nb_fields_to_parse, fields_to_parse, db_file);
-    /* } */
+    read_file(dir_name, nb_fields_to_parse, fields_to_parse, db_file);
   }
 }
 
@@ -293,6 +294,7 @@ int main(int argc, char **argv) {
   char c;
   int f;
 
+  paranoid = 0;
   action_index = 0;
   search_pattern = 0;
 
@@ -317,8 +319,7 @@ int main(int argc, char **argv) {
 
     case 's':
       if(search_pattern) {
-        fprintf(stderr,
-                "mymail: Search pattern already defined.\n");
+        fprintf(stderr, "mymail: Search pattern already defined.\n");
         exit(EXIT_FAILURE);
       }
       search_pattern = strdup(optarg);