autodisc: make it possible to interrupt auto source discovery

[babeltrace.git] / src / cli / babeltrace2-cfg-cli-args-default.c

diff --git a/src/cli/babeltrace2-cfg-cli-args-default.c b/src/cli/babeltrace2-cfg-cli-args-default.c
index b73457a2a869222b06fb1cbcc755680145bf6541..3db3604203a29b449801b5115f461fb9d431142d 100644 (file)
--- a/src/cli/babeltrace2-cfg-cli-args-default.c
+++ b/src/cli/babeltrace2-cfg-cli-args-default.c
@@ -21,6 +21,8 @@
  * SOFTWARE.
  */
 
+#include <glib.h>
+
 #include <babeltrace2/babeltrace.h>
 #include "babeltrace2-cfg.h"
 #include "babeltrace2-cfg-cli-args.h"
@@ -35,7 +37,8 @@
 #ifdef BT_SET_DEFAULT_IN_TREE_CONFIGURATION
 
 struct bt_config *bt_config_cli_args_create_with_default(int argc,
-               const char *argv[], int *retcode)
+               const char *argv[], int *retcode,
+               const bt_interrupter *interrupter)
 {
        bt_value *initial_plugin_paths;
        struct bt_config *cfg = NULL;
@@ -58,18 +61,18 @@ struct bt_config *bt_config_cli_args_create_with_default(int argc,
         * plugin provider, if the env variable is already set, do not overwrite
         * it.
         */
-       setenv("LIBBABELTRACE2_PLUGIN_PROVIDER_DIR", CONFIG_IN_TREE_PROVIDER_DIR, 0);
+       g_setenv("LIBBABELTRACE2_PLUGIN_PROVIDER_DIR", CONFIG_IN_TREE_PROVIDER_DIR, 0);
 #else
        /*
         * If the Pyhton plugin provider is disabled, use a non-exitent path to avoid
         * loading the system installed provider if it exit, if the env variable is
         * already set, do not overwrite it.
         */
-       setenv("LIBBABELTRACE2_PLUGIN_PROVIDER_DIR", "/nonexistent", 0);
+       g_setenv("LIBBABELTRACE2_PLUGIN_PROVIDER_DIR", "/nonexistent", 0);
 #endif
 
        cfg = bt_config_cli_args_create(argc, argv, retcode, true, true,
-               initial_plugin_paths);
+               initial_plugin_paths, interrupter);
        goto end;
 
 error:
@@ -84,10 +87,11 @@ end:
 #else /* BT_SET_DEFAULT_IN_TREE_CONFIGURATION */
 
 struct bt_config *bt_config_cli_args_create_with_default(int argc,
-               const char *argv[], int *retcode)
+               const char *argv[], int *retcode,
+               const bt_interrupter *interrupter)
 {
        return bt_config_cli_args_create(argc, argv, retcode, false, false,
-               NULL);
+               NULL, interrupter);
 }
 
 #endif /* BT_SET_DEFAULT_IN_TREE_CONFIGURATION */