X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=tests%2Ftest-strstr.c;h=b20d6446bc8058e10e4227e40e1e0e219cfc3eff;hb=58b5448dee62071b0d505f4e010652420e76d101;hp=f7bc4cb91d7133a75d9d455f506a51fd4ff50568;hpb=5709a7204dfd9a4fedf2cdbaa341bc6c540dadf3;p=gnulib.git

diff --git a/tests/test-strstr.c b/tests/test-strstr.c
index f7bc4cb91..b20d6446b 100644
--- a/tests/test-strstr.c
+++ b/tests/test-strstr.c
@@ -19,22 +19,15 @@
 
 #include <string.h>
 
+#include "signature.h"
+SIGNATURE_CHECK (strstr, char *, (char const *, char const *));
+
 #include <signal.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 
-#define ASSERT(expr) \
-  do									     \
-    {									     \
-      if (!(expr))							     \
-	{								     \
-	  fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-	  fflush (stderr);						     \
-	  abort ();							     \
-	}								     \
-    }									     \
-  while (0)
+#include "zerosize-ptr.h"
+#include "macros.h"
 
 int
 main (int argc, char *argv[])
@@ -68,13 +61,16 @@ main (int argc, char *argv[])
        This is a bug in memchr(), see the Austin Group's clarification
        <http://www.opengroup.org/austin/docs/austin_454.txt>.  */
     const char *fix = "aBaaaaaaaaaaax";
-    char *input = malloc (strlen (fix) + 1);
+    char *page_boundary = (char *) zerosize_ptr ();
+    size_t len = strlen (fix) + 1;
+    char *input = page_boundary ? page_boundary - len : malloc (len);
     const char *result;
 
     strcpy (input, fix);
     result = strstr (input, "B1x");
     ASSERT (result == NULL);
-    free (input);
+    if (!page_boundary)
+      free (input);
   }
 
   {
@@ -106,16 +102,16 @@ main (int argc, char *argv[])
     char *haystack = (char *) malloc (m + 1);
     if (haystack != NULL)
       {
-	memset (haystack, 'A', m);
-	haystack[0] = 'B';
-	haystack[m] = '\0';
+        memset (haystack, 'A', m);
+        haystack[0] = 'B';
+        haystack[m] = '\0';
 
-	for (; repeat > 0; repeat--)
-	  {
-	    ASSERT (strstr (haystack, needle) == haystack + 1);
-	  }
+        for (; repeat > 0; repeat--)
+          {
+            ASSERT (strstr (haystack, needle) == haystack + 1);
+          }
 
-	free (haystack);
+        free (haystack);
       }
   }
 
@@ -130,15 +126,15 @@ main (int argc, char *argv[])
     char *needle = (char *) malloc (m + 1);
     if (needle != NULL)
       {
-	memset (needle, 'A', m);
-	needle[m] = '\0';
+        memset (needle, 'A', m);
+        needle[m] = '\0';
 
-	for (; repeat > 0; repeat--)
-	  {
-	    ASSERT (strstr (haystack, needle) == NULL);
-	  }
+        for (; repeat > 0; repeat--)
+          {
+            ASSERT (strstr (haystack, needle) == NULL);
+          }
 
-	free (needle);
+        free (needle);
       }
   }
 
@@ -149,18 +145,18 @@ main (int argc, char *argv[])
     char *needle = (char *) malloc (m + 2);
     if (haystack != NULL && needle != NULL)
       {
-	const char *result;
+        const char *result;
 
-	memset (haystack, 'A', 2 * m);
-	haystack[2 * m] = 'B';
-	haystack[2 * m + 1] = '\0';
+        memset (haystack, 'A', 2 * m);
+        haystack[2 * m] = 'B';
+        haystack[2 * m + 1] = '\0';
 
-	memset (needle, 'A', m);
-	needle[m] = 'B';
-	needle[m + 1] = '\0';
+        memset (needle, 'A', m);
+        needle[m] = 'B';
+        needle[m + 1] = '\0';
 
-	result = strstr (haystack, needle);
-	ASSERT (result == haystack + m);
+        result = strstr (haystack, needle);
+        ASSERT (result == haystack + m);
       }
     free (needle);
     free (haystack);