X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Fmem%2Ftest%2Fapi.c;h=59b25947ab0a96d5c15de578608d7a244f331708;hb=61f58ff94e35c9b8ac5488554e2554bc5c9888b3;hp=d0178c355e06f7c139a94151f6c03fb083811a35;hpb=eeaa2c8b0d5db1128c873cad3bfcc6fd6b1858fe;p=ccan

diff --git a/ccan/mem/test/api.c b/ccan/mem/test/api.c
index d0178c35..59b25947 100644
--- a/ccan/mem/test/api.c
+++ b/ccan/mem/test/api.c
@@ -1,6 +1,12 @@
+#include "config.h"
+
+#include <assert.h>
+
 #include <ccan/mem/mem.h>
 #include <ccan/tap/tap.h>
 
+#define SWAPSIZE	12
+
 int main(void)
 {
 	char haystack1[] = "abcd\0efgh";
@@ -9,9 +15,10 @@ int main(void)
 	char needle2[] = "d\0e";
 	char scan1[] = "aaaab";
 	char scan2[] = "\0\0\0b";
+	char tmp1[SWAPSIZE], tmp2[SWAPSIZE];
 
 	/* This is how many tests you plan to run */
-	plan_tests(46);
+	plan_tests(65);
 
 	ok1(memmem(haystack1, sizeof(haystack1), needle1, 2) == haystack1);
 	ok1(memmem(haystack1, sizeof(haystack1), needle1, 3) == NULL);
@@ -75,6 +82,41 @@ int main(void)
 	ok1(!memends_str(S("a\0bcdef"), "a"));
 	ok1(memends_str(S("a\0bcdef"), "ef"));
 
+	ok1(!memoverlaps(haystack1, sizeof(haystack1),
+			 haystack2, sizeof(haystack2)));
+	ok1(!memoverlaps(haystack2, sizeof(haystack2),
+			 haystack1, sizeof(haystack1)));
+	ok1(memoverlaps(haystack1, sizeof(haystack1), haystack1, 1));
+	ok1(memoverlaps(haystack1, 1, haystack1, sizeof(haystack1)));
+	ok1(memoverlaps(haystack1, sizeof(haystack1),
+			haystack1 + sizeof(haystack1) - 1, 1));
+	ok1(memoverlaps(haystack1 + sizeof(haystack1) - 1, 1,
+			haystack1, sizeof(haystack1)));
+	ok1(!memoverlaps(haystack1, sizeof(haystack1),
+			 haystack1 + sizeof(haystack1), 1));
+	ok1(!memoverlaps(haystack1 + sizeof(haystack1), 1,
+			 haystack1, sizeof(haystack1)));
+	ok1(!memoverlaps(haystack1, sizeof(haystack1), haystack1 - 1, 1));
+	ok1(!memoverlaps(haystack1 - 1, 1, haystack1, sizeof(haystack1)));
+	ok1(memoverlaps(haystack1, 5, haystack1 + 4, 7));
+	ok1(!memoverlaps(haystack1, 5, haystack1 + 5, 6));
+	ok1(memoverlaps(haystack1 + 4, 7, haystack1, 5));
+	ok1(!memoverlaps(haystack1 + 5, 6, haystack1, 5));
+
+	assert(sizeof(haystack1) <= SWAPSIZE);
+	assert(sizeof(haystack2) <= SWAPSIZE);
+	memset(tmp1, 0, sizeof(tmp1));
+	memset(tmp2, 0, sizeof(tmp2));
+	memcpy(tmp1, haystack1, sizeof(haystack1));
+	memcpy(tmp2, haystack2, sizeof(haystack2));
+	memswap(tmp1, tmp2, SWAPSIZE);
+	ok1(memcmp(tmp1, haystack2, sizeof(haystack2)) == 0);
+	ok1(memcmp(tmp2, haystack1, sizeof(haystack1)) == 0);
+
+	ok1(memeqzero(NULL, 0));
+	ok1(memeqzero(scan2, 3));
+	ok1(!memeqzero(scan2, 4));
+
 	/* This exits depending on whether all tests passed */
 	return exit_status();
 }