From 7f3a272ae327c647db4caeaea2a3c7af50bd73b5 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Tue, 1 Apr 2014 12:40:00 -0700 Subject: [PATCH] Add lsearch(3) for ltrace. Bug: 13746936 Change-Id: I833c6ba70a1752c04dab7de389f5bebb741662b3 --- libc/Android.mk | 1 + libc/include/search.h | 35 +++--- .../upstream-netbsd/lib/libc/stdlib/lsearch.c | 107 ++++++++++++++++++ 3 files changed, 128 insertions(+), 15 deletions(-) create mode 100644 libc/upstream-netbsd/lib/libc/stdlib/lsearch.c diff --git a/libc/Android.mk b/libc/Android.mk index 3faa47f0f..44bf3881e 100644 --- a/libc/Android.mk +++ b/libc/Android.mk @@ -292,6 +292,7 @@ libc_upstream_netbsd_src_files := \ upstream-netbsd/lib/libc/stdlib/ldiv.c \ upstream-netbsd/lib/libc/stdlib/lldiv.c \ upstream-netbsd/lib/libc/stdlib/lrand48.c \ + upstream-netbsd/lib/libc/stdlib/lsearch.c \ upstream-netbsd/lib/libc/stdlib/mrand48.c \ upstream-netbsd/lib/libc/stdlib/nrand48.c \ upstream-netbsd/lib/libc/stdlib/_rand48.c \ diff --git a/libc/include/search.h b/libc/include/search.h index 1301a08d8..b2c0e6b50 100644 --- a/libc/include/search.h +++ b/libc/include/search.h @@ -10,29 +10,34 @@ #define _SEARCH_H_ #include +#include -typedef enum { - preorder, - postorder, - endorder, - leaf +typedef enum { + preorder, + postorder, + endorder, + leaf } VISIT; #ifdef _SEARCH_PRIVATE -typedef struct node { - char *key; - struct node *llink, *rlink; +typedef struct node { + char* key; + struct node* llink; + struct node* rlink; } node_t; #endif __BEGIN_DECLS -void *tdelete(const void * __restrict, void ** __restrict, - int (*)(const void *, const void *)); -void *tfind(const void *, void * const *, - int (*)(const void *, const void *)); -void *tsearch(const void *, void **, int (*)(const void *, const void *)); -void twalk(const void *, void (*)(const void *, VISIT, int)); -void tdestroy(void *, void (*)(void *)); + +void* lfind(const void*, const void*, size_t*, size_t, int (*)(const void*, const void*)); +void* lsearch(const void*, void*, size_t*, size_t, int (*)(const void*, const void*)); + +void* tdelete(const void* __restrict, void** __restrict, int (*)(const void*, const void*)); +void tdestroy(void*, void (*)(void*)); +void* tfind(const void*, void* const*, int (*)(const void*, const void*)); +void* tsearch(const void*, void**, int (*)(const void*, const void*)); +void twalk(const void*, void (*)(const void*, VISIT, int)); + __END_DECLS #endif /* !_SEARCH_H_ */ diff --git a/libc/upstream-netbsd/lib/libc/stdlib/lsearch.c b/libc/upstream-netbsd/lib/libc/stdlib/lsearch.c new file mode 100644 index 000000000..e17130b63 --- /dev/null +++ b/libc/upstream-netbsd/lib/libc/stdlib/lsearch.c @@ -0,0 +1,107 @@ +/* + * Copyright (c) 1989, 1993 + * The Regents of the University of California. All rights reserved. + * + * This code is derived from software contributed to Berkeley by + * Roger L. Snyder. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include +#if defined(LIBC_SCCS) && !defined(lint) +#if 0 +static char sccsid[] = "@(#)lsearch.c 8.1 (Berkeley) 6/4/93"; +#else +__RCSID("$NetBSD: lsearch.c,v 1.7 2012/06/25 22:32:45 abs Exp $"); +#endif +#endif /* LIBC_SCCS and not lint */ + +#include + +#include +#include +#include +#include + +typedef int (*cmp_fn_t)(const void *, const void *); +static void *linear_base(const void *, void *, size_t *, size_t, + cmp_fn_t, int); + +void * +lsearch(const void *key, void *base, size_t *nelp, size_t width, + cmp_fn_t compar) +{ + + _DIAGASSERT(key != NULL); + _DIAGASSERT(base != NULL); + _DIAGASSERT(compar != NULL); + + return(linear_base(key, base, nelp, width, compar, 1)); +} + +void * +lfind(const void *key, const void *base, size_t *nelp, size_t width, + cmp_fn_t compar) +{ + + _DIAGASSERT(key != NULL); + _DIAGASSERT(base != NULL); + _DIAGASSERT(compar != NULL); + + return(linear_base(key, __UNCONST(base), nelp, width, compar, 0)); +} + +static void * +linear_base(const void *key, void *base, size_t *nelp, size_t width, + cmp_fn_t compar, int add_flag) +{ + char *element, *end; + + _DIAGASSERT(key != NULL); + _DIAGASSERT(base != NULL); + _DIAGASSERT(compar != NULL); + + end = (char *)base + *nelp * width; + for (element = (char *)base; element < end; element += width) + if (!compar(element, key)) /* key found */ + return element; + + if (!add_flag) /* key not found */ + return(NULL); + + /* + * The UNIX System User's Manual, 1986 edition claims that + * a NULL pointer is returned by lsearch with errno set + * appropriately, if there is not enough room in the table + * to add a new item. This can't be done as none of these + * routines have any method of determining the size of the + * table. This comment isn't in the 1986-87 System V + * manual. + */ + ++*nelp; + memcpy(end, key, width); + return end; +}