aboutsummaryrefslogtreecommitdiff
path: root/src/cli/stasis/stasis_main.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/cli/stasis/stasis_main.c')
-rw-r--r--src/cli/stasis/stasis_main.c23
1 files changed, 6 insertions, 17 deletions
diff --git a/src/cli/stasis/stasis_main.c b/src/cli/stasis/stasis_main.c
index e660f6b..c5c1f00 100644
--- a/src/cli/stasis/stasis_main.c
+++ b/src/cli/stasis/stasis_main.c
@@ -176,7 +176,7 @@ static void setup_conda(struct Delivery *ctx, char *installer_url, const size_t
delivery_install_conda(ctx->conda.installer_path, ctx->storage.conda_install_prefix);
msg(STASIS_MSG_L2, "Configuring: %s\n", ctx->storage.conda_install_prefix);
- delivery_conda_enable(ctx, ctx->storage.conda_install_prefix);
+ delivery_conda_enable(ctx);
}
static void configure_conda_base(struct Delivery *ctx, char *envs[]) {
@@ -521,32 +521,21 @@ static void transfer_artifacts(struct Delivery *ctx) {
}
}
-int main(int argc, char *argv[]) {
- struct Delivery ctx;
- struct Process proc = {
- .f_stdout = "",
- .f_stderr = "",
- .redirect_stderr = 0,
- };
+int main(const int argc, char *argv[]) {
+ struct Delivery ctx = {0};
+
char env_name[STASIS_NAME_MAX] = {0};
char env_name_testing[STASIS_NAME_MAX] = {0};
char *delivery_input = NULL;
char *config_input = NULL;
- char installer_url[PATH_MAX];
- char python_override_version[STASIS_NAME_MAX];
+ char installer_url[PATH_MAX] = {0};
+ char python_override_version[STASIS_NAME_MAX] = {0};
int user_disabled_docker = false;
globals.cpu_limit = get_cpu_count();
if (globals.cpu_limit > 1) {
globals.cpu_limit--; // max - 1
}
- memset(env_name, 0, sizeof(env_name));
- memset(env_name_testing, 0, sizeof(env_name_testing));
- memset(installer_url, 0, sizeof(installer_url));
- memset(python_override_version, 0, sizeof(python_override_version));
- memset(&proc, 0, sizeof(proc));
- memset(&ctx, 0, sizeof(ctx));
-
setup_sysconfdir();
int c;