Cosmetics.

[mymail.git] / mymail.c

diff --git a/mymail.c b/mymail.c
index 325562e..df64b5a 100644 (file)
--- a/mymail.c
+++ b/mymail.c
@@ -46,7 +46,7 @@
 #include <time.h>
 
 #define MYMAIL_DB_MAGIC_TOKEN "mymail_index_file"
-#define VERSION "0.9.2"
+#define VERSION "0.9.5"
 
 #define MAX_NB_SEARCH_CONDITIONS 32
 
@@ -155,11 +155,12 @@ int xor(int a, int b) {
 const char *parse_token(char *token_buffer, size_t token_buffer_size,
                         char separator, const char *string) {
   char *u = token_buffer;
+  while(*string == separator) { string++; }
   while(u < token_buffer + token_buffer_size - 1 && *string &&
         *string != separator) {
     *(u++) = *(string++);
   }
-  while(*string == separator) string++;
+  while(*string == separator) { string++; }
   *u = '\0';
   return string;
 }
@@ -431,19 +432,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++;
+              }
             }
           }
 
@@ -703,6 +704,7 @@ static struct time_criterion time_criteria[] = {
   { "8h",         8,       -1, -1 },
   { "today",     24,       -1, -1 },
   { "24h",       24,       -1, -1 },
+  { "48h",       48,       -1, -1 },
   { "week",      24 *   7, -1, -1 },
   { "month",     24 *  31, -1, -1 },
   { "year",      24 * 365, -1, -1 },