From 0de7f32b93af44a9ae3b5126b1ec5558fd51e14f Mon Sep 17 00:00:00 2001
From: Manuel Novoa III <mjn3@codepoet.org>
Date: Mon, 2 Dec 2002 16:20:50 +0000
Subject: Add hsearch and hsearch_r. Consolidate all functions prototyped in
search.h in one directory.
---
libc/misc/Makefile | 6 +-
libc/misc/insremque/Makefile | 43 --------
libc/misc/insremque/insremque.c | 51 ---------
libc/misc/lsearch/Makefile | 44 --------
libc/misc/lsearch/lsearch.c | 38 -------
libc/misc/search/Makefile | 72 +++++++++++++
libc/misc/search/hsearch.c | 56 ++++++++++
libc/misc/search/hsearch_r.c | 228 ++++++++++++++++++++++++++++++++++++++++
libc/misc/search/insremque.c | 58 ++++++++++
libc/misc/search/lsearch.c | 46 ++++++++
libc/misc/search/tsearch.c | 190 +++++++++++++++++++++++++++++++++
libc/misc/tsearch/Makefile | 43 --------
libc/misc/tsearch/tsearch.c | 190 ---------------------------------
13 files changed, 653 insertions(+), 412 deletions(-)
delete mode 100644 libc/misc/insremque/Makefile
delete mode 100644 libc/misc/insremque/insremque.c
delete mode 100644 libc/misc/lsearch/Makefile
delete mode 100644 libc/misc/lsearch/lsearch.c
create mode 100644 libc/misc/search/Makefile
create mode 100644 libc/misc/search/hsearch.c
create mode 100644 libc/misc/search/hsearch_r.c
create mode 100644 libc/misc/search/insremque.c
create mode 100644 libc/misc/search/lsearch.c
create mode 100644 libc/misc/search/tsearch.c
delete mode 100644 libc/misc/tsearch/Makefile
delete mode 100644 libc/misc/tsearch/tsearch.c
(limited to 'libc')
diff --git a/libc/misc/Makefile b/libc/misc/Makefile
index 2a74a4e54..46de813da 100644
--- a/libc/misc/Makefile
+++ b/libc/misc/Makefile
@@ -25,9 +25,9 @@ TOPDIR=../../
include $(TOPDIR)Rules.mak
-DIRS = assert ctype dirent file fnmatch glob internals lsearch \
- mntent syslog time utmp tsearch locale sysvipc statfs \
- error insremque ttyent gnu
+DIRS = assert ctype dirent file fnmatch glob internals \
+ mntent syslog time utmp locale sysvipc statfs \
+ error ttyent gnu search
ifeq ($(strip $(UCLIBC_HAS_REGEX)),y)
DIRS += regex
endif
diff --git a/libc/misc/insremque/Makefile b/libc/misc/insremque/Makefile
deleted file mode 100644
index c8d82dc91..000000000
--- a/libc/misc/insremque/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-# Makefile for uClibc
-#
-# Copyright (C) 2000 by Lineo, inc.
-#
-# This program 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.
-#
-# This program 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 this program; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-#
-# Derived in part from the Linux-8086 C library, the GNU C Library, and several
-# other sundry sources. Files within this library are copyright by their
-# respective copyright holders.
-
-TOPDIR=../../../
-include $(TOPDIR)Rules.mak
-
-CSRC=insremque.c
-COBJS=$(patsubst %.c,%.o, $(CSRC))
-OBJS=$(COBJS)
-
-all: $(OBJS) $(LIBC)
-
-$(LIBC): ar-target
-
-ar-target: $(OBJS)
- $(AR) $(ARFLAGS) $(LIBC) $(OBJS)
-
-$(COBJS): %.o : %.c
- $(CC) $(CFLAGS) -c $< -o $@
- $(STRIPTOOL) -x -R .note -R .comment $*.o
-
-clean:
- rm -f *.[oa] *~ core
-
diff --git a/libc/misc/insremque/insremque.c b/libc/misc/insremque/insremque.c
deleted file mode 100644
index 7f156c601..000000000
--- a/libc/misc/insremque/insremque.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/* Copyright (C) 1992, 1995, 1996 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
-
- 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 <features.h>
-#define __USE_GNU
-#include <stddef.h>
-#ifndef _SVID_SOURCE
-#define _SVID_SOURCE 1
-#endif
-#include <search.h>
-
-/* Insert ELEM into a doubly-linked list, after PREV. */
-
-void
-insque (void *elem, void *prev)
-{
- struct qelem *next = ((struct qelem *) prev)->q_forw;
- ((struct qelem *) prev)->q_forw = (struct qelem *) elem;
- if (next != NULL)
- next->q_back = (struct qelem *) elem;
- ((struct qelem *) elem)->q_forw = next;
- ((struct qelem *) elem)->q_back = (struct qelem *) prev;
-}
-
-/* Unlink ELEM from the doubly-linked list that it is in. */
-
-void
-remque (void *elem)
-{
- struct qelem *next = ((struct qelem *) elem)->q_forw;
- struct qelem *prev = ((struct qelem *) elem)->q_back;
- if (next != NULL)
- next->q_back = prev;
- if (prev != NULL)
- prev->q_forw = (struct qelem *) next;
-}
diff --git a/libc/misc/lsearch/Makefile b/libc/misc/lsearch/Makefile
deleted file mode 100644
index 69475c960..000000000
--- a/libc/misc/lsearch/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-# Makefile for uClibc
-#
-# Copyright (C) 2000 by Lineo, inc.
-# Copyright (C) 2000,2001 Erik Andersen <andersen@uclibc.org>
-#
-# This program 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.
-#
-# This program 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 this program; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-#
-# Derived in part from the Linux-8086 C library, the GNU C Library, and several
-# other sundry sources. Files within this library are copyright by their
-# respective copyright holders.
-
-TOPDIR=../../../
-include $(TOPDIR)Rules.mak
-
-CSRC=lsearch.c
-COBJS=$(patsubst %.c,%.o, $(CSRC))
-OBJS=$(COBJS)
-
-all: $(OBJS) $(LIBC)
-
-$(LIBC): ar-target
-
-ar-target: $(OBJS)
- $(AR) $(ARFLAGS) $(LIBC) $(OBJS)
-
-$(COBJS): %.o : %.c
- $(CC) $(CFLAGS) -c $< -o $@
- $(STRIPTOOL) -x -R .note -R .comment $*.o
-
-clean:
- rm -f *.[oa] *~ core
-
diff --git a/libc/misc/lsearch/lsearch.c b/libc/misc/lsearch/lsearch.c
deleted file mode 100644
index 8b10fd874..000000000
--- a/libc/misc/lsearch/lsearch.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * This file lifted in toto from 'Dlibs' on the atari ST (RdeBath)
- *
- *
- * Dale Schumacher 399 Beacon Ave.
- * (alias: Dalnefre') St. Paul, MN 55104
- * dal@syntel.UUCP United States of America
- * "It's not reality that's important, but how you perceive things."
- */
-
-#include <string.h>
-#include <stdio.h>
-#include <search.h>
-
-void *lfind(const void *key, const void *base, size_t *nmemb,
- size_t size, int (*compar)(const void *, const void *))
-{
- register int n = *nmemb;
-
- while (n--) {
- if ((*compar) (base, key) == 0)
- return ((void*)base);
- base += size;
- }
- return (NULL);
-}
-
-void *lsearch(const void *key, void *base, size_t *nmemb,
- size_t size, int (*compar)(const void *, const void *))
-{
- register char *p;
-
- if ((p = lfind(key, base, nmemb, size, compar)) == NULL) {
- p = memcpy((base + (size * (*nmemb))), key, size);
- ++(*nmemb);
- }
- return (p);
-}
diff --git a/libc/misc/search/Makefile b/libc/misc/search/Makefile
new file mode 100644
index 000000000..38046a455
--- /dev/null
+++ b/libc/misc/search/Makefile
@@ -0,0 +1,72 @@
+# Makefile for uClibc
+#
+# Copyright (C) 2000 by Lineo, inc.
+# Copyright (C) 2000,2001 Erik Andersen <andersen@uclibc.org>
+#
+# This program 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.
+#
+# This program 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 this program; if not, write to the Free Software Foundation, Inc.,
+# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+# Derived in part from the Linux-8086 C library, the GNU C Library, and several
+# other sundry sources. Files within this library are copyright by their
+# respective copyright holders.
+
+TOPDIR=../../../
+include $(TOPDIR)Rules.mak
+
+MSRC1=tsearch.c
+MOBJ1=tsearch.o tfind.o tdelete.o twalk.o
+
+MSRC2=lsearch.c
+MOBJ2=lfind.o lsearch.o
+
+MSRC3=insremque.c
+MOBJ3=insque.o remque.o
+
+MSRC4=hsearch_r.c
+MOBJ4=hcreate_r.o hdestroy_r.o hsearch_r.o
+
+CSRC=hsearch.c
+COBJS=$(patsubst %.c,%.o, $(CSRC))
+OBJS=$(COBJS)
+
+all: $(MOBJ1) $(MOBJ2) $(MOBJ3) $(MOBJ4) $(OBJS) $(LIBC)
+
+$(LIBC): ar-target
+
+ar-target: $(MOBJ)
+ $(AR) $(ARFLAGS) $(LIBC) $(MOBJ)
+
+$(MOBJ1): $(MSRC1)
+ $(CC) $(CFLAGS) -DL_$* $< -c -o $*.o
+ $(STRIPTOOL) -x -R .note -R .comment $*.o
+
+$(MOBJ2): $(MSRC2)
+ $(CC) $(CFLAGS) -DL_$* $< -c -o $*.o
+ $(STRIPTOOL) -x -R .note -R .comment $*.o
+
+$(MOBJ3): $(MSRC3)
+ $(CC) $(CFLAGS) -DL_$* $< -c -o $*.o
+ $(STRIPTOOL) -x -R .note -R .comment $*.o
+
+$(MOBJ4): $(MSRC4)
+ $(CC) $(CFLAGS) -DL_$* $< -c -o $*.o
+ $(STRIPTOOL) -x -R .note -R .comment $*.o
+
+$(COBJS): %.o : %.c
+ $(CC) $(CFLAGS) -c $< -o $@
+ $(STRIPTOOL) -x -R .note -R .comment $*.o
+
+clean:
+ rm -f *.[oa] *~ core
+
diff --git a/libc/misc/search/hsearch.c b/libc/misc/search/hsearch.c
new file mode 100644
index 000000000..067e4973b
--- /dev/null
+++ b/libc/misc/search/hsearch.c
@@ -0,0 +1,56 @@
+/* Copyright (C) 1993, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
+ Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 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
+ 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. */
+
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
+
+#include <search.h>
+
+/* The non-reentrant version use a global space for storing the table. */
+static struct hsearch_data htab;
+
+
+/* Define the non-reentrant function using the reentrant counterparts. */
+ENTRY *hsearch (ENTRY item, ACTION action)
+{
+ ENTRY *result;
+
+ (void) hsearch_r (item, action, &result, &htab);
+
+ return result;
+}
+
+
+int hcreate (size_t nel)
+{
+ return hcreate_r (nel, &htab);
+}
+
+
+/* void __hdestroy (void) */
+void hdestroy (void)
+{
+ hdestroy_r (&htab);
+}
+/* weak_alias (__hdestroy, hdestroy) */
+
+/* Make sure the table is freed if we want to free everything before
+ exiting. */
+/* text_set_element (__libc_subfreeres, __hdestroy); */
diff --git a/libc/misc/search/hsearch_r.c b/libc/misc/search/hsearch_r.c
new file mode 100644
index 000000000..10efb1a88
--- /dev/null
+++ b/libc/misc/search/hsearch_r.c
@@ -0,0 +1,228 @@
+/* Copyright (C) 1993, 1995, 1996, 1997, 2002 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+ Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1993.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 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
+ 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. */
+
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
+
+#include <errno.h>
+#include <malloc.h>
+#include <string.h>
+
+#include <search.h>
+
+/* [Aho,Sethi,Ullman] Compilers: Principles, Techniques and Tools, 1986
+ [Knuth] The Art of Computer Programming, part 3 (6.4) */
+
+
+/* The reentrant version has no static variables to maintain the state.
+ Instead the interface of all functions is extended to take an argument
+ which describes the current status. */
+typedef struct _ENTRY
+{
+ unsigned int used;
+ ENTRY entry;
+}
+_ENTRY;
+
+
+#ifdef L_hcreate_r
+
+/* For the used double hash method the table size has to be a prime. To
+ correct the user given table size we need a prime test. This trivial
+ algorithm is adequate because
+ a) the code is (most probably) called a few times per program run and
+ b) the number is small because the table must fit in the core */
+static int isprime (unsigned int number)
+{
+ /* no even number will be passed */
+ unsigned int div = 3;
+
+ while (div * div < number && number % div != 0)
+ div += 2;
+
+ return number % div != 0;
+}
+
+
+/* Before using the hash table we must allocate memory for it.
+ Test for an existing table are done. We allocate one element
+ more as the found prime number says. This is done for more effective
+ indexing as explained in the comment for the hsearch function.
+ The contents of the table is zeroed, especially the field used
+ becomes zero. */
+int hcreate_r (size_t nel, struct hsearch_data *htab)
+{
+ /* Test for correct arguments. */
+ if (htab == NULL)
+ {
+ __set_errno (EINVAL);
+ return 0;
+ }
+
+ /* There is still another table active. Return with error. */
+ if (htab->table != NULL)
+ return 0;
+
+ /* Change nel to the first prime number not smaller as nel. */
+ nel |= 1; /* make odd */
+ while (!isprime (nel))
+ nel += 2;
+
+ htab->size = nel;
+ htab->filled = 0;
+
+ /* allocate memory and zero out */
+ htab->table = (_ENTRY *) calloc (htab->size + 1, sizeof (_ENTRY));
+ if (htab->table == NULL)
+ return 0;
+
+ /* everything went alright */
+ return 1;
+}
+/* libc_hidden_def (hcreate_r) */
+#endif
+
+#ifdef L_hdestroy_r
+/* After using the hash table it has to be destroyed. The used memory can
+ be freed and the local static variable can be marked as not used. */
+void hdestroy_r (struct hsearch_data *htab)
+{
+ /* Test for correct arguments. */
+ if (htab == NULL)
+ {
+ __set_errno (EINVAL);
+ return;
+ }
+
+ if (htab->table != NULL)
+ /* free used memory */
+ free (htab->table);
+
+ /* the sign for an existing table is an value != NULL in htable */
+ htab->table = NULL;
+}
+/* libc_hidden_def (hdestroy_r) */
+#endif
+
+#ifdef L_hsearch_r
+/* This is the search function. It uses double hashing with open addressing.
+ The argument item.key has to be a pointer to an zero terminated, most
+ probably strings of chars. The function for generating a number of the
+ strings is simple but fast. It can be replaced by a more complex function
+ like ajw (see [Aho,Sethi,Ullman]) if the needs are shown.
+
+ We use an trick to speed up the lookup. The table is created by hcreate
+ with one more element available. This enables us to use the index zero
+ special. This index will never be used because we store the first hash
+ index in the field used where zero means not used. Every other value
+ means used. The used field can be used as a first fast comparison for
+ equality of the stored and the parameter value. This helps to prevent
+ unnecessary expensive calls of strcmp. */
+int hsearch_r (ENTRY item, ACTION action, ENTRY **retval,
+ struct hsearch_data *htab)
+{
+ unsigned int hval;
+ unsigned int count;
+ unsigned int len = strlen (item.key);
+ unsigned int idx;
+
+ /* Compute an value for the given string. Perhaps use a better method. */
+ hval = len;
+ count = len;
+ while (count-- > 0)
+ {
+ hval <<= 4;
+ hval += item.key[count];
+ }
+
+ /* First hash function: simply take the modul but prevent zero. */
+ hval %= htab->size;
+ if (hval == 0)
+ ++hval;
+
+ /* The first index tried. */
+ idx = hval;
+
+ if (htab->table[idx].used)
+ {
+ /* Further action might be required according to the action value. */
+ unsigned hval2;
+
+ if (htab->table[idx].used == hval
+ && strcmp (item.key, htab->table[idx].entry.key) == 0)
+ {
+ *retval = &htab->table[idx].entry;
+ return 1;
+ }
+
+ /* Second hash function, as suggested in [Knuth] */
+ hval2 = 1 + hval % (htab->size - 2);
+
+ do
+ {
+ /* Because SIZE is prime this guarantees to step through all
+ available indeces. */
+ if (idx <= hval2)
+ idx = htab->size + idx - hval2;
+ else
+ idx -= hval2;
+
+ /* If we visited all entries leave the loop unsuccessfully. */
+ if (idx == hval)
+ break;
+
+ /* If entry is found use it. */
+ if (htab->table[idx].used == hval
+ && strcmp (item.key, htab->table[idx].entry.key) == 0)
+ {
+ *retval = &htab->table[idx].entry;
+ return 1;
+ }
+ }
+ while (htab->table[idx].used);
+ }
+
+ /* An empty bucket has been found. */
+ if (action == ENTER)
+ {
+ /* If table is full and another entry should be entered return
+ with error. */
+ if (action == ENTER && htab->filled == htab->size)
+ {
+ __set_errno (ENOMEM);
+ *retval = NULL;
+ return 0;
+ }
+
+ htab->table[idx].used = hval;
+ htab->table[idx].entry = item;
+
+ ++htab->filled;
+
+ *retval = &htab->table[idx].entry;
+ return 1;
+ }
+
+ __set_errno (ESRCH);
+ *retval = NULL;
+ return 0;
+}
+/* libc_hidden_def (hsearch_r) */
+#endif
diff --git a/libc/misc/search/insremque.c b/libc/misc/search/insremque.c
new file mode 100644
index 000000000..29e547ff3
--- /dev/null
+++ b/libc/misc/search/insremque.c
@@ -0,0 +1,58 @@
+/* Copyright (C) 1992, 1995, 1996 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ 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 <features.h>
+#define __USE_GNU
+#include <stddef.h>
+#ifndef _SVID_SOURCE
+#define _SVID_SOURCE 1
+#endif
+#include <search.h>
+
+#ifdef L_insque
+
+/* Insert ELEM into a doubly-linked list, after PREV. */
+
+void
+insque (void *elem, void *prev)
+{
+ struct qelem *next = ((struct qelem *) prev)->q_forw;
+ ((struct qelem *) prev)->q_forw = (struct qelem *) elem;
+ if (next != NULL)
+ next->q_back = (struct qelem *) elem;
+ ((struct qelem *) elem)->q_forw = next;
+ ((struct qelem *) elem)->q_back = (struct qelem *) prev;
+}
+
+#endif
+
+#ifdef L_remque
+/* Unlink ELEM from the doubly-linked list that it is in. */
+
+void
+remque (void *elem)
+{
+ struct qelem *next = ((struct qelem *) elem)->q_forw;
+ struct qelem *prev = ((struct qelem *) elem)->q_back;
+ if (next != NULL)
+ next->q_back = prev;
+ if (prev != NULL)
+ prev->q_forw = (struct qelem *) next;
+}
+
+#endif
diff --git a/libc/misc/search/lsearch.c b/libc/misc/search/lsearch.c
new file mode 100644
index 000000000..2a9996d47
--- /dev/null
+++ b/libc/misc/search/lsearch.c
@@ -0,0 +1,46 @@
+/*
+ * This file lifted in toto from 'Dlibs' on the atari ST (RdeBath)
+ *
+ *
+ * Dale Schumacher 399 Beacon Ave.
+ * (alias: Dalnefre') St. Paul, MN 55104
+ * dal@syntel.UUCP United States of America
+ * "It's not reality that's important, but how you perceive things."
+ */
+
+#include <string.h>
+#include <stdio.h>
+#include <search.h>
+
+#ifdef L_lfind
+
+void *lfind(const void *key, const void *base, size_t *nmemb,
+ size_t size, int (*compar)(const void *, const void *))
+{
+ register int n = *nmemb;
+
+ while (n--) {
+ if ((*compar) (base, key) == 0)
+ return ((void*)base);
+ base += size;
+ }
+ return (NULL);
+}
+
+#endif
+
+#ifdef L_lsearch
+
+void *lsearch(const void *key, void *base, size_t *nmemb,
+ size_t size, int (*compar)(const void *, const void *))
+{
+ register char *p;
+
+ if ((p = lfind(key, base, nmemb, size, compar)) == NULL) {
+ p = memcpy((base + (size * (*nmemb))), key, size);
+ ++(*nmemb);
+ }
+ return (p);
+}
+
+#endif
diff --git a/libc/misc/search/tsearch.c b/libc/misc/search/tsearch.c
new file mode 100644
index 000000000..b584e2f15
--- /dev/null
+++ b/libc/misc/search/tsearch.c
@@ -0,0 +1,190 @@
+/* Copyright (C) 1994 Free Software Foundation, Inc.
+This file is part of the GNU C Library.
+
+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., 675 Mass Ave,
+Cambridge, MA 02139, USA. */
+
+/*
+ * Tree search generalized from Knuth (6.2.2) Algorithm T just like
+ * the AT&T man page says.
+ *
+ * The node_t structure is for internal use only, lint doesn't grok it.
+ *
+ * Written by reading the System V Interface Definition, not the code.
+ *
+ * Totally public domain.
+ */
+/*LINTLIBRARY*/
+
+#include <search.h>
+#include <stdlib.h>
+
+/* This routine is not very bad. It makes many assumptions about
+ * the compiler. It assumpts that the first field in node must be
+ * the "key" field, which points to the datum. It is a very trick
+ * stuff. H.J.
+ */
+
+typedef struct node_t
+{
+ void *key;
+ struct node_t *left, *right;
+} node;
+
+#ifdef L_tsearch
+/* find or insert datum into search tree.
+char *key; key to be located
+register node **rootp; address of tree root
+int (*compar)(); ordering function
+*/
+
+void *tsearch(__const void *key, void **vrootp, __compar_fn_t compar)
+{
+ register node *q;
+ register node **rootp = (node **) vrootp;
+
+ if (rootp == (struct node_t **)0)
+ return ((struct node_t *)0);
+ while (*rootp != (struct node_t *)0) /* Knuth's T1: */
+ {
+ int r;
+
+ if ((r = (*compar)(key, (*rootp)->key)) == 0) /* T2: */
+ return (*rootp); /* we found it! */
+ rootp = (r < 0) ?
+ &(*rootp)->left : /* T3: follow left branch */
+ &(*rootp)->right; /* T4: follow right branch */
+ }
+ q = (node *) malloc(sizeof(node)); /* T5: key not found */
+ if (q != (struct node_t *)0) /* make new node */
+ {
+ *rootp = q; /* link new node to old */
+ q->key = (void *)key; /* initialize new node */
+ q->left = q->right = (struct node_t *)0;
+ }
+ return (q);
+}
+#endif
+
+#ifdef L_tfind
+void *tfind(__const void *key, void * __const *vrootp, __compar_fn_t compar)
+{
+ register node **rootp = (node **) vrootp;
+
+ if (rootp == (struct node_t **)0)
+ return ((struct node_t *)0);
+ while (*rootp != (struct node_t *)0) /* Knuth's T1: */
+ {
+ int r;
+
+ if ((r = (*compar)(key, (*rootp)->key)) == 0) /* T2: */
+ return (*rootp); /* we found it! */
+ rootp = (r < 0) ?
+ &(*rootp)->left : /* T3: follow left branch */
+ &(*rootp)->right; /* T4: follow right branch */
+ }
+ return NULL;
+}
+#endif
+
+#ifdef L_tdelete
+/* delete node with given key
+char *key; key to be deleted
+register node **rootp; address of the root of tree
+int (*compar)(); comparison function
+*/
+void *tdelete(__const void *key, void ** vrootp, __compar_fn_t compar)
+{
+ node *p;
+ register node *q;
+ register node *r;
+ int cmp;
+ register node **rootp = (node **) vrootp;
+
+ if (rootp == (struct node_t **)0 || (p = *rootp) == (struct node_t *)0)
+ return ((struct node_t *)0);
+ while ((cmp = (*compar)(key, (*rootp)->key)) != 0)
+ {
+ p = *rootp;
+ rootp = (cmp < 0) ?
+ &(*rootp)->left : /* follow left branch */
+ &(*rootp)->right; /* follow right branch */
+ if (*rootp == (struct node_t *)0)
+ return ((struct node_t *)0); /* key not found */
+ }
+ r = (*rootp)->right; /* D1: */
+ if ((q = (*rootp)->left) == (struct node_t *)0) /* Left (struct node_t *)0? */
+ q = r;
+ else if (r != (struct node_t *)0) /* Right link is null? */
+ {
+ if (r->left == (struct node_t *)0) /* D2: Find successor */
+ {
+ r->left = q;
+ q = r;
+ }
+ else
+ { /* D3: Find (struct node_t *)0 link */
+ for (q = r->left; q->left != (struct node_t *)0; q = r->left)
+ r = q;
+ r->left = q->right;
+ q->left = (*rootp)->left;
+ q->right = (*rootp)->right;
+ }
+ }
+ free((struct node_t *) *rootp); /* D4: Free node */
+ *rootp = q; /* link parent to new node */
+ return(p);
+}
+#endif
+
+#ifdef L_twalk
+/* Walk the nodes of a tree
+register node *root; Root of the tree to be walked
+register void (*action)(); Function to be called at each node
+register int level;
+*/
+static void trecurse(__const void *vroot, __action_fn_t action, int level)
+{
+ register node *root = (node *) vroot;
+
+ if (root->left == (struct node_t *)0 && root->right == (struct node_t *)0)
+ (*action)(root, leaf, level);
+ else
+ {
+ (*action)(root, preorder, level);
+ if (root->left != (struct node_t *)0)
+ trecurse(root->left, action, level + 1);
+ (*action)(root, postorder, level);
+ if (root->right != (struct node_t *)0)
+ trecurse(root->right, action, level + 1);
+ (*action)(root, endorder, level);
+ }
+}
+
+/* void twalk(root, action) Walk the nodes of a tree
+node *root; Root of the tree to be walked
+void (*action)(); Function to be called at each node
+PTR
+*/
+void twalk(__const void *vroot, __action_fn_t action)
+{
+ register __const node *root = (node *) vroot;
+
+ if (root != (node *)0 && action != (__action_fn_t) 0)
+ trecurse(root, action, 0);
+}
+#endif
+
+/* tsearch.c ends here */
diff --git a/libc/misc/tsearch/Makefile b/libc/misc/tsearch/Makefile
deleted file mode 100644
index 5f10c4026..000000000
--- a/libc/misc/tsearch/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-# Makefile for uClibc
-#
-# Copyright (C) 2000 by Lineo, inc.
-# Copyright (C) 2000,2001 Erik Andersen <andersen@uclibc.org>
-#
-# This program 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.
-#
-# This program 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 this program; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-#
-# Derived in part from the Linux-8086 C library, the GNU C Library, and several
-# other sundry sources. Files within this library are copyright by their
-# respective copyright holders.
-
-TOPDIR=../../../
-include $(TOPDIR)Rules.mak
-
-MSRC=tsearch.c
-MOBJ=tsearch.o tfind.o tdelete.o twalk.o
-
-all: $(MOBJ) $(LIBC)
-
-$(LIBC): ar-target
-
-ar-target: $(MOBJ)
- $(AR) $(ARFLAGS) $(LIBC) $(MOBJ)
-
-$(MOBJ): $(MSRC)
- $(CC) $(CFLAGS) -DL_$* $< -c -o $*.o
- $(STRIPTOOL) -x -R .note -R .comment $*.o
-
-clean:
- rm -f *.[oa] *~ core
-
diff --git a/libc/misc/tsearch/tsearch.c b/libc/misc/tsearch/tsearch.c
deleted file mode 100644
index b584e2f15..000000000
--- a/libc/misc/tsearch/tsearch.c
+++ /dev/null
@@ -1,190 +0,0 @@
-/* Copyright (C) 1994 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
-
-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., 675 Mass Ave,
-Cambridge, MA 02139, USA. */
-
-/*
- * Tree search generalized from Knuth (6.2.2) Algorithm T just like
- * the AT&T man page says.
- *
- * The node_t structure is for internal use only, lint doesn't grok it.
- *
- * Written by reading the System V Interface Definition, not the code.
- *
- * Totally public domain.
- */
-/*LINTLIBRARY*/
-
-#include <search.h>
-#include <stdlib.h>
-
-/* This routine is not very bad. It makes many assumptions about
- * the compiler. It assumpts that the first field in node must be
- * the "key" field, which points to the datum. It is a very trick
- * stuff. H.J.
- */
-
-typedef struct node_t
-{
- void *key;
- struct node_t *left, *right;
-} node;
-
-#ifdef L_tsearch
-/* find or insert datum into search tree.
-char *key; key to be located
-register node **rootp; address of tree root
-int (*compar)(); ordering function
-*/
-
-void *tsearch(__const void *key, void **vrootp, __compar_fn_t compar)
-{
- register node *q;
- register node **rootp = (node **) vrootp;
-
- if (rootp == (struct node_t **)0)
- return ((struct node_t *)0);
- while (*rootp != (struct node_t *)0) /* Knuth's T1: */
- {
- int r;
-
- if ((r = (*compar)(key, (*rootp)->key)) == 0) /* T2: */
- return (*rootp); /* we found it! */
- rootp = (r < 0) ?
- &(*rootp)->left : /* T3: follow left branch */
- &(*rootp)->right; /* T4: follow right branch */
- }
- q = (node *) malloc(sizeof(node)); /* T5: key not found */
- if (q != (struct node_t *)0) /* make new node */
- {
- *rootp = q; /* link new node to old */
- q->key = (void *)key; /* initialize new node */
- q->left = q->right = (struct node_t *)0;
- }
- return (q);
-}
-#endif
-
-#ifdef L_tfind
-void *tfind(__const void *key, void * __const *vrootp, __compar_fn_t compar)
-{
- register node **rootp = (node **) vrootp;
-
- if (rootp == (struct node_t **)0)
- return ((struct node_t *)0);
- while (*rootp != (struct node_t *)0) /* Knuth's T1: */
- {
- int r;
-
- if ((r = (*compar)(key, (*rootp)->key)) == 0) /* T2: */
- return (*rootp); /* we found it! */
- rootp = (r < 0) ?
- &(*rootp)->left : /* T3: follow left branch */
- &(*rootp)->right; /* T4: follow right branch */
- }
- return NULL;
-}
-#endif
-
-#ifdef L_tdelete
-/* delete node with given key
-char *key; key to be deleted
-register node **rootp; address of the root of tree
-int (*compar)(); comparison function
-*/
-void *tdelete(__const void *key, void ** vrootp, __compar_fn_t compar)
-{
- node *p;
- register node *q;
- register node *r;
- int cmp;
- register node **rootp = (node **) vrootp;
-
- if (rootp == (struct node_t **)0 || (p = *rootp) == (struct node_t *)0)
- return ((struct node_t *)0);
- while ((cmp = (*compar)(key, (*rootp)->key)) != 0)
- {
- p = *rootp;
- rootp = (cmp < 0) ?
- &(*rootp)->left : /* follow left branch */
- &(*rootp)->right; /* follow right branch */
- if (*rootp == (struct node_t *)0)
- return ((struct node_t *)0); /* key not found */
- }
- r = (*rootp)->right; /* D1: */
- if ((q = (*rootp)->left) == (struct node_t *)0) /* Left (struct node_t *)0? */
- q = r;
- else if (r != (struct node_t *)0) /* Right link is null? */
- {
- if (r->left == (struct node_t *)0) /* D2: Find successor */
- {
- r->left = q;
- q = r;
- }
- else
- { /* D3: Find (struct node_t *)0 link */
- for (q = r->left; q->left != (struct node_t *)0; q = r->left)
- r = q;
- r->left = q->right;
- q->left = (*rootp)->left;
- q->right = (*rootp)->right;
- }
- }
- free((struct node_t *) *rootp); /* D4: Free node */
- *rootp = q; /* link parent to new node */
- return(p);
-}
-#endif
-
-#ifdef L_twalk
-/* Walk the nodes of a tree
-register node *root; Root of the tree to be walked
-register void (*action)(); Function to be called at each node
-register int level;
-*/
-static void trecurse(__const void *vroot, __action_fn_t action, int level)
-{
- register node *root = (node *) vroot;
-
- if (root->left == (struct node_t *)0 && root->right == (struct node_t *)0)
- (*action)(root, leaf, level);
- else
- {
- (*action)(root, preorder, level);
- if (root->left != (struct node_t *)0)
- trecurse(root->left, action, level + 1);
- (*action)(root, postorder, level);
- if (root->right != (struct node_t *)0)
- trecurse(root->right, action, level + 1);
- (*action)(root, endorder, level);
- }
-}
-
-/* void twalk(root, action) Walk the nodes of a tree
-node *root; Root of the tree to be walked
-void (*action)(); Function to be called at each node
-PTR
-*/
-void twalk(__const void *vroot, __action_fn_t action)
-{
- register __const node *root = (node *) vroot;
-
- if (root != (node *)0 && action != (__action_fn_t) 0)
- trecurse(root, action, 0);
-}
-#endif
-
-/* tsearch.c ends here */
--
cgit v1.2.3