X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fmanagesieve%2Fserv_managesieve.c;fp=citadel%2Fmodules%2Fmanagesieve%2Fserv_managesieve.c;h=f1523d73bf793ab1ebdd9a73c49056ee78e41ea2;hb=ec4814cf844f6f070da547fe585ce2f96e806731;hp=2f67d2f6f02b54061addb931861035aa13b0e79f;hpb=41edee5726a67dcd43c948ffed3b4651c1791041;p=citadel.git

diff --git a/citadel/modules/managesieve/serv_managesieve.c b/citadel/modules/managesieve/serv_managesieve.c
index 2f67d2f6f..f1523d73b 100644
--- a/citadel/modules/managesieve/serv_managesieve.c
+++ b/citadel/modules/managesieve/serv_managesieve.c
@@ -63,7 +63,6 @@
 #include "database.h"
 #include "msgbase.h"
 #include "internet_addressing.h"
-#include "imap_tools.h"	/* Needed for imap_parameterize */
 #include "genstamp.h"
 #include "domain.h"
 #include "clientsocket.h"
@@ -104,6 +103,66 @@ enum { 	/** Command states for login authentication */
 
 #define MGSVE          ((struct citmgsve *)CC->session_specific_data)
 
+int old_imap_parameterize(char** args, char *in)
+{
+	char* out = in;
+	int num = 0;
+
+	for (;;)
+	{
+		/* Skip whitespace. */
+
+		while (isspace(*in))
+			in++;
+		if (*in == 0)
+			break;
+
+		/* Found the start of a token. */
+		
+		args[num++] = out;
+
+		/* Read in the token. */
+
+		for (;;)
+		{
+			int c = *in++;
+			if (isspace(c))
+				break;
+			
+			if (c == '\"')
+			{
+				/* Found a quoted section. */
+
+				for (;;)
+				{
+					c = *in++;
+					if (c == '\"')
+						break;
+					else if (c == '\\')
+						c = *in++;
+
+					*out++ = c;
+					if (c == 0)
+						return num;
+				}
+			}
+			else if (c == '\\')
+			{
+				c = *in++;
+				*out++ = c;
+			}
+			else
+				*out++ = c;
+
+			if (c == 0)
+				return num;
+		}
+		*out++ = '\0';
+	}
+
+	return num;
+}
+
 /*****************************************************************************/
 /*                      MANAGESIEVE Server                                   */
 /*****************************************************************************/