bin/xbps-query: refactor search

Author: Duncaen

bin/xbps-query/defs.h

@@ -64,7 +64,9 @@ int	list_pkgs_pkgdb(struct xbps_handle *);
 int	repo_list(struct xbps_handle *);
 
 /* from search.c */
-int	search(struct xbps_handle *, bool, const char *, const char *, bool);
-
+int search(
+    struct xbps_handle *xhp, bool repo_mode, const char *pattern, bool regex);
+int search_prop(struct xbps_handle *xhp, bool repo_mode, const char *prop,
+    const char *pattern, bool regex);
 
 #endif /* !_XBPS_QUERY_DEFS_H_ */

bin/xbps-query/main.c

@@ -301,7 +301,10 @@ main(int argc, char **argv)
 
 	} else if (pkg_search) {
 		/* search mode */
-		rv = search(&xh, repo_mode, pkg, props, regex);
+		if (props)
+			rv = search_prop(&xh, repo_mode, pkg, props, regex);
+		else
+			rv = search(&xh, repo_mode, pkg, regex);
 
 	} else if (catfile) {
 		/* repo cat file mode */