dovecot-2.2-pigeonhole: lib-sieve: The t_str_trim() function has...

[pigeonhole at rename-it.nl]

details:   http://hg.rename-it.nl/dovecot-2.2-pigeonhole/rev/6f01853a5b35
changeset: 2135:6f01853a5b35
user:      Stephan Bosch <stephan at rename-it.nl>
date:      Sun Nov 29 11:47:47 2015 +0100
description:
lib-sieve: The t_str_trim() function has moved to Dovecot.

diffstat:

 src/lib-sieve/sieve-settings.c |  31 ++++---------------------------
 1 files changed, 4 insertions(+), 27 deletions(-)

diffs (69 lines):

diff -r d23225e408af -r 6f01853a5b35 src/lib-sieve/sieve-settings.c
--- a/src/lib-sieve/sieve-settings.c	Wed Nov 18 22:11:31 2015 +0100
+++ b/src/lib-sieve/sieve-settings.c	Sun Nov 29 11:47:47 2015 +0100
@@ -10,29 +10,6 @@
 
 #include <ctype.h>
 
-// FIXME: add to dovecot
-static const char *t_str_trim(const char *str)
-{
-	const char *p, *pend, *begin;
-
-	p = str;
-	pend = str + strlen(str);
-	if (p == pend)
-		return "";
-
-	while (p < pend && (*p == ' ' || *p == '\t'))
-		p++;
-	begin = p;
-
-	p = pend - 1;
-	while (p > begin && (*p == ' ' || *p == '\t'))
-		p--;
-
-	if (p <= begin)
-		return "";
-	return t_strdup_until(begin, p+1);
-}
-
 /*
  * Access to settings
  */
@@ -143,7 +120,7 @@
 	if ( str_value == NULL )
 		return FALSE;
 
-	str_value = t_str_trim(str_value);
+	str_value = t_str_trim(str_value, "\t ");
 	if ( *str_value == '\0' )
 		return FALSE;
 
@@ -175,7 +152,7 @@
 	if ( str_value == NULL )
 		return FALSE;
 
-	str_value = t_str_trim(str_value);
+	str_value = t_str_trim(str_value, "\t ");
 	if ( *str_value == '\0' )
 		return FALSE;
 
@@ -228,7 +205,7 @@
 	if ( str_value == NULL )
 		return FALSE;
 
-	str_value = t_str_trim(str_value);
+	str_value = t_str_trim(str_value, "\t ");
 	str_value = t_str_lcase(str_value);
 	set_len = strlen(str_value);
 	if ( set_len > 0 ) {
@@ -245,7 +222,7 @@
 		} else if ( str_value[0] == '<' &&	str_value[set_len-1] == '>') {
 			sender->source = SIEVE_MAIL_SENDER_SOURCE_EXPLICIT;
 
-			str_value = t_str_trim(t_strndup(str_value+1, set_len-2));
+			str_value = t_str_trim(t_strndup(str_value+1, set_len-2), "\t ");
 			sender->address = NULL;
 			if ( *str_value != '\0' )
 				sender->address = p_strdup(pool, str_value);