[dovecot-cvs] dovecot/src/lib-storage mail-search.c,1.4,1.5 mail-search.h,1.4,1.5 mail-storage.h,1.18,1.19

[cras at procontrol.fi]

Update of /home/cvs/dovecot/src/lib-storage
In directory danu:/tmp/cvs-serv3305/src/lib-storage

Modified Files:
	mail-search.c mail-search.h mail-storage.h 
Log Message:
SEARCH CHARSET support. Currently we do it through iconv() and only ASCII   
characters are compared case-insensitively.



Index: mail-search.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib-storage/mail-search.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- mail-search.c	16 Oct 2002 22:50:21 -0000	1.4
+++ mail-search.c	3 Nov 2002 08:39:43 -0000	1.5
@@ -46,7 +46,8 @@
 			return FALSE;
 		}
 
-		sarg->hdr_value = str_ucase((*args)->data.str);
+                sarg->hdr_field_name = sarg->value.str;
+		sarg->value.str = str_ucase((*args)->data.str);
 		*args += 1;
 	}
 

Index: mail-search.h
===================================================================
RCS file: /home/cvs/dovecot/src/lib-storage/mail-search.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- mail-search.h	16 Oct 2002 22:50:21 -0000	1.4
+++ mail-search.h	3 Nov 2002 08:39:43 -0000	1.5
@@ -60,7 +60,8 @@
 		const char *str;
 	} value;
 
-	const char *hdr_value; /* for SEARCH_HEADER */
+        void *context;
+	const char *hdr_field_name; /* for SEARCH_HEADER */
 	unsigned int not:1;
 
 	int result;

Index: mail-storage.h
===================================================================
RCS file: /home/cvs/dovecot/src/lib-storage/mail-storage.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- mail-storage.h	2 Nov 2002 20:10:21 -0000	1.18
+++ mail-storage.h	3 Nov 2002 08:39:43 -0000	1.19
@@ -155,8 +155,10 @@
 		     OBuffer *outbuf, int *all_found);
 
 	/* Search wanted mail data. args contains the search criteria.
-	   results are written into outbuf in RFC2060 SEARCH format. */
-	int (*search)(Mailbox *box, MailSearchArg *args,
+	   Results are written into outbuf in RFC2060 SEARCH format.
+	   If charset is NULL, the given search strings are matched without
+	   any conversion. */
+	int (*search)(Mailbox *box, const char *charset, MailSearchArg *args,
 		      OBuffer *outbuf, int uid_result);
 
 	/* Save a new mail into mailbox. timezone_offset specifies the