teldra/vp-build
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

xbps-repo: added shell style match patterns for the 'search' target.

Browse Source 
So you can do you now:

$ xbps-repo search '*'

and it will list all registered packages.

--HG--
extra : convert_revision : d65edb4be6a0d815410d215774acf9ebeb23fa49
This commit is contained in:
Juan RP 2009-04-09 13:14:30 +02:00
parent 1a26816aa3
commit ecd5d55f17
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bin/xbps-repo/main.c
View File

@ -251,7 +251,10 @@ main(int argc, char **argv)
}
} else if (strcasecmp(argv[0], "search") == 0) {
/* Search for a package by looking at short_desc. */
/*
* Search for a package by looking at pkgname/short_desc
* by using shell style match patterns (fnmatch(3)).
*/
if (argc != 2)
usage();

12
bin/xbps-repo/util.c
View File

@ -28,6 +28,7 @@
#include <stdlib.h>
#include <string.h>
#include <errno.h>
#include <fnmatch.h>
#include <limits.h>
#include <prop/proplib.h>
@ -146,7 +147,6 @@ search_string_in_pkgs(prop_object_t obj, void *arg, bool *loop_done)
const char *repofile;
char *plist;
(void)arg;
(void)loop_done;
assert(prop_object_type(obj) == PROP_TYPE_STRING);
@ -335,21 +335,21 @@ show_pkg_info_from_repolist(prop_object_t obj, void *arg, bool *loop_done)
static int
show_pkg_namedesc(prop_object_t obj, void *arg, bool *loop_done)
{
const char *pkgname, *desc, *ver, *string = arg;
const char *pkgname, *desc, *ver, *pattern = arg;
(void)arg;
(void)loop_done;
assert(prop_object_type(obj) == PROP_TYPE_DICTIONARY);
assert(string != NULL);
assert(pattern != NULL);
prop_dictionary_get_cstring_nocopy(obj, "pkgname", &pkgname);
prop_dictionary_get_cstring_nocopy(obj, "short_desc", &desc);
prop_dictionary_get_cstring_nocopy(obj, "version", &ver);
assert(ver != NULL);
if ((strstr(pkgname, string) || strstr(desc, string)))
printf(" %s-%s - %s\n", pkgname, ver, desc);
if ((fnmatch(pattern, pkgname, 0) == 0) ||
(fnmatch(pattern, desc, 0) == 0))
printf(" %s-%s - %s\n", pkgname, ver, desc);
return 0;
}