Merge fixes and tests for jra's broken strstr_m() function from 3.0

STF rules!  (Pity we don't use it for more stuff)

Andrew Bartlett
(This used to be commit a9363b45b0ef652a5fd621915fafb97ada0c7d5e)

1 files changed, 35 insertions, 0 deletions

diff --git a/source3/torture/t_strstr.c b/source3/torture/t_strstr.c
new file mode 100644
index 0000000000..25709526fe
--- /dev/null
+++ b/source3/torture/t_strstr.c
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2003 by Martin Pool
+ *
+ * Test harness for strstr_m
+ */
+
+#include "includes.h"
+
+int main(int argc, char *argv[])
+{
+	int i;
+	int iters = 1;
+	
+	char *ret;
+
+	/* Needed to initialize character set */
+	lp_load("/dev/null", True, False, False);
+
+	if (argc < 3) {
+		fprintf(stderr, "usage: %s STRING1 STRING2 [ITERS]\n"
+			"Compares two strings, prints the results of strstr_m\n",
+			argv[0]);
+		return 2;
+	}
+	if (argc >= 4)
+		iters = atoi(argv[3]);
+
+	for (i = 0; i < iters; i++) {
+		ret = strstr_m(argv[1], argv[2]);
+	}
+
+	printf("%s\n", ret);
+	
+	return 0;
+}