[PATCH] fix lsearch and lfind to pass key as first arg to the compar callback

[PATCH] fix lsearch and lfind to pass key as first arg to the compar callback

[Szabolcs Nagy]

this is not a conformance issue as posix does not specify the
argument order, but the order is specified for bsearch and some
systems document the order for lsearch consistently (openbsd).

since there were two indpendent reports of this issue it's better
to use the more widely expected argument order.
---

in both reported cases upstream got fixed, but i think it
is worth changing anyway.

 src/search/lsearch.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/search/lsearch.c b/src/search/lsearch.c
index 63f31922..5eb5cc2b 100644
--- a/src/search/lsearch.c
+++ b/src/search/lsearch.c
@@ -9,7 +9,7 @@ void *lsearch(const void *key, void *base, size_t *nelp, size_t width,
 	size_t i;
 
 	for (i = 0; i < n; i++)
-		if (compar(p[i], key) == 0)
+		if (compar(key, p[i]) == 0)
 			return p[i];
 	*nelp = n+1;
 	return memcpy(p[n], key, width);
@@ -23,7 +23,7 @@ void *lfind(const void *key, const void *base, size_t *nelp,
 	size_t i;
 
 	for (i = 0; i < n; i++)
-		if (compar(p[i], key) == 0)
+		if (compar(key, p[i]) == 0)
 			return p[i];
 	return 0;
 }
-- 
2.11.0

Re: [PATCH] fix lsearch and lfind to pass key as first arg to the compar callback

[Rich Felker]

On Sun, Mar 05, 2017 at 11:03:35PM +0100, Szabolcs Nagy wrote:
> this is not a conformance issue as posix does not specify the
> argument order, but the order is specified for bsearch and some
> systems document the order for lsearch consistently (openbsd).
> 
> since there were two indpendent reports of this issue it's better
> to use the more widely expected argument order.
> ---
> 
> in both reported cases upstream got fixed, but i think it
> is worth changing anyway.

Thanks. Committed and pushed.

Rich