Split public and private API in accordance with issue #34

This removes some of the evil globals and double assignments, and makes it
clearer who can access what, as well as nuking the mixed usage of "self->"
vs "instance." which made things altogether more confusing.

Signed-off-by: Ikey Doherty <[email protected]>

Author: Ikey Doherty

src/main.c

@@ -35,9 +35,13 @@
 
 #include "plugin-manager.h"
 
+typedef struct CveToolInstance {
+        CveCheckTool shared;              /*<Public exposed data */
+        CvePlugin *pkg_plugin;            /*<Our current plugin */
+} CveToolInstance;
 
 static CveCheckTool *self;
-static CvePlugin *pkg_plugin;
+static CveToolInstance *self_priv;
 
 static char *srpm_dir = NULL;
 
@@ -54,6 +58,7 @@ static inline void package_free(void *p)
                 return;
         }
         struct source_package_t *t = p;
+        CvePlugin *pkg_plugin = self_priv->pkg_plugin;
 
         if (t->extra && pkg_plugin && pkg_plugin->free_package) {
                 pkg_plugin->free_package(t);
@@ -85,6 +90,7 @@ static void cve_add_package_internal(struct source_package_t *pkg)
         GList *issues = NULL, *em = NULL;
         gchar *cur_id = NULL;
         gchar *q = NULL;
+        CvePlugin *pkg_plugin = self_priv->pkg_plugin;
 
         if (!pkg) {
                 return;
@@ -237,6 +243,7 @@ static bool load_faux(const char *path)
 static void cve_add_package(const char *path)
 {
         struct source_package_t *pkg = NULL;
+        CvePlugin *pkg_plugin = self_priv->pkg_plugin;
 
         if (pkg_plugin->scan_package) {
                 pkg = pkg_plugin->scan_package(path);
@@ -406,6 +413,7 @@ static bool cve_locate(const char *path, bool recurse)
         bool ret = false;
         DIR *dir = NULL;
         struct dirent *ent = NULL;
+        CvePlugin *pkg_plugin = self_priv->pkg_plugin;
 
         if (!pkg_plugin || !(pkg_plugin->flags & PLUGIN_TYPE_PACKAGE) || !pkg_plugin->is_package) {
                 fprintf(stderr, "Abnormal configuration in plugin\n");
@@ -461,15 +469,20 @@ int main(int argc, char **argv)
         autofree(CveDB) *cve_db = NULL;
         GList *pkg_plugins = NULL;
         int ret = EXIT_FAILURE;
-        CveCheckTool instance = { 0 };
-        instance.modified = -1;
+        CveToolInstance instance = { 0 };
         time_t ti;
         CvePlugin *report = NULL;
         CvePlugin *package = NULL;
         LIBXML_TEST_VERSION
         bool quiet, db_locked;
 
-        self = &instance;
+        /* Public API, shared with Plugins */
+        self = &instance.shared;
+        /* Private API, only for our own operations */
+        self_priv = &instance;
+
+        self->modified = -1;
+
         context = g_option_context_new(" - cve check tool");
         g_option_context_add_main_entries(context, _entries, NULL);
         if (!g_option_context_parse(context, &argc, &argv, &error)) {
@@ -558,8 +571,9 @@ int main(int argc, char **argv)
                         /* Print a list of 'em */
                         autofree(gchar) *list = supported_packages(pkg_plugins);
                         printf("Currently supported package types: %s\n", list);
+                        goto cleanup;
                 } else {
-                        pkg_plugin = package = cve_plugin_get_by_name(forced_type);
+                        package = cve_plugin_get_by_name(forced_type);
                         if (!package) {
                                 fprintf(stderr, "Plugin \'%s\' not found.\n", forced_type);
                                 goto cleanup;
@@ -569,6 +583,7 @@ int main(int argc, char **argv)
                                 package = NULL;
                                 goto cleanup;
                         }
+                        self_priv->pkg_plugin = package;
                 }
         }
 
@@ -619,7 +634,10 @@ int main(int argc, char **argv)
         }
 
         if (!forced_type) {
-                pkg_plugin = package = plugin_for_path(pkg_plugins, target->str, false);
+                package = plugin_for_path(pkg_plugins, target->str, false);
+                if (package) {
+                        self_priv->pkg_plugin = package;
+                }
         }
 
         if (modified_stamp) {
@@ -628,13 +646,13 @@ int main(int argc, char **argv)
                         fprintf(stderr, "Invalid date\n");
                         goto cleanup;
                 }
-                instance.modified = (int64_t)ti;
+                self->modified = (int64_t)ti;
         }
 
         self->hide_patched = hide_patched;
         self->show_unaffected = show_unaffected;
-        instance.db = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, package_free);
-        instance.bdb = NULL;
+        self->db = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, package_free);
+        self->bdb = NULL;
 
         if (is_package_list(target)) {
                 /* Packages file */
@@ -722,7 +740,7 @@ int main(int argc, char **argv)
                                         free(buf);
                                         goto cleanup;
                                 }
-                                pkg_plugin = package;
+                                self_priv->pkg_plugin = package;
                         }
                         cve_locate(path, false);
 clean:
@@ -739,7 +757,7 @@ int main(int argc, char **argv)
                         fprintf(stderr, "Unsupported package type\n");
                         goto cleanup;
                 }
-                pkg_plugin = package;
+                self_priv->pkg_plugin = package;
                 if (cve_is_dir(target->str)) {
                         cve_locate(target->str, true);
                 } else {
@@ -787,8 +805,8 @@ int main(int argc, char **argv)
         if (pkg_plugins) {
                 g_list_free(pkg_plugins);
         }
-        if (instance.db) {
-                g_hash_table_unref(instance.db);
+        if (self->db) {
+                g_hash_table_unref(self->db);
         }
         if (self->bdb) {
                 g_hash_table_unref(self->bdb);