about summary refs log tree commit diff
path: root/localedata/collate-test.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2003-07-15 08:59:35 +0000
committerUlrich Drepper <drepper@redhat.com>2003-07-15 08:59:35 +0000
commitdade1ade05ce0c447ceeb66a11977892aeff9ba8 (patch)
treee1f3510503722c3e6b304816c46e11dbc0102a02 /localedata/collate-test.c
parent73299943388c0eebf6a9c8d6288e9da8289f9dca (diff)
downloadglibc-dade1ade05ce0c447ceeb66a11977892aeff9ba8.tar.gz
glibc-dade1ade05ce0c447ceeb66a11977892aeff9ba8.tar.xz
glibc-dade1ade05ce0c447ceeb66a11977892aeff9ba8.zip
Update.
2003-07-15  Ulrich Drepper  <drepper@redhat.com>

	* io/test-utime.c (main): Make test yet more robust.
Diffstat (limited to 'localedata/collate-test.c')
-rw-r--r--localedata/collate-test.c21
1 files changed, 15 insertions, 6 deletions
diff --git a/localedata/collate-test.c b/localedata/collate-test.c
index 3aa873af4b..21a06d8593 100644
--- a/localedata/collate-test.c
+++ b/localedata/collate-test.c
@@ -1,5 +1,5 @@
 /* Test collation function using real data.
-   Copyright (C) 1997, 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1999, 2000, 2003 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
@@ -27,8 +27,8 @@
 
 struct lines
 {
-  const char *key;
-  const char *line;
+  char *key;
+  char *line;
 };
 
 static int xstrcoll (const void *, const void *);
@@ -43,6 +43,9 @@ main (int argc, char *argv[])
   size_t len = 0;
   size_t n;
 
+  if (argc < 2)
+    error (1, 0, "usage: %s <random seed>", argv[0]);
+
   setlocale (LC_ALL, "");
 
   nstrings_max = 100;
@@ -63,8 +66,8 @@ main (int argc, char *argv[])
       if (nstrings == nstrings_max)
 	{
 	  strings = (struct lines *) realloc (strings,
-					      (nstrings_max *= 2
-					       * sizeof (*strings)));
+					      (nstrings_max *= 2)
+					       * sizeof (*strings));
 	  if (strings == NULL)
 	    {
 	      perror (argv[0]);
@@ -78,6 +81,7 @@ main (int argc, char *argv[])
       strings[nstrings].key = strndup (line, l);
       ++nstrings;
     }
+  free (line);
 
   /* First shuffle.  */
   srandom (atoi (argv[1]));
@@ -105,7 +109,12 @@ main (int argc, char *argv[])
 
   /* Print the result.  */
   for (n = 0; n < nstrings; ++n)
-    fputs (strings[n].line, stdout);
+    {
+      fputs (strings[n].line, stdout);
+      free (strings[n].line);
+      free (strings[n].key);
+    }
+  free (strings);
 
   return result;
 }