Make --plugin-path optional

[babeltrace.git] / converter / babeltrace.c

diff --git a/converter/babeltrace.c b/converter/babeltrace.c
index 1c696545e92c35f176d5251e89797643b2a6692a..d6a9faa0d92b17600aee8c057efe76d3c073243b 100644 (file)
--- a/converter/babeltrace.c
+++ b/converter/babeltrace.c
@@ -67,7 +67,7 @@ void print_component_classes_found(struct bt_component_factory *factory)
 
        count = bt_component_factory_get_component_class_count(factory);
        if (count <= 0) {
-               fprintf(stderr, "No component classes found. Please make sure your plug-in search path is set correctly.");
+               fprintf(stderr, "No component classes found. Please make sure your plug-in search path is set correctly.\n");
                return;
        }
 
@@ -279,12 +279,6 @@ int main(int argc, char **argv)
 
        printf_verbose("Verbose mode active.\n");
        printf_debug("Debug mode active.\n");
-
-       if (bt_value_array_is_empty(cfg->plugin_paths)) {
-               fprintf(stderr, "No plugin path specified, aborting...\n");
-               ret = -1;
-               goto end;
-       }
        component_factory = bt_component_factory_create();
        if (!component_factory) {
                fprintf(stderr, "Failed to create component factory.\n");
@@ -292,13 +286,22 @@ int main(int argc, char **argv)
                goto end;
        }
 
-       first_plugin_path_value = bt_value_array_get(cfg->plugin_paths, 0);
-       bt_value_string_get(first_plugin_path_value, &first_plugin_path);
+       if (cfg->plugin_paths && !bt_value_array_is_empty(cfg->plugin_paths)) {
+               first_plugin_path_value = bt_value_array_get(
+                               cfg->plugin_paths, 0);
+               bt_value_string_get(first_plugin_path_value,
+                               &first_plugin_path);
+               ret = bt_component_factory_load_recursive(component_factory,
+                               first_plugin_path);
+               if (ret) {
+                       fprintf(stderr, "Failed to dynamically load plugins.\n");
+                       goto end;
+               }
+       }
 
-       ret = bt_component_factory_load_recursive(component_factory,
-                       first_plugin_path);
+       ret = bt_component_factory_load_static(component_factory);
        if (ret) {
-               fprintf(stderr, "Failed to load plugins.\n");
+               fprintf(stderr, "Failed to load static plugins.\n");
                goto end;
        }