[dovecot-cvs] dovecot/src/master imap-process.c,1.19,1.20

[cras at procontrol.fi]

Update of /home/cvs/dovecot/src/master
In directory danu:/tmp/cvs-serv15300/master

Modified Files:
	imap-process.c 
Log Message:
Replaced TempString with a String which can use any memory pool and uses
Buffer internally.



Index: imap-process.c
===================================================================
RCS file: /home/cvs/dovecot/src/master/imap-process.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- imap-process.c	20 Dec 2002 04:47:39 -0000	1.19
+++ imap-process.c	21 Dec 2002 22:02:58 -0000	1.20
@@ -2,7 +2,7 @@
 
 #include "common.h"
 #include "env-util.h"
-#include "temp-string.h"
+#include "str.h"
 #include "restrict-access.h"
 #include "restrict-process-size.h"
 
@@ -67,33 +67,33 @@
 static const char *expand_mail_env(const char *env, const char *user,
 				   const char *home)
 {
-	TempString *str;
+	String *str;
 	const char *p, *var;
 	unsigned int width;
 
-	str = t_string_new(256);
+	str = t_str_new(256);
 
 	/* it's either type:data or just data */
 	p = strchr(env, ':');
 	if (p != NULL) {
 		while (env != p) {
-			t_string_append_c(str, *env);
+			str_append_c(str, *env);
 			env++;
 		}
 
-		t_string_append_c(str, *env++);
+		str_append_c(str, *env++);
 	}
 
 	if (env[0] == '~' && env[1] == '/') {
 		/* expand home */
-		t_string_append(str, home);
+		str_append(str, home);
 		env++;
 	}
 
 	/* expand %vars */
 	for (; *env != '\0'; env++) {
 		if (*env != '%')
-			t_string_append_c(str, *env);
+			str_append_c(str, *env);
 		else {
 			width = 0;
 			while (env[1] >= '0' && env[1] <= '9') {
@@ -125,14 +125,14 @@
 
 			if (var != NULL) {
 				if (width == 0)
-					t_string_append(str, var);
+					str_append(str, var);
 				else
-					t_string_append_n(str, var, width);
+					str_append_n(str, var, width);
 			}
 		}
 	}
 
-	return str->str;
+	return str_c(str);
 }
 
 MasterReplyResult create_imap_process(int socket, IPADDR *ip,