More cleanup in the fetch imap code.

+2001-05-11  Alain Magloire
+
+	* imap4d/fetch.c: More cleanup in the bodystructure code,
+	arrange response indentation etc ...
+	* impa4d/utils.c (util_send_string): New helper function.
+
 2001-05-10  Alain Magloire
 2001-05-10  Alain Magloire
 
 
 	* imap4d/fetch.c: Implemented INTERNALDATE.
 	* imap4d/fetch.c: Implemented INTERNALDATE.

@@ -175,6 +175,7 @@ extern int imap4d_bye __P ((int));
 /* Helper functions.  */
 /* Helper functions.  */
 extern int  util_out __P ((int, const char *, ...));
 extern int  util_out __P ((int, const char *, ...));
 extern int  util_send __P ((const char *, ...));
 extern int  util_send __P ((const char *, ...));
+extern int  util_send_string __P ((const char *));
 extern int  util_start __P ((char *));
 extern int  util_start __P ((char *));
 extern int  util_finish __P ((struct imap4d_command *, int, const char *, ...));
 extern int  util_finish __P ((struct imap4d_command *, int, const char *, ...));
 extern int  util_getstate __P ((void));
 extern int  util_getstate __P ((void));

@@ -18,7 +18,7 @@
 #include "imap4d.h"
 #include "imap4d.h"
 #include <ctype.h>
 #include <ctype.h>
 
 
-static int add2set __P ((size_t **, int *, unsigned long, size_t));
+static int add2set __P ((size_t **, int *, unsigned long));
 static const char *sc2string __P ((int));
 static const char *sc2string __P ((int));
 
 
 /* Get the next space/CR/NL separated word, some words are between double
 /* Get the next space/CR/NL separated word, some words are between double
@@ -184,9 +184,6 @@ util_msgset (char *s, size_t **set, int *n, int isuid)
   status = mailbox_messages_count (mbox, &max);
   status = mailbox_messages_count (mbox, &max);
   if (status != 0)
   if (status != 0)
     return status;
     return status;
-  /* The number after the "*" in an untagged FETCH response is always a
-     message sequence number, not a unique identifier, even for a UID
-     command response. But do what they meant not what they say.  */
   /* If it is a uid sequence, override max with the UID.  */
   /* If it is a uid sequence, override max with the UID.  */
   if (isuid)
   if (isuid)
     {
     {
@@ -216,9 +213,23 @@ util_msgset (char *s, size_t **set, int *n, int isuid)
 	      }
 	      }
 	    if (low)
 	    if (low)
 	      {
 	      {
+		/* Reverse it. */
+		if (low > val)
+		  {
+		    long tmp = low;
+		    tmp -= 2;
+		    if (tmp <= 0 || val == 0)
+		      {
+			free (*set);
+			*n = 0;
+			return EINVAL;
+		      }
+		    low = val;
+		    val = tmp;
+		  }
 		for (;low && low <= val; low++)
 		for (;low && low <= val; low++)
 		  {
 		  {
-		    status = add2set (set, n, low, max);
+		    status = add2set (set, n, low);
 		    if (status != 0)
 		    if (status != 0)
 		      return status;
 		      return status;
 		  }
 		  }
@@ -226,7 +237,7 @@ util_msgset (char *s, size_t **set, int *n, int isuid)
 	      }
 	      }
 	    else
 	    else
 	      {
 	      {
-		status = add2set(set, n, val, max);
+		status = add2set(set, n, val);
 		if (status != 0)
 		if (status != 0)
 		  return status;
 		  return status;
 	      }
 	      }
@@ -284,9 +295,23 @@ util_msgset (char *s, size_t **set, int *n, int isuid)
 
 
   if (low)
   if (low)
     {
     {
+      /* Reverse it. */
+      if (low > val)
+	{
+	  long tmp = low;
+	  tmp -= 2;
+	  if (tmp <= 0 || val == 0)
+	    {
+	      free (set);
+	      *n = 0;
+	      return EINVAL;
+	    }
+	  low = val;
+	  val = tmp;
+	}
       for (;low && low <= val; low++)
       for (;low && low <= val; low++)
 	{
 	{
-	  status = add2set (set, n, low, max);
+	  status = add2set (set, n, low);
 	  if (status != 0)
 	  if (status != 0)
 	    return status;
 	    return status;
 	}
 	}
@@ -306,6 +331,18 @@ util_send (const char *format, ...)
   return status;
   return status;
 }
 }
 
 
+/* Send NIL if empty string, a literal if the string contains double quotes
+   or the string surrounded by double quotes.  */
+int
+util_send_string (const char *buffer)
+{
+  if (*buffer == '\0')
+    return util_send ("NIL");
+  if (strchr (buffer, '"'))
+    return util_send ("{%u}\r\n%s", strlen (buffer), buffer);
+  return util_send ("\"%s\"", buffer);
+}
+
 /* Send an unsolicited response.  */
 /* Send an unsolicited response.  */
 int
 int
 util_out (int rc, const char *format, ...)
 util_out (int rc, const char *format, ...)
@@ -417,7 +454,7 @@ imap4d_readline (FILE *fp)
         }
         }
     }
     }
   while (number > 0);
   while (number > 0);
-  /* syslog (LOG_INFO, "readline: %s", line); */
+  syslog (LOG_INFO, "readline: %s", line);
   return line;
   return line;
 }
 }
 
 
@@ -522,11 +559,11 @@ sc2string (int rc)
 }
 }
 
 
 static int
 static int
-add2set (size_t **set, int *n, unsigned long val, size_t max)
+add2set (size_t **set, int *n, unsigned long val)
 {
 {
   int *tmp;
   int *tmp;
-  if (val == 0 || val > max
-      || (tmp = realloc (*set, (*n + 1) * sizeof (**set))) == NULL)
+  tmp = realloc (*set, (*n + 1) * sizeof (**set));
+  if (tmp == NULL)
     {
     {
       if (*set)
       if (*set)
 	free (*set);
 	free (*set);