imap4d: implement SEARCH CHARSET; fix BODY and TEXT searches.

* imap4d/search.c: Implement proper BODY searches. Implement CHARSET.
* imap4d/util.c (util_strcasestr): Remove. Use mu_c_strcasestr instead.
* imap4d/imap4d.h: Likewise.
* NEWS: Document changes.

5 files changed, 341 insertions, 141 deletions

diff --git a/NEWS b/NEWS
index 84d36010c..4f5c0dec9 100644
--- a/NEWS
+++ b/NEWS
@@ -1,14 +1,23 @@
-GNU mailutils NEWS -- history of user-visible changes. 2019-01-23
+GNU mailutils NEWS -- history of user-visible changes. 2019-01-26
 Copyright (C) 2002-2019 Free Software Foundation, Inc.
 See the end of file for copying conditions.
 
 Please send mailutils bug reports to <bug-mailutils@gnu.org>.
 
 Version 3.5.90 (git)
 
+* imap4d: SEARCH command
+
+** Implemented SEARCH CHARSET
+
+** Improved SEARCH BODY and SEARCH TEXT commands
+
+Both commands now properly descend into multipart message parts and
+decode messages, if necessary
+
 * Fixes in the 'mail' utility
 
 ** New mailbox notation @
 
 @ can be used with any command requring a mailbox name to refer to the
 file given with the -f option.
diff --git a/imap4d/imap4d.h b/imap4d/imap4d.h
index 2ad339a30..b90d653a0 100644
--- a/imap4d/imap4d.h
+++ b/imap4d/imap4d.h
@@ -451,13 +451,12 @@ enum datetime_parse_mode     /* how to parse date/time strings */
 extern int util_parse_internal_date (char *date, time_t *timep,
                                      enum datetime_parse_mode flag);
 extern int util_parse_822_date (const char *date, time_t *timep,
                                 enum datetime_parse_mode flag);
 extern int util_parse_ctime_date (const char *date, time_t *timep,
                                   enum datetime_parse_mode flag);
-extern char *util_strcasestr (const char *haystack, const char *needle);
 extern char *util_localname (void);
 
 void util_print_flags (mu_attribute_t attr);
 int util_attribute_matches_flag (mu_attribute_t attr, const char *item);
 int util_uidvalidity (mu_mailbox_t smbox, unsigned long *uidvp);
 
diff --git a/imap4d/search.c b/imap4d/search.c
index 1d28b570f..3c243eddf 100644
--- a/imap4d/search.c
+++ b/imap4d/search.c
@@ -12,12 +12,13 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    along with GNU Mailutils.  If not, see <http://www.gnu.org/licenses/>. */
 
 #include "imap4d.h"
+#include <mailutils/assoc.h>
 
 /*
  * This will be a royal pain in the arse to implement
  * Alain: True, but the new lib mailbox should coming handy with
  * some sort of query interface.
  * Sergey: It was, indeed.
@@ -87,61 +88,61 @@ struct search_node
     struct search_node *arg[2]; /* Binary operation */
     struct value value;
   } v;
 };
 
 static void cond_msgset (struct parsebuf *, struct search_node *,
-                         struct value *, struct value *);       
+                         struct value *, struct value *);
 static void cond_bcc (struct parsebuf *, struct search_node *,
                       struct value *, struct value *);
 static void cond_before (struct parsebuf *, struct search_node *,
-                         struct value *, struct value *);     
+                         struct value *, struct value *);
 static void cond_body (struct parsebuf *, struct search_node *,
-                       struct value *, struct value *);       
+                       struct value *, struct value *);
 static void cond_cc (struct parsebuf *, struct search_node *,
-                     struct value *, struct value *);        
+                     struct value *, struct value *);
 static void cond_from (struct parsebuf *, struct search_node *,
-                       struct value *, struct value *);     
+                       struct value *, struct value *);
 static void cond_header (struct parsebuf *, struct search_node *,
-                         struct value *, struct value *);      
+                         struct value *, struct value *);
 static void cond_keyword (struct parsebuf *, struct search_node *,
-                          struct value *, struct value *);   
+                          struct value *, struct value *);
 static void cond_larger (struct parsebuf *, struct search_node *,
-                         struct value *, struct value *);   
+                         struct value *, struct value *);
 static void cond_on (struct parsebuf *, struct search_node *,
-                     struct value *, struct value *);         
+                     struct value *, struct value *);
 static void cond_sentbefore (struct parsebuf *, struct search_node *,
-                             struct value *, struct value *); 
+                             struct value *, struct value *);
 static void cond_senton (struct parsebuf *, struct search_node *,
-                         struct value *, struct value *);     
+                         struct value *, struct value *);
 static void cond_sentsince (struct parsebuf *, struct search_node *,
                             struct value *, struct value *);
 static void cond_since (struct parsebuf *, struct search_node *,
-                        struct value *, struct value *);      
+                        struct value *, struct value *);
 static void cond_smaller (struct parsebuf *, struct search_node *,
-                          struct value *, struct value *);    
+                          struct value *, struct value *);
 static void cond_subject (struct parsebuf *, struct search_node *,
-                          struct value *, struct value *);  
+                          struct value *, struct value *);
 static void cond_text (struct parsebuf *, struct search_node *,
-                       struct value *, struct value *);       
+                       struct value *, struct value *);
 static void cond_to (struct parsebuf *, struct search_node *,
-                     struct value *, struct value *);      
+                     struct value *, struct value *);
 static void cond_uid (struct parsebuf *, struct search_node *,
-                      struct value *, struct value *);   
+                      struct value *, struct value *);
 
 /* A basic condition structure */
 struct cond
 {
   char *name;          /* Condition name */
   char *argtypes;      /* String of argument types or NULL if it takes no
                           args */
   instr_fn inst;       /* Corresponding instruction function */
 };
 
 /* Types are: s -- string
-              n -- number
+              n -- number
               d -- date
               m -- message set
 */
 
 /* List of basic conditions. "ALL" and <message set> is handled separately */
 struct cond condlist[] =
@@ -210,105 +211,112 @@ struct mem_chain
 #define CODEINCR 16
 #define STACKSIZE 64
 #define STACKINCR 16
 
 /* Maximum length of a token. Tokens longer than that are accepted, provided
    that they are enclosed in doublequotes */
-#define MAXTOKEN 64 
+#define MAXTOKEN 64
 
 /* Parse buffer structure */
 struct parsebuf
 {
-  imap4d_tokbuf_t tok;          /* Token buffer */   
+  imap4d_tokbuf_t tok;          /* Token buffer */
   int arg;                      /* Argument number */
   char *token;                  /* Current token */
-  int isuid;                    /* UIDs instead of msgnos are required */ 
+  int isuid;                    /* UIDs instead of msgnos are required */
   char *err_mesg;               /* Error message if a parse error occured */
   struct mem_chain *alloc;      /* Chain of objects allocated during parsing */
-  
+  char *charset;                /* Charset, other than US-ASCII requested */
+
   struct search_node *tree;     /* Parse tree */
-  
-                                /* Execution time only: */
+
+                                /* Execution time only: */
   size_t msgno;                 /* Number of current message */
-  mu_message_t msg;             /* Current message */ 
+  mu_message_t msg;             /* Current message */
 };
 
 static void parse_free_mem (struct parsebuf *pb);
 static void *parse_regmem (struct parsebuf *pb, void *mem, void (*f)(void*));
 static char *parse_strdup (struct parsebuf *pb, char *s);