Date: Tue, 9 Jun 2015 22:29:17 -0500
From: Bobby Bingham <koorogi@koorogi.info>
To: alpine-devel@lists.alpinelinux.org
Subject: [alpine-devel] [PATCH] Fix apk search --description
Message-ID: <20150610032917.GA5164@dora.lan>
Precedence: list
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="/WwmFnJnmDyWGHa4"
Content-Disposition: inline
User-Agent: Mutt/1.5.23 (2014-03-12)


--/WwmFnJnmDyWGHa4
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline

`apk search --description` doesn't work correctly, because the needle
and haystack arguments are swapped in a couple calls to strstr.  The
attached patch fixes this.
--
Bobby Bingham

--/WwmFnJnmDyWGHa4
Content-Type: text/plain; charset=utf-8
Content-Disposition: attachment; filename="search-description.patch"
Content-Transfer-Encoding: quoted-printable

commit 2d168068969cecbe65c722673fb9a9ffe2cdf6f3
Author: Bobby Bingham <koorogi@koorogi.info>
Date:   Tue Jun 9 22:03:27 2015 -0500

    search: fix swapped needle and haystack

diff --git a/src/search.c b/src/search.c
index 47339fd..5833325 100644
--- a/src/search.c
+++ b/src/search.c
@@ -122,8 +122,8 @@ static void print_result_pkg(struct search_ctx *ctx, st=
ruct apk_package *pkg)
=20
 	if (ctx->search_description) {
 		foreach_array_item(pmatch, ctx->filter) {
-			if (strstr(*pmatch, pkg->description) !=3D NULL ||
-			    strstr(*pmatch, pkg->name->name) !=3D NULL)
+			if (strstr(pkg->description, *pmatch) !=3D NULL ||
+			    strstr(pkg->name->name, *pmatch) !=3D NULL)
 				goto match;
 		}
 		return;

--/WwmFnJnmDyWGHa4--


---
Unsubscribe:  alpine-devel+unsubscribe@lists.alpinelinux.org
Help:         alpine-devel+help@lists.alpinelinux.org
---