Changeset 2044 for trunk/src/libctests/glibc/string

Timestamp:

Jun 17, 2005, 6:32:39 AM (20 years ago)

Author:

bird

Message:

Porting to 64-bit FreeBSD...

Location:

trunk/src/libctests/glibc/string

Files:

• test-memccpy.c (modified) (1 diff, 1 prop)
• test-string.h (modified) (1 diff, 1 prop)
• testcopy.c (modified) (1 diff, 1 prop)
• tester.c (modified) (14 diffs, 1 prop)
• tst-strlen.c (modified) (1 diff, 1 prop)
• tst-strxfrm.c (modified) (4 diffs, 1 prop)

trunk/src/libctests/glibc/string/test-memccpy.c

@@ -48 +48 @@
 
   if (p != NULL)
+#if 0
     return mempcpy (dst, src, p - src + 1);
+#else
+    {
+      memcpy (dst, src, p - src + 1);
+      return (char *)dst + ((char *)p - (char *)src + 1);
+    }
+#endif 
 
   memcpy (dst, src, n);

trunk/src/libctests/glibc/string/test-string.h

@@ -52 +52 @@
 #define GLRO(x) _##x
 #include <hp-timing.h>
+
+/* bird added for bsd */
+#ifndef TEMP_FAILURE_RETRY /* special GNU idea */
+# define TEMP_FAILURE_RETRY(expression) \
+  (__extension__                                                              \
+    ({ long int __result;                                                     \
+       do __result = (long int) (expression);                                 \
+       while (__result == -1L && errno == EINTR);                             \
+       __result; }))
+#endif
+#ifndef HAVE_STRNLEN
+static inline size_t strnlen(const char *psz, size_t cch)
+{
+    const char *psz2 = psz;
+    while (cch > 0 && *psz)
+        cch--, psz++;
+    return psz - psz2;
+}
+#endif 
 
 

trunk/src/libctests/glibc/string/testcopy.c

@@ -21 +21 @@
 #include <stdio.h>
 #include <string.h>
-#include <malloc.h>
+/* #include <malloc.h> - <malloc.h> has been replaced by <stdlib.h>" */
 
 int

trunk/src/libctests/glibc/string/tester.c

@@ -267 +267 @@
 test_stpncpy (void)
 {
+#ifdef HAVE_STPNCPY
   it = "stpncpy";
   memset (one, 'x', sizeof (one));
@@ -277 +278 @@
   check (stpncpy (one, "abcd", 6) == one + 4, 7);
   check (one[4] == '\0' && one[5] == '\0' && one[6] == 'x', 8);
+#endif
 }
 
@@ -466 +468 @@
 test_strchrnul (void)
 {
+#ifdef HAVE_STRCHRNUL
   const char *os;
   it = "strchrnul";
@@ -495 +498 @@
       }
    }
+#endif 
 }
 
@@ -500 +504 @@
 test_rawmemchr (void)
 {
+#ifdef HAVE_RAWMEMCHR
   it = "rawmemchr";
   (void) strcpy (one, "abcd");
@@ -522 +527 @@
       }
    }
+#endif 
 }
 
@@ -573 +579 @@
 test_memrchr (void)
 {
+#ifdef HAVE_MEMRCHR
   size_t l;
   it = "memrchr";
@@ -614 +621 @@
     }
   }
+ #endif 
 }
 
@@ -825 +833 @@
 test_strsep (void)
 {
+#ifdef HAVE_STRSEP
   char *ptr;
   it = "strsep";
@@ -953 +962 @@
   check(ptr == one , 87);
   check(cp == NULL, 88);
+#endif
 }
 
@@ -1052 +1062 @@
 test_mempcpy (void)
 {
+#ifdef HAVE_MEMPCPY
   int i;
   it = "mempcpy";
@@ -1084 +1095 @@
       equal (two, "hi there", 12 + (i * 6));
     }
+#endif 
 }
 
@@ -1263 +1275 @@
 }
 
+
 static void
 test_strndup (void)
 {
+#ifdef HAVE_STRNDUP
   char *p, *q;
   it = "strndup";
@@ -1285 +1299 @@
     equal(p, "abc", 6);
   free (p);
+#endif 
 }
 

trunk/src/libctests/glibc/string/tst-strlen.c

@@ -5 +5 @@
 #include <stdio.h>
 #include <string.h>
+
+#ifndef HAVE_STRNLEN
+static inline size_t strnlen(const char *psz, size_t cch)
+{
+    const char *psz2 = psz;
+    while (cch > 0 && *psz)
+        cch--, psz++;
+    return psz - psz2;
+}
+#endif 
 
 int

trunk/src/libctests/glibc/string/tst-strxfrm.c

@@ -16 +16 @@
   size_t l;
   char *buf;
+#ifdef HAVE_NEWLOCALE
   locale_t loc;
+#endif 
   int result = 0;
 
@@ -40 +42 @@
     }
 
+#ifdef HAVE_NEWLOCALE
   loc = newlocale (1 << LC_ALL, locale, NULL);
 
@@ -52 +55 @@
 
   freelocale (loc);
+#endif 
 
   free (buf);
@@ -65 +69 @@
 
   result |= test ("C");
+#ifdef __BSD__ /* bsd is missing the aliases. loosers. */
+  result |= test ("en_US.ISO8859-1");
+#else
   result |= test ("en_US.ISO-8859-1");
+#endif 
   result |= test ("de_DE.UTF-8");