*lots of small merges form HEAD

*sync up configure.in
*don't build torture tools in make all
*make sure to remove torture tools as part of make clean
(This used to be commit 0fb724b3216eeeb97e61ff12755ca3a31bcad6ef)

1 files changed, 17 insertions, 5 deletions

diff --git a/source3/lib/util_str.c b/source3/lib/util_str.c
index 7ffd71bde9..148181fddd 100644
--- a/source3/lib/util_str.c
+++ b/source3/lib/util_str.c
@@ -308,8 +308,22 @@ char *skip_string(char *buf,size_t n)
 
 size_t str_charnum(const char *s)
 {
-	push_ucs2(NULL, tmpbuf,s, sizeof(tmpbuf), STR_TERMINATE);
-	return strlen_w(tmpbuf);
+	uint16 tmpbuf2[sizeof(pstring)];
+	push_ucs2(NULL, tmpbuf2,s, sizeof(tmpbuf2), STR_TERMINATE);
+	return strlen_w(tmpbuf2);
+}
+
+/*******************************************************************
+ Count the number of characters in a string. Normally this will
+ be the same as the number of bytes in a string for single byte strings,
+ but will be different for multibyte.
+********************************************************************/
+
+size_t str_ascii_charnum(const char *s)
+{
+	pstring tmpbuf2;
+	push_ascii(tmpbuf2, s, sizeof(tmpbuf2), STR_TERMINATE);
+	return strlen(tmpbuf2);
 }
 
 /*******************************************************************
@@ -655,13 +669,11 @@ static BOOL string_init(char **dest,const char *src)
 		}
 		*dest = null_string;
 	} else {
-		(*dest) = (char *)malloc(l+1);
+		(*dest) = strdup(src);
 		if ((*dest) == NULL) {
 			DEBUG(0,("Out of memory in string_init\n"));
 			return False;
 		}
-
-		pstrcpy(*dest,src);
 	}
 	return(True);
 }