Update.

	* stdlib/Makefile (tests): Add tst-bsearch.
	* stdlib/tst-bsearch.c: New file.

diff --git a/ChangeLog b/ChangeLog
index 894f971..433dbca 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2000-09-06  Ulrich Drepper  <drepper@redhat.com>
 
+       * stdlib/Makefile (tests): Add tst-bsearch.
+       * stdlib/tst-bsearch.c: New file.
+
        * posix/getopt.c (_getopt_internal): Don't recognize an option
        name as ambiguous if it's a prefix for more than one name but the
        other struct option values are identical.

diff --git a/stdlib/Makefile b/stdlib/Makefile
index 6a0d39b..24b4b44 100644 (file)
--- a/stdlib/Makefile
+++ b/stdlib/Makefile
@@ -52,7 +52,7 @@ routines      :=                                                            \
 distribute     := exit.h grouping.h abort-instr.h isomac.c
 tests          := tst-strtol tst-strtod testmb testrand testsort testdiv \
                   test-canon test-canon2 tst-strtoll tst-environ         \
-                  tst-xpg-basename tst-random
+                  tst-xpg-basename tst-random tst-bsearch
 
 
 # Several mpn functions from GNU MP are used by the strtod function.

diff --git a/stdlib/tst-bsearch.c b/stdlib/tst-bsearch.c
new file mode 100644 (file)
index 0000000..2d067c3
--- /dev/null
+++ b/stdlib/tst-bsearch.c
@@ -0,0 +1,84 @@
+/* Copyright (C) 2000 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Ulrich Drepper <drepper@redhat.com>, 2000.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#include <stdio.h>
+#include <stdlib.h>
+
+struct entry
+{
+  int val;
+  const char *str;
+} arr[] =
+{
+  { 0, "zero" },
+  { 1, "one" },
+  { 2, "two" },
+  { 3, "three" },
+  { 4, "four" },
+  { 5, "five" },
+  { 6, "six" },
+  { 7, "seven" },
+  { 8, "eight" },
+  { 9, "nine" },
+  { 10, "ten" }
+};
+#define narr (sizeof (arr) / sizeof (arr[0]))
+
+
+static int
+comp (const void *p1, const void *p2)
+{
+  struct entry *e1 = (struct entry *) p1;
+  struct entry *e2 = (struct entry *) p2;
+
+  return e1->val - e2->val;
+}
+
+
+int
+main (void)
+{
+  int cnt;
+  int result = 0;
+
+  for (cnt = 0; cnt < narr; ++cnt)
+    {
+      struct entry key;
+      struct entry *res;
+
+      key.val = arr[cnt].val;
+
+      res = (struct entry *) bsearch (&key, arr, narr, sizeof (arr[0]), comp);
+      if (res == NULL)
+       {
+         printf ("entry %d not found\n", cnt);
+         result = 1;
+       }
+      else if (res != &arr[cnt])
+       {
+         puts ("wrong entry returned");
+         result = 1;
+       }
+    }
+
+  if (result == 0)
+    puts ("all OK");
+
+  return result;
+}