* did some UID fetch

diff --git a/citadel/imap_fetch.c b/citadel/imap_fetch.c
index 17ad23a4da6aaa9b5592c8e601698f4d6518d556..5628871847c5964e07822f6ff70a84591ba0c1f7 100644 (file)
--- a/citadel/imap_fetch.c
+++ b/citadel/imap_fetch.c
@@ -379,7 +379,12 @@ void imap_fetch(int num_parms, char *parms[]) {
        extract_token(lostr, parms[2], 0, ':');
        lo = atoi(lostr);
        extract_token(histr, parms[2], 1, ':');
-       hi = atoi(histr);
+       if (!strcmp(histr, "*")) {
+               hi = IMAP->num_msgs;
+       }
+       else {
+               hi = atoi(histr);
+       }
 
        if ( (lo < 1) || (hi < 1) || (lo > hi) || (hi > IMAP->num_msgs) ) {
                cprintf("%s BAD invalid sequence numbers %d:%d\r\n",
@@ -405,3 +410,70 @@ void imap_fetch(int num_parms, char *parms[]) {
 
 
 
+/*
+ * This function is called by the main command loop.
+ */
+void imap_uidfetch(int num_parms, char *parms[]) {
+       int lo = 0;
+       int hi = 0;
+       long louid, hiuid;
+       char lostr[1024], histr[1024], items[1024];
+       char *itemlist[256];
+       int num_items;
+       int i;
+       int have_uiditem = 0;
+
+       if (num_parms < 4) {
+               cprintf("%s BAD invalid parameters\r\n", parms[0]);
+               return;
+       }
+
+       extract_token(lostr, parms[3], 0, ':');
+       louid = atol(lostr);
+       extract_token(histr, parms[3], 1, ':');
+       if (!strcmp(histr, "*")) {
+               hiuid = IMAP->msgids[IMAP->num_msgs - 1];
+       }
+       else {
+               hiuid = atol(histr);
+       }
+
+       /* Convert uid to sequence nums */
+       for (i=0; i < IMAP->num_msgs; ++i) {
+               if (IMAP->msgids[i] < louid) lo = i+2;
+               if (IMAP->msgids[i] < hiuid) hi = i+2;
+       }
+
+       if (lo < 1) lo = 1;
+       if (hi > IMAP->num_msgs) hi = IMAP->num_msgs;
+
+       strcpy(items, "");
+       for (i=4; i<num_parms; ++i) {
+               strcat(items, parms[i]);
+               if (i < (num_parms-1)) strcat(items, " ");
+       }
+
+       num_items = imap_extract_data_items(itemlist, items);
+       if (num_items < 1) {
+               cprintf("%s BAD invalid data item list\r\n", parms[0]);
+               return;
+       }
+
+       /*
+        * If the "UID" item was not specified by the client, we have to
+        * implicitly add it, because this is a UID FETCH command.  We'll
+        * add it at the end.
+        */
+       for (i=0; i<num_items; ++i) {
+               if (!strcasecmp(itemlist[i], "UID")) ++have_uiditem;
+       }
+       if (have_uiditem < 1) {
+               itemlist[num_items++] = "UID";
+       }
+
+       imap_do_fetch(lo, hi, num_items, itemlist);
+       cprintf("%s OK UID FETCH completed\r\n", parms[0]);
+}
+
+
+

diff --git a/citadel/imap_fetch.h b/citadel/imap_fetch.h
index 82939191bae865ffc188eda51a0173387b135378..31c2dd9ef397f2685415be63e1693e466ede39f2 100644 (file)
--- a/citadel/imap_fetch.h
+++ b/citadel/imap_fetch.h
@@ -4,3 +4,4 @@
  */
 
 void imap_fetch(int num_parms, char *parms[]);
+void imap_uidfetch(int num_parms, char *parms[]);

diff --git a/citadel/serv_imap.c b/citadel/serv_imap.c
index 738cec2262fdefc1eba11456f4f183dba5e1ca9a..7290ab415c37211b183536c1f69424be511b85e1 100644 (file)
--- a/citadel/serv_imap.c
+++ b/citadel/serv_imap.c
@@ -385,6 +385,10 @@ void imap_command_loop(void) {
        else if (!strcasecmp(parms[1], "FETCH")) {
                imap_fetch(num_parms, parms);
        }
+       else if ( (!strcasecmp(parms[1], "UID"))
+               && (!strcasecmp(parms[2], "FETCH")) ) {
+               imap_uidfetch(num_parms, parms);
+       }
 
        else if (!strcasecmp(parms[1], "CLOSE")) {
                imap_close(num_parms, parms);