X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?p=mymail.git;a=blobdiff_plain;f=mymail.c;h=5d16bb3b31f8e18f610a1a7b2df11eb3c95adcaf;hp=20d041910e6bfd98fbd7cf909cde7c3c86238c9d;hb=ed9a958f95d7436aa585bc57a5e4761e8120be02;hpb=1d852dd39736a83b168bbd1f4b0070f40b34be49

diff --git a/mymail.c b/mymail.c
index 20d0419..5d16bb3 100644
--- a/mymail.c
+++ b/mymail.c
@@ -55,17 +55,11 @@
 
 regex_t leading_from_line_regexp;
 
-char *db_filename;
-char *db_filename_regexp_string;
-char *db_root_path;
-char *db_filename_list;
-char output_filename[PATH_MAX + 1];
+/* Global variables! */
 
 int paranoid;
-int action_index;
 int quiet;
-
-time_t being_today;
+char *default_search_field;
 
 /********************************************************************/
 
@@ -213,6 +207,8 @@ void print_usage(FILE *out) {
   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");
 }
 
 /*********************************************************************/
@@ -690,16 +686,18 @@ static struct option long_options[] = {
   { "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 *string) {
+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, ' ', string);
+  string = parse_token(full_search_field, TOKEN_BUFFER_SIZE, ' ', full_string);
   search_field = full_search_field;
 
   if(search_field[0] == '!') {
@@ -709,7 +707,7 @@ void init_condition(struct search_condition *condition, char *string) {
     condition->negation = 0;
   }
 
-  /* Last 8 hours */
+  /* Recently */
 
   if(strcmp(search_field, "8h") == 0) {
     condition->field_id = ID_INTERVAL;
@@ -717,7 +715,17 @@ void init_condition(struct search_condition *condition, char *string) {
     condition->interval_stop = 0;
   }
 
-  /* Today and yesterday */
+  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) {
@@ -726,6 +734,8 @@ void init_condition(struct search_condition *condition, char *string) {
     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;
@@ -777,6 +787,9 @@ void init_condition(struct search_condition *condition, char *string) {
   }
 
   else {
+
+    /* header-related conditions */
+
     condition->field_id = -1;
 
     for(m = 0; (m < MAX_ID) && condition->field_id == -1; m++) {
@@ -785,6 +798,18 @@ void init_condition(struct search_condition *condition, char *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],
+                     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",
@@ -815,6 +840,12 @@ void free_condition(struct search_condition *condition) {
 /*********************************************************************/
 
 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;
@@ -834,15 +865,17 @@ int main(int argc, char **argv) {
   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_conditions = 0;
 
-  while ((c = getopt_long(argc, argv, "hvqip:s:d:r:l:o:",
+  while ((c = getopt_long(argc, argv, "hvqip:s:d:r:l:o:a:",
                           long_options, NULL)) != -1) {
 
     switch(c) {
@@ -892,6 +925,10 @@ int main(int argc, char **argv) {
       nb_search_conditions++;
       break;
 
+    case 'a':
+      default_search_field = optarg;
+      break;
+
     default:
       error = 1;
       break;