emo/xbps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xbps-repo: the 'search' target now accepts multiple patterns as arguments.

Browse Source
This commit is contained in:
Juan RP
2011-12-22 09:33:54 +01:00
parent 5a892023f4
commit 13331f801c
8 changed files with 75 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
bin/xbps-repo/show.c
View File

@ -23,6 +23,14 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifdef HAVE_STRCASESTR
# define _GNU_SOURCE /* for strcasestr(3) */
#endif
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <stdio.h>
#include <stdbool.h>
#include <stdlib.h>
@ -36,10 +44,6 @@
#include "../xbps-bin/defs.h"
#include "defs.h"
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
int
show_pkg_info_from_repolist(const char *pkgname, const char *option)
{
@ -85,3 +89,42 @@ show_pkg_deps_from_repolist(const char *pkgname)
prop_object_release(pkgd);
return 0;
}
int
show_pkg_namedesc(prop_object_t obj, void *arg, bool *loop_done)
{
struct repo_search_data *rsd = arg;
const char *pkgver, *pkgname, *desc;
char *tmp = NULL;
size_t i, x;
(void)loop_done;
assert(prop_object_type(obj) == PROP_TYPE_DICTIONARY);
assert(rsd->patterns != NULL);
prop_dictionary_get_cstring_nocopy(obj, "pkgname", &pkgname);
prop_dictionary_get_cstring_nocopy(obj, "pkgver", &pkgver);
prop_dictionary_get_cstring_nocopy(obj, "short_desc", &desc);
for (i = 1; i < (size_t)rsd->npatterns; i++) {
if ((xbps_pkgpattern_match(pkgver, rsd->patterns[i]) == 1) ||
(xbps_pkgpattern_match(desc, rsd->patterns[i]) == 1) ||
(strcasecmp(pkgname, rsd->patterns[i]) == 0) ||
(strcasestr(pkgver, rsd->patterns[i])) ||
(strcasestr(desc, rsd->patterns[i]))) {
tmp = calloc(1, rsd->pkgver_len + 1);
if (tmp == NULL)
return errno;
strlcpy(tmp, pkgver, rsd->pkgver_len + 1);
for (x = strlen(tmp); x < rsd->pkgver_len; x++)
tmp[x] = ' ';
printf(" %s %s\n", tmp, desc);
free(tmp);
}
}
return 0;
}