[SVN] r704 - in /branches/cvsmerge/cyrus-cvs/imap: index.c message.c message.h

[debian at incase.de]

Author: sven
Date: Tue Feb 27 04:43:46 2007
New Revision: 704

URL: https://mail.incase.de/viewcvs?rev=704&root=cyrus22&view=rev
Log:
missing/illegal Date should SORT/THREAD before real ones

Modified:
    branches/cvsmerge/cyrus-cvs/imap/index.c
    branches/cvsmerge/cyrus-cvs/imap/message.c
    branches/cvsmerge/cyrus-cvs/imap/message.h

Modified: branches/cvsmerge/cyrus-cvs/imap/index.c
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/imap/index.c?rev=704&root=cyrus22&r1=703&r2=704&view=diff
==============================================================================
--- branches/cvsmerge/cyrus-cvs/imap/index.c (original)
+++ branches/cvsmerge/cyrus-cvs/imap/index.c Tue Feb 27 04:43:46 2007
@@ -41,7 +41,7 @@
  *
  */
 /*
- * $Id: index.c,v 1.218 2005/06/02 15:47:58 ken3 Exp $
+ * $Id: index.c,v 1.218.2.1 2006/12/19 18:57:48 murch Exp $
  */
 #include <config.h>
 
@@ -3285,7 +3285,8 @@
 		break;
 	    case SORT_DATE:
 		cur->date = message_parse_date(envtokens[ENV_DATE],
-					       PARSE_TIME | PARSE_ZONE);
+					       PARSE_TIME | PARSE_ZONE
+					       | PARSE_NOCREATE);
 		break;
 	    case SORT_FROM:
 		cur->from = get_localpart_addr(from + CACHE_ITEM_SIZE_SKIP);

Modified: branches/cvsmerge/cyrus-cvs/imap/message.c
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/imap/message.c?rev=704&root=cyrus22&r1=703&r2=704&view=diff
==============================================================================
--- branches/cvsmerge/cyrus-cvs/imap/message.c (original)
+++ branches/cvsmerge/cyrus-cvs/imap/message.c Tue Feb 27 04:43:46 2007
@@ -41,7 +41,7 @@
  */
 
 /*
- * $Id: message.c,v 1.99 2004/09/16 17:58:54 ken3 Exp $
+ * $Id: message.c,v 1.99.2.1 2006/12/19 18:57:48 murch Exp $
  */
 
 #include <config.h>
@@ -1429,7 +1429,7 @@
     if (t >= 0) return (t - zone_off * 60);
     
  baddate:
-    return time(0);
+    return (flags & PARSE_NOCREATE) ? 0 : time(0);
 }
 
 /*

Modified: branches/cvsmerge/cyrus-cvs/imap/message.h
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/imap/message.h?rev=704&root=cyrus22&r1=703&r2=704&view=diff
==============================================================================
--- branches/cvsmerge/cyrus-cvs/imap/message.h (original)
+++ branches/cvsmerge/cyrus-cvs/imap/message.h Tue Feb 27 04:43:46 2007
@@ -1,5 +1,5 @@
 /* message.h -- Message parsing
- $Id: message.h,v 1.6 2003/02/13 20:15:28 rjs3 Exp $
+ $Id: message.h,v 1.6.6.1 2006/12/19 18:57:48 murch Exp $
 
  * Copyright (c) 1998-2003 Carnegie Mellon University.  All rights reserved.
  *
@@ -61,9 +61,10 @@
 				  unsigned size));
 
 /* Flags for parsing message date/time - to be bitwise OR'd */
-#define PARSE_DATE	(1<<0)
+#define PARSE_DATE	(1<<0)  /* Default (always parsed) */
 #define PARSE_TIME	(1<<1)
 #define PARSE_ZONE	(1<<2)
+#define PARSE_NOCREATE	(1<<15) /* Don't create one if its missing/invalid */
 
 extern time_t message_parse_date P((char *hdr, unsigned flags));
 extern int message_parse_file P((FILE *infile, struct mailbox *mailbox,