X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=mymail.c;h=318ba918c06c17540041c4ff28a02439f3813cf7;hb=5b75c74b6e32348eeb8ac214b39cb36aa82b9ab5;hp=6e3f5cc8c019d7308e5e83cc38e105abc972fc03;hpb=0b0fa4842f3caddfb46758e81abe44e0207e2ea2;p=mymail.git

diff --git a/mymail.c b/mymail.c
index 6e3f5cc..318ba91 100644
--- a/mymail.c
+++ b/mymail.c
@@ -57,11 +57,9 @@
 
 /* Global variables! */
 
-int paranoid;
-int quiet;
-int ignore_dot_files;
+int global_quiet;
 
-regex_t leading_from_line_regexp;
+regex_t global_leading_from_line_regexp;
 
 /********************************************************************/
 
@@ -78,7 +76,7 @@ enum {
   MAX_ID
 };
 
-static char *field_names[] = {
+static char *field_keys[] = {
   "mail",
   "lead",
   "from",
@@ -238,13 +236,13 @@ int ignore_entry(const char *name) {
   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) {
   return
     strncmp(mbox_line, "From ", 5) == 0 &&
-    regexec(&leading_from_line_regexp, mbox_line, 0, 0, 0) == 0;
+    regexec(&global_leading_from_line_regexp, mbox_line, 0, 0, 0) == 0;
 }
 
 int mbox_line_match_search(struct search_condition *condition,
@@ -365,7 +363,7 @@ int search_in_db(const char *db_filename,
   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;
@@ -375,7 +373,7 @@ int search_in_db(const char *db_filename,
 
   nb_extracted_mails = 0;
 
-  if(!quiet) {
+  if(!global_quiet) {
     printf("Searching in '%s' ... ", db_filename);
     fflush(stdout);
   }
@@ -415,9 +413,9 @@ int search_in_db(const char *db_filename,
   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]) {
@@ -432,19 +430,19 @@ int search_in_db(const char *db_filename,
 
           /* 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++;
+              }
             }
           }
 
@@ -466,7 +464,7 @@ int search_in_db(const char *db_filename,
     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;
         }
       }
@@ -479,7 +477,7 @@ int search_in_db(const char *db_filename,
 
   fclose(db_file);
 
-  if(!quiet) {
+  if(!global_quiet) {
     printf("done.\n");
     fflush(stdout);
   }
@@ -544,7 +542,7 @@ void index_one_mbox_line(unsigned int nb_fields_to_parse,
   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);
     }
   }
@@ -575,7 +573,6 @@ void index_mbox(const char *mbox_filename,
                 "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;
@@ -777,7 +774,7 @@ void init_condition(struct search_condition *condition, const char *full_string,
     /* 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;
       }
     }
@@ -787,18 +784,19 @@ void init_condition(struct search_condition *condition, const char *full_string,
     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;
           }
         }
         string = full_string;
+        if(string[0] == '!') { string++; }
       }
     }
 
     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);
     }
@@ -809,7 +807,7 @@ void init_condition(struct search_condition *condition, const char *full_string,
       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);
     }
   }
@@ -842,16 +840,14 @@ int main(int argc, char **argv) {
   unsigned int nb_search_conditions;
   struct search_condition search_conditions[MAX_NB_SEARCH_CONDITIONS];
 
-  if(regcomp(&leading_from_line_regexp, LEADING_FROM_LINE_REGEXP_STRING, 0)) {
+  if(regcomp(&global_leading_from_line_regexp, LEADING_FROM_LINE_REGEXP_STRING, 0)) {
     fprintf(stderr,
             "mymail: Cannot compile leading \"from\" line regexp. That is strange.\n");
     exit(EXIT_FAILURE);
   }
 
-  paranoid = 0;
-  quiet = 0;
+  global_quiet = 0;
   default_search_field = 0;
-  ignore_dot_files = 1;
   strncpy(output_filename, "", PATH_MAX);
 
   setlocale(LC_ALL, "");
@@ -872,7 +868,7 @@ int main(int argc, char **argv) {
       break;
 
     case 'q':
-      quiet = 1;
+      global_quiet = 1;
       break;
 
     case 'i':
@@ -1007,7 +1003,7 @@ int main(int argc, char **argv) {
         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);
       }
     }
@@ -1044,7 +1040,7 @@ int main(int argc, char **argv) {
       output_file = safe_fopen(output_filename, "w", "result mbox");
     } else {
       output_file = stdout;
-      quiet = 1;
+      global_quiet = 1;
     }
 
     if(nb_search_conditions > 0) {
@@ -1096,7 +1092,7 @@ int main(int argc, char **argv) {
       }
     }
 
-    if(!quiet) {
+    if(!global_quiet) {
       if(nb_extracted_mails > 0) {
         printf("Found %d matching mails.\n", nb_extracted_mails);
       } else {
@@ -1121,7 +1117,7 @@ int main(int argc, char **argv) {
   free(db_filename_list);
   free(mbox_filename_regexp_string);
 
-  regfree(&leading_from_line_regexp);
+  regfree(&global_leading_from_line_regexp);
 
   exit(EXIT_SUCCESS);
 }