Removed IsEmptyStr from some loops as its quicker this way (probably).

[citadel.git] / citadel / modules / imap / imap_fetch.c

diff --git a/citadel/modules/imap/imap_fetch.c b/citadel/modules/imap/imap_fetch.c
index 5c40d57a57810564060cfe3aea2c9495855ac9fa..49818e4387b5de52b4d3513928d7498b96161e32 100644 (file)
--- a/citadel/modules/imap/imap_fetch.c
+++ b/citadel/modules/imap/imap_fetch.c
@@ -510,13 +510,15 @@ void imap_strip_headers(char *section) {
        if (!strncasecmp(which_fields, "HEADER.FIELDS.NOT", 17))
                headers_not = 1;
 
-       for (i=0; i<strlen(which_fields); ++i) {
+       for (i=0; which_fields[i]; ++i) {
                if (which_fields[i]=='(')
                        strcpy(which_fields, &which_fields[i+1]);
        }
-       for (i=0; i<strlen(which_fields); ++i) {
-               if (which_fields[i]==')')
+       for (i=0; which_fields[i]; ++i) {
+               if (which_fields[i]==')') {
                        which_fields[i] = 0;
+                       break;
+               }
        }
        num_parms = imap_parameterize(parms, which_fields);
 
@@ -582,10 +584,22 @@ void imap_fetch_body(long msgnum, char *item, int is_peek) {
        if (strchr(section, '[') != NULL) {
                stripallbut(section, '[', ']');
        }
-       lprintf(CTDL_DEBUG, "Section is: %s%s\n", section, ((IsEmptyStr(section)0) ? "(empty)" : "") );
-       if (!strncasecmp(section, "HEADER", 6)) {
-               need_body = 0;
-       }
+       lprintf(CTDL_DEBUG, "Section is: %s%s\n", 
+               section, 
+               IsEmptyStr(section) ? "(empty)" : "");
+
+       /*
+        * We used to have this great optimization in place that would avoid
+        * fetching the entire RFC822 message from disk if the client was only
+        * asking for the headers.  Unfortunately, fetching only the Citadel
+        * headers omits "Content-type:" and this behavior breaks the iPhone
+        * email client.  So we have to fetch the whole message from disk.  The
+        *
+        *      if (!strncasecmp(section, "HEADER", 6)) {
+        *              need_body = 0;
+        *      }
+        *
+        */
 
        /* Burn the cache if we don't have the same section of the 
         * same message again.
@@ -1082,7 +1096,7 @@ void imap_handle_macros(char *str) {
        int i;
        int nest = 0;
 
-       for (i=0; i<strlen(str); ++i) {
+       for (i=0; str[i]; ++i) {
                if (str[i]=='(') ++nest;
                if (str[i]=='[') ++nest;
                if (str[i]=='<') ++nest;
@@ -1123,11 +1137,12 @@ void imap_handle_macros(char *str) {
 int imap_extract_data_items(char **argv, char *items) {
        int num_items = 0;
        int nest = 0;
-       int i, initial_len;
+       int i;
        char *start;
+       long initial_len;
 
        /* Convert all whitespace to ordinary space characters. */
-       for (i=0; i<strlen(items); ++i) {
+       for (i=0; items[i]; ++i) {
                if (isspace(items[i])) items[i]=' ';
        }