cli: search: Upgrade to the new parser

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/cli/lib/search.c b/src/cli/lib/search.c
index faf6adb9cfffdafacaa18395d9f123f9c17c739c..840ec2ebb96f005ef20e997402fb23e81685a374 100644 (file)
--- a/src/cli/lib/search.c
+++ b/src/cli/lib/search.c
@@ -18,23 +18,71 @@
 #                                                                             #
 #############################################################################*/
 
+#include <argp.h>
+
 #include <pakfire/pakfire.h>
 
+#include "command.h"
 #include "dump.h"
+#include "pakfire.h"
 #include "search.h"
 
-int cli_search(struct pakfire* pakfire, int argc, char* argv[]) {
+static const char* args_doc = "PATTERNS...";
+
+static const char* doc = "Search for packages";
+
+#define MAX_PATTERNS 256
+
+struct config {
+       char* patterns[MAX_PATTERNS];
+       unsigned int num_patterns;
+};
+
+static error_t parse(int key, char* arg, void* data) {
+       struct config* config = data;
+
+       switch (key) {
+               case ARGP_KEY_ARG:
+                       if (config->num_patterns >= MAX_PATTERNS)
+                               return -ENOBUFS;
+
+                       config->patterns[config->num_patterns++] = arg;
+                       break;
+
+               default:
+                       return ARGP_ERR_UNKNOWN;
+       }
+
+       return 0;
+}
+
+int cli_search(void* data, int argc, char* argv[]) {
+       struct pakfire* pakfire = NULL;
        struct pakfire_packagelist* list = NULL;
        int r;
 
+       struct cli_config* cli_config = data;
+
+       struct config config = {};
+
+       // Parse the command line
+       r = cli_parse(NULL, NULL, args_doc, doc, parse, argc, argv, &config);
+       if (r)
+               goto ERROR;
+
+       // Setup pakfire
+       r = cli_setup_pakfire(&pakfire, cli_config);
+       if (r)
+               goto ERROR;
+
        // Allocate a new packagelist
        r = pakfire_packagelist_create(&list, pakfire);
        if (r)
                goto ERROR;
 
        // Perform search
-       for (int i = 0; i < argc; i++) {
-               r = pakfire_search(pakfire, argv[i], 0, list);
+       for (unsigned int i = 0; i < config.num_patterns; i++) {
+               r = pakfire_search(pakfire, config.patterns[i], 0, list);
                if (r)
                        goto ERROR;
        }
@@ -45,6 +93,8 @@ int cli_search(struct pakfire* pakfire, int argc, char* argv[]) {
 ERROR:
        if (list)
                pakfire_packagelist_unref(list);
+       if (pakfire)
+               pakfire_unref(pakfire);
 
        return r;
 }

diff --git a/src/cli/lib/search.h b/src/cli/lib/search.h
index 5e9eef466df253b6933ac7c86ef832cd63b56bd8..a6c74d787a664b4cf401b99e8ae4e3bf86c5b723 100644 (file)
--- a/src/cli/lib/search.h
+++ b/src/cli/lib/search.h
@@ -21,8 +21,6 @@
 #ifndef PAKFIRE_CLI_SEARCH_H
 #define PAKFIRE_CLI_SEARCH_H
 
-#include <pakfire/pakfire.h>
-
-int cli_search(struct pakfire* pakfire, int argc, char* argv[]);
+int cli_search(void* data, int argc, char* argv[]);
 
 #endif /* PAKFIRE_CLI_SEARCH_H */

diff --git a/src/cli/pakfire-builder.c b/src/cli/pakfire-builder.c
index 51277fd1c7b269ebc1d6d6191d79362349c7d2a3..a7b8f7df42640cd42fbcf7723c745248ae69e7a1 100644 (file)
--- a/src/cli/pakfire-builder.c
+++ b/src/cli/pakfire-builder.c
@@ -69,13 +69,13 @@ static const struct command commands[] = {
        { "dist",     cli_dist,   1, -1, 0 },
        { "image",    cli_image, -1, -1, 0 },
        { "info",     cli_info,   1, -1, 0 },
+       { "search",   cli_search, 1, -1, 0 },
 #if 0
        { "provides", 0, cli_provides },
        { "repo",     0, cli_repo },
        { "repolist", 0, cli_repolist },
        { "requires", 0, cli_requires },
        { "shell",    0, cli_shell },
-       { "search",   0, cli_search },
 #endif
        { NULL },
 };