Fix nscd/cachedumper.c compile errors

[thirdparty/glibc.git] / localedata / xfrm-test.c

diff --git a/localedata/xfrm-test.c b/localedata/xfrm-test.c
index 5fe517a2e81071ee58471bb9ba76d1007dd1bcf0..adb8c607f219f315482c058f25547019df8abbf8 100644 (file)
--- a/localedata/xfrm-test.c
+++ b/localedata/xfrm-test.c
@@ -1,5 +1,5 @@
 /* Test collation function via transformation using real data.
-   Copyright (C) 1997, 1998, 2000, 2003 Free Software Foundation, Inc.
+   Copyright (C) 1997-2020 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
@@ -14,16 +14,19 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <https://www.gnu.org/licenses/>.  */
 
 #include <ctype.h>
+#include <error.h>
 #include <locale.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <stdbool.h>
 
+/* Keep in sync with string/strxfrm_l.c.  */
+#define SMALL_STR_SIZE 4095
 
 struct lines
 {
@@ -37,6 +40,7 @@ int
 main (int argc, char *argv[])
 {
   int result = 0;
+  bool nocache = false;
   size_t nstrings, nstrings_max;
   struct lines *strings;
   char *line = NULL;
@@ -44,7 +48,18 @@ main (int argc, char *argv[])
   size_t n;
 
   if (argc < 2)
-    error (1, 0, "usage: %s <random seed>", argv[0]);
+    error (1, 0, "usage: %s <random seed> [-nocache]", argv[0]);
+
+  if (argc == 3)
+    {
+      if (strcmp (argv[2], "-nocache") == 0)
+       nocache = true;
+      else
+       {
+         printf ("Unknown option %s!\n", argv[2]);
+         exit (1);
+       }
+    }
 
   setlocale (LC_ALL, "");
 
@@ -59,9 +74,9 @@ main (int argc, char *argv[])
 
   while (1)
     {
-      char saved, *newp;
-      int needed;
-      int l;
+      char saved, *word, *newp;
+      size_t l, line_len, needed;
+
       if (getline (&line, &len, stdin) < 0)
        break;
 
@@ -83,10 +98,35 @@ main (int argc, char *argv[])
 
       saved = line[l];
       line[l] = '\0';
-      needed = strxfrm (NULL, line, 0);
+
+      if (nocache)
+       {
+         line_len = strlen (line);
+         word = malloc (line_len + SMALL_STR_SIZE + 1);
+         if (word == NULL)
+           {
+             printf ("malloc failed: %m\n");
+             exit (1);
+           }
+         memset (word, ' ', SMALL_STR_SIZE);
+         memcpy (word + SMALL_STR_SIZE, line, line_len);
+         word[line_len + SMALL_STR_SIZE] = '\0';
+       }
+      else
+        word = line;
+
+      needed = strxfrm (NULL, word, 0);
       newp = malloc (needed + 1);
-      strxfrm (newp, line, needed + 1);
+      if (newp == NULL)
+       {
+         printf ("malloc failed: %m\n");
+         exit (1);
+       }
+      strxfrm (newp, word, needed + 1);
       strings[nstrings].xfrm = newp;
+
+      if (nocache)
+       free (word);
       line[l] = saved;
       ++nstrings;
     }
@@ -132,9 +172,7 @@ main (int argc, char *argv[])
 
 
 static int
-xstrcmp (ptr1, ptr2)
-     const void *ptr1;
-     const void *ptr2;
+xstrcmp (const void *ptr1, const void *ptr2)
 {
   const struct lines *l1 = (const struct lines *) ptr1;
   const struct lines *l2 = (const struct lines *) ptr2;