1 files changed, 329 insertions, 129 deletions

diff --git a/imap4d/search.c b/imap4d/search.c
index 1d28b570f..3c243eddf 100644
--- a/imap4d/search.c
+++ b/imap4d/search.c
@@ -15,6 +15,7 @@
    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
@@ -90,43 +91,43 @@ struct search_node
 };
 
 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
@@ -138,7 +139,7 @@ struct cond
 };
 
 /* Types are: s -- string
-              n -- number
+              n -- number
               d -- date
               m -- message set
 */
@@ -213,23 +214,24 @@ struct mem_chain
 
 /* 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);
@@ -241,37 +243,38 @@ static struct search_node *parse_search_key (struct parsebuf *pb);
 static int parse_gettoken (struct parsebuf *pb, int req);
 static int search_run (struct parsebuf *pb);
 static void do_search (struct parsebuf *pb);
+static int available_charset (const char *charset);
 
 /*
 6.4.4.  SEARCH Command
 
    Arguments:  OPTIONAL [CHARSET] specification
-               searching criteria (one or more)
+               searching criteria (one or more)
 
    Responses:  REQUIRED untagged response: SEARCH
 
    Result:     OK - search completed
-               NO - search error: can't search that [CHARSET] or
-                    criteria
-               BAD - command unknown or arguments invalid
+               NO - search error: can't search that [CHARSET] or
+                    criteria
+               BAD - command unknown or arguments invalid
 */
 
 int
 imap4d_search (struct imap4d_session *session,
-               struct imap4d_command *command, imap4d_tokbuf_t tok)
+               struct imap4d_command *command, imap4d_tokbuf_t tok)
 {
   int rc;
   char *err_text= "";
-  
+
   rc = imap4d_search0 (tok, 0, &err_text);
   return io_completion_response (command, rc, "%s", err_text);
 }
-  
+
 int
 imap4d_search0 (imap4d_tokbuf_t tok, int isuid, char **err_text)
 {
   struct parsebuf parsebuf;
-  
+
   memset (&parsebuf, 0, sizeof(parsebuf));
   parsebuf.tok = tok;
   parsebuf.arg = IMAP4_ARG_1 + !!isuid;
@@ -284,7 +287,7 @@ imap4d_search0 (imap4d_tokbuf_t tok, int isuid, char **err_text)
       *err_text = "Too few args";
       return RESP_BAD;
     }
-  
+
   if (mu_c_strcasecmp (parsebuf.token, "CHARSET") == 0)
     {
       if (!parse_gettoken (&parsebuf, 0))
@@ -296,16 +299,21 @@ imap4d_search0 (imap4d_tokbuf_t tok, int isuid, char **err_text)
       /* Currently only ASCII is supported */
       if (mu_c_strcasecmp (parsebuf.token, "US-ASCII"))
         {
-          *err_text = "Charset not supported";
-          return RESP_NO;
+          parsebuf.charset = parse_strdup (&parsebuf, parsebuf.token);
+          if (!available_charset (parsebuf.charset))
+            {
+              *err_text = "[BADCHARSET] Charset not supported";
+              return RESP_NO;
+            }
         }
+      else
+        parsebuf.charset = NULL;
 
       if (!parse_gettoken (&parsebuf, 0))
         {
           *err_text = "Too few args";
           return RESP_BAD;
         }
-
     }
 
   /* Compile the expression */
@@ -323,12 +331,12 @@ imap4d_search0 (imap4d_tokbuf_t tok, int isuid, char **err_text)
       *err_text = "Junk at the end of statement";