Merge pull request #208 from bdrewery/pkg-rquery
modified libpkg/pkg.h
@@ -102,7 +102,11 @@ typedef enum {
|
|
|
|
|
|
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -640,8 +644,8 @@ int pkgdb_unregister_pkg(struct pkgdb *pkg, const char *origin);
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
modified libpkg/pkgdb.c
@@ -135,6 +135,41 @@ load_val(sqlite3 *db, struct pkg *pkg, const char *sql, int flags, int (*pkg_add
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -775,19 +810,15 @@ pkgdb_it_free(struct pkgdb_it *it)
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
| - | |
| - | |
| - | |
|
|
| + | |
|
|
| - | |
| - | |
| - | |
| - | |
| + | |
|
|
| + | |
|
|
|
|
|
@@ -821,49 +852,72 @@ pkgdb_query(struct pkgdb *db, const char *pattern, match_t match)
|
|
|
|
|
|
| + | |
| + | |
| + | |
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
|
|
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
|
|
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
| + | |
|
|
|
|
| - | |
| + | |
| + | |
| + | |
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
|
|
|
|
|
|
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -966,16 +1020,16 @@ pkgdb_load_deps(struct pkgdb *db, struct pkg *pkg)
|
|
|
|
|
|
| - | |
| + | |
| + | |
|
|
| - | |
| + | |
| + | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
| - | |
| - | |
| - | |
|
|
|
|
|
@@ -1005,18 +1059,26 @@ pkgdb_load_rdeps(struct pkgdb *db, struct pkg *pkg)
|
|
|
|
|
|
| - | |
| + | |
| + | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
| - | |
|
|
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -1093,6 +1155,7 @@ pkgdb_load_dirs(struct pkgdb *db, struct pkg *pkg)
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -1135,6 +1198,7 @@ pkgdb_load_license(struct pkgdb *db, struct pkg *pkg)
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -1158,6 +1222,7 @@ pkgdb_load_category(struct pkgdb *db, struct pkg *pkg)
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -1181,6 +1246,7 @@ pkgdb_load_user(struct pkgdb *db, struct pkg *pkg)
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -1210,6 +1276,7 @@ pkgdb_load_group(struct pkgdb *db, struct pkg *pkg)
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -1238,6 +1305,7 @@ pkgdb_load_shlib(struct pkgdb *db, struct pkg *pkg)
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -1302,6 +1370,7 @@ pkgdb_load_options(struct pkgdb *db, struct pkg *pkg)
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -2161,7 +2230,6 @@ pkgdb_query_newpkgversion(struct pkgdb *db, const char *repo)
|
|
|
|
|
|
| - | |
|
|
|
|
|
@@ -2178,32 +2246,12 @@ pkgdb_query_newpkgversion(struct pkgdb *db, const char *repo)
|
|
|
|
|
|
| + | |
|
|
| - | |
| - | |
| + | |
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
|
|
|
|
|
@@ -2242,7 +2290,6 @@ pkgdb_query_installs(struct pkgdb *db, match_t match, int nbpkgs, char **pkgs, c
|
|
|
|
|
|
| - | |
|
|
|
|
|
@@ -2275,51 +2322,15 @@ pkgdb_query_installs(struct pkgdb *db, match_t match, int nbpkgs, char **pkgs, c
|
|
|
|
|
|
| + | |
|
|
| - | |
| - | |
| + | |
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
|
|
|
|
|
@@ -2399,7 +2410,6 @@ pkgdb_query_upgrades(struct pkgdb *db, const char *repo, bool all)
|
|
|
|
|
|
| - | |
|
|
|
|
|
@@ -2408,11 +2418,7 @@ pkgdb_query_upgrades(struct pkgdb *db, const char *repo, bool all)
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
|
|
|
|
|
@@ -2459,24 +2465,8 @@ pkgdb_query_upgrades(struct pkgdb *db, const char *repo, bool all)
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -2528,14 +2518,9 @@ pkgdb_query_downgrades(struct pkgdb *db, const char *repo)
|
|
|
|
|
|
| - | |
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
|
|
|
|
|
@@ -2547,24 +2532,8 @@ pkgdb_query_downgrades(struct pkgdb *db, const char *repo)
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -2632,23 +2601,7 @@ pkgdb_query_delete(struct pkgdb *db, match_t match, int nbpkgs, char **pkgs, int
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
|
|
|
|
|
@@ -2703,29 +2656,71 @@ pkgdb_query_delete(struct pkgdb *db, match_t match, int nbpkgs, char **pkgs, int
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
|
|
|
|
|
@@ -2755,7 +2750,7 @@ pkgdb_rquery_build_search_query(struct sbuf *sql, match_t match, unsigned int fi
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -2772,12 +2767,10 @@ pkgdb_rquery(struct pkgdb *db, const char *pattern, match_t match, unsigned int
|
|
|
|
|
|
| + | |
|
|
| + | |
|
|
| - | |
| - | |
| - | |
| - | |
|
|
|
|
|
@@ -2807,19 +2800,18 @@ pkgdb_rquery(struct pkgdb *db, const char *pattern, match_t match, unsigned int
|
|
|
|
|
|
| - | |
| - | |
|
|
|
|
|
|
|
|
|
|
|
|
| - | |
| - | |
| - | |
|
|
|
|
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -3060,7 +3052,6 @@ pkgdb_query_fetch(struct pkgdb *db, match_t match, int nbpkgs, char **pkgs, cons
|
|
|
|
|
|
| - | |
|
|
|
|
|
@@ -3082,51 +3073,15 @@ pkgdb_query_fetch(struct pkgdb *db, match_t match, int nbpkgs, char **pkgs, cons
|
|
|
|
|
|
| + | |
|
|
| - | |
| - | |
| + | |
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
|
|
|
|
|
modified pkg/Makefile
@@ -15,6 +15,7 @@ SRCS= add.c \
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -64,6 +65,7 @@ MAN= pkg.8 \
|
|
|
|
|
|
| + | |
|
|
|
|
|
modified pkg/clean.c
@@ -93,7 +93,7 @@ exec_clean(int argc, char **argv)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified pkg/main.c
@@ -77,6 +77,7 @@ static struct commands {
|
|
|
|
|
|
| + | |
|
|
|
|
|
modified pkg/pkg-add.8
@@ -69,6 +69,7 @@ See
|
|
|
|
|
|
| + | |
|
|
|
|
|
modified pkg/pkg-audit.8
@@ -79,6 +79,7 @@ See
|
|
|
|
|
|
| + | |
|
|
|
|
|
modified pkg/pkg-autoremove.8
@@ -66,6 +66,7 @@ See
|
|
|
|
|
|
| + | |
|
|
|
|
|
modified pkg/pkg-backup.8
@@ -76,6 +76,7 @@ See
|
|
|
|
|
|
| + | |
|
|
|
|
|
modified pkg/pkg-check.8
@@ -95,6 +95,7 @@ See
|
|
|
|
|
|
| + | |
|
|
|
|
|
modified pkg/pkg-clean.8
@@ -55,6 +55,7 @@ See
|
|
|
|
|
|
| + | |
|
|
|
|
|
modified pkg/pkg-create.8
@@ -207,6 +207,7 @@ See
|
|
|
|
|
|
| + | |
|
|
|
|
|
modified pkg/pkg-delete.8
@@ -79,6 +79,7 @@ See
|
|
|
|
|
|
| + | |
|
|
|
|
|
modified pkg/pkg-fetch.8
@@ -90,6 +90,7 @@ See
|
|
|
|
|
|
| + | |
|
|
|
|
|
modified pkg/pkg-info.8
@@ -131,6 +131,7 @@ See
|
|
|
|
|
|
| + | |
|
|
|
|
|
modified pkg/pkg-install.8
@@ -106,6 +106,7 @@ See
|
|
|
|
|
|
| + | |
|
|
|
|
|
modified pkg/pkg-query.8
@@ -220,6 +220,7 @@ See
|
|
|
|
|
|
| + | |
|
|
|
|
|
modified pkg/pkg-register.8
@@ -84,6 +84,7 @@ See
|
|
|
|
|
|
| + | |
|
|
|
|
|
modified pkg/pkg-repo.8
@@ -74,6 +74,7 @@ See
|
|
|
|
|
|
| + | |
|
|
|
|
|
added pkg/pkg-rquery.8
@@ -0,0 +1,213 @@
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
modified pkg/pkg-search.8
@@ -117,6 +117,7 @@ See
|
|
|
|
|
|
| + | |
|
|
|
|
|
modified pkg/pkg-set.8
@@ -68,6 +68,7 @@ See
|
|
|
|
|
|
| + | |
|
|
|
|
|
modified pkg/pkg-shell.8
@@ -54,6 +54,7 @@ See
|
|
|
|
|
|
| + | |
|
|
|
|
|
modified pkg/pkg-shlib.8
@@ -66,6 +66,7 @@ See
|
|
|
|
|
|
| + | |
|
|
|
|
|
modified pkg/pkg-update.8
@@ -74,6 +74,7 @@ See
|
|
|
|
|
|
| + | |
|
|
|
|
|
modified pkg/pkg-updating.8
@@ -91,6 +91,7 @@ See
|
|
|
|
|
|
| + | |
|
|
|
|
|
modified pkg/pkg-upgrade.8
@@ -79,6 +79,7 @@ See
|
|
|
|
|
|
| + | |
|
|
|
|
|
modified pkg/pkg-version.8
@@ -116,6 +116,7 @@ See
|
|
|
|
|
|
| + | |
|
|
|
|
|
modified pkg/pkg-which.8
@@ -66,6 +66,7 @@ See
|
|
|
|
|
|
| + | |
|
|
|
|
|
modified pkg/pkg.8
@@ -103,6 +103,8 @@ Create a local package repository for remote usage.
|
|
|
|
|
|
| + | |
| + | |
|
|
|
|
|
@@ -149,6 +151,7 @@ See
|
|
|
|
|
|
| + | |
|
|
|
|
|
modified pkg/pkg.conf.5
@@ -123,6 +123,7 @@ file always overrides the value of an option set in the file.
|
|
|
|
|
|
| + | |
|
|
|
|
|
modified pkg/pkgcli.h
@@ -82,6 +82,10 @@ int exec_register(int argc, char **argv);
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -155,4 +159,30 @@ void print_jobs_summary(struct pkg_jobs *j, pkg_jobs_t type, const char *msg, ..
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
modified pkg/query.c
@@ -40,12 +40,7 @@
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
|
|
|
|
|
@@ -73,20 +68,6 @@ static struct query_flags {
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
|
|
|
|
|
@@ -118,6 +99,11 @@ format_str(struct pkg *pkg, struct sbuf *dest, const char *qstr, void *data)
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -305,7 +291,7 @@ format_str(struct pkg *pkg, struct sbuf *dest, const char *qstr, void *data)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -395,10 +381,11 @@ print_query(struct pkg *pkg, char *qstr, char multiline)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -582,8 +569,8 @@ format_sql_condition(const char *str, struct sbuf *sqlcond)
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -596,7 +583,7 @@ analyse_query_string(char *qstr, int *flags, char *multiline)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -638,7 +625,7 @@ analyse_query_string(char *qstr, int *flags, char *multiline)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -690,6 +677,7 @@ exec_query(int argc, char **argv)
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -709,6 +697,7 @@ exec_query(int argc, char **argv)
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -730,7 +719,7 @@ exec_query(int argc, char **argv)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -747,6 +736,7 @@ exec_query(int argc, char **argv)
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -761,24 +751,11 @@ exec_query(int argc, char **argv)
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
added pkg/rquery.c
@@ -0,0 +1,195 @@
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
modified pkg/search.c
@@ -122,7 +122,7 @@ exec_search(int argc, char **argv)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|