From cd49ddb22c62f84e14abaa02e11f41a318ea341e Mon Sep 17 00:00:00 2001 From: Adam JOLY Date: Fri, 10 May 2024 11:10:17 +0200 Subject: [PATCH] =?UTF-8?q?=E3=80=8C=F0=9F=94=A8=E3=80=8D=20fix:=20rm=20me?= =?UTF-8?q?rge=20files?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/env/env_cmd.c | 2 +- src/env/env_cmd.c.orig | 166 ------------------------------- src/env/env_cmd_BACKUP_1565069.c | 166 ------------------------------- src/env/env_cmd_BACKUP_1565172.c | 166 ------------------------------- src/env/env_cmd_BASE_1565069.c | 162 ------------------------------ src/env/env_cmd_BASE_1565172.c | 162 ------------------------------ src/env/env_cmd_LOCAL_1565069.c | 162 ------------------------------ src/env/env_cmd_LOCAL_1565172.c | 162 ------------------------------ src/env/env_cmd_REMOTE_1565069.c | 162 ------------------------------ src/env/env_cmd_REMOTE_1565172.c | 162 ------------------------------ src/main.c | 4 +- 11 files changed, 3 insertions(+), 1473 deletions(-) delete mode 100644 src/env/env_cmd.c.orig delete mode 100644 src/env/env_cmd_BACKUP_1565069.c delete mode 100644 src/env/env_cmd_BACKUP_1565172.c delete mode 100644 src/env/env_cmd_BASE_1565069.c delete mode 100644 src/env/env_cmd_BASE_1565172.c delete mode 100644 src/env/env_cmd_LOCAL_1565069.c delete mode 100644 src/env/env_cmd_LOCAL_1565172.c delete mode 100644 src/env/env_cmd_REMOTE_1565069.c delete mode 100644 src/env/env_cmd_REMOTE_1565172.c diff --git a/src/env/env_cmd.c b/src/env/env_cmd.c index bfb63ed..04a5666 100644 --- a/src/env/env_cmd.c +++ b/src/env/env_cmd.c @@ -44,7 +44,7 @@ char **env_get(t_env *env) int env_create_first_el(char *env_line, t_env *env) { - t_env *new; +// t_env *new; char *name; char *content; diff --git a/src/env/env_cmd.c.orig b/src/env/env_cmd.c.orig deleted file mode 100644 index 224d576..0000000 --- a/src/env/env_cmd.c.orig +++ /dev/null @@ -1,166 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* env_cmd.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: mmoussou >>>>>> 3c66d20 (「✨」 feat: split pile started) -/* */ -/* ************************************************************************** */ - -#include "minishell.h" - -char **env_get(t_env *env) -{ - char **exec_env; - int i; - - exec_env = malloc(sizeof(char *) * (ft_envsize(env) + 1)); - if (!exec_env) - return (exec_env); - exec_env[ft_envsize(env)] = NULL; - i = 0; - while (env) - { - exec_env[i] = malloc(ft_strlen(env->name) - + ft_strlen(env->content) + 2); - if (!exec_env[i]) - { - ft_free("a", exec_env); - return (NULL); - } - ft_strlcpy(exec_env[i], env->name, ft_strlen(env->name) + 1); - exec_env[i][ft_strlen(env->name)] = '='; - ft_strlcpy(exec_env[i] + ft_strlen(env->name) + 1, - env->content, ft_strlen(env->content) + 1); - env = env->next; - i++; - } - return (exec_env); -} - -int env_create_first_el(char *env_line, t_env *env) -{ -// t_env *new; - char *name; - char *content; - - content = ft_strdup(ft_strchr(env_line, '=') + 1); - if (!content) - return (-1); - ft_strchr(env_line, '=')[0] = 0; - name = ft_strdup(env_line); - if (!name) - return (-1); - env->name = name; - env->content = content; - env->next = NULL; - return (0); -} - -t_env *env_create_el(char *env_line) -{ - t_env *new; - char *name; - char *content; - - content = ft_strdup(ft_strchr(env_line, '=') + 1); - if (!content) - return (NULL); - ft_strchr(env_line, '=')[0] = 0; - name = ft_strdup(env_line); - if (!name) - return (NULL); - new = ft_envnew(name, content); - return (new); -} - -int env_init(char **env_d, t_env *env) -{ - t_env *new; - int i; - char bool_first_el; - - i = 0; - bool_first_el = true; - while (env_d[i]) - { - if (bool_first_el) - i = env_create_first_el(env_d[i], env); - if (bool_first_el && i < 0) - return (1); - if (bool_first_el) - bool_first_el = false; - else - { - new = env_create_el(env_d[i]); - if (!new) - { - ft_envclear(&env, free); - return (1); - } - ft_envadd_back(&env, new); - } - i++; - } - return (0); -} - -int env_append(char *name, char *content, t_env *env) -{ - char *new_content; - - while (env && ft_strcmp(env->name, name)) - env = env->next; - if (!env) - return (-1); - new_content = ft_calloc(1, ft_strlen(env->content) + ft_strlen(content)); - ft_strlcpy(new_content, env->content, ft_strlen(env->content) + 1); - ft_strlcpy(new_content + ft_strlen(env->content), - content, ft_strlen(content) + 1); - free(env->content); - env->content = new_content; - return (0); -} - -int env_edit(char *name, char *content, t_env *env) -{ - while (env && ft_strcmp(env->name, name)) - env = env->next; - if (!env) - return (-1); - free(env->content); - env->content = content; - return (0); -} - -int env_delete(char *name, t_env *env) -{ -// char *new_content; - t_env *tmp; - - while (env && env->next && ft_strcmp(env->next->name, name)) - env = env->next; - if (!env || !env->next) - return (-1); - ft_free("cc", &env->next->name, &env->next->content); - tmp = env->next; - env->next = env->next->next; - free(tmp); - return (0); -} - -void env_print(t_env *env) -{ - while (env) - { - printf("%s:%s\n", env->name, env->content); - env = env->next; - } -} diff --git a/src/env/env_cmd_BACKUP_1565069.c b/src/env/env_cmd_BACKUP_1565069.c deleted file mode 100644 index 224d576..0000000 --- a/src/env/env_cmd_BACKUP_1565069.c +++ /dev/null @@ -1,166 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* env_cmd.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: mmoussou >>>>>> 3c66d20 (「✨」 feat: split pile started) -/* */ -/* ************************************************************************** */ - -#include "minishell.h" - -char **env_get(t_env *env) -{ - char **exec_env; - int i; - - exec_env = malloc(sizeof(char *) * (ft_envsize(env) + 1)); - if (!exec_env) - return (exec_env); - exec_env[ft_envsize(env)] = NULL; - i = 0; - while (env) - { - exec_env[i] = malloc(ft_strlen(env->name) - + ft_strlen(env->content) + 2); - if (!exec_env[i]) - { - ft_free("a", exec_env); - return (NULL); - } - ft_strlcpy(exec_env[i], env->name, ft_strlen(env->name) + 1); - exec_env[i][ft_strlen(env->name)] = '='; - ft_strlcpy(exec_env[i] + ft_strlen(env->name) + 1, - env->content, ft_strlen(env->content) + 1); - env = env->next; - i++; - } - return (exec_env); -} - -int env_create_first_el(char *env_line, t_env *env) -{ -// t_env *new; - char *name; - char *content; - - content = ft_strdup(ft_strchr(env_line, '=') + 1); - if (!content) - return (-1); - ft_strchr(env_line, '=')[0] = 0; - name = ft_strdup(env_line); - if (!name) - return (-1); - env->name = name; - env->content = content; - env->next = NULL; - return (0); -} - -t_env *env_create_el(char *env_line) -{ - t_env *new; - char *name; - char *content; - - content = ft_strdup(ft_strchr(env_line, '=') + 1); - if (!content) - return (NULL); - ft_strchr(env_line, '=')[0] = 0; - name = ft_strdup(env_line); - if (!name) - return (NULL); - new = ft_envnew(name, content); - return (new); -} - -int env_init(char **env_d, t_env *env) -{ - t_env *new; - int i; - char bool_first_el; - - i = 0; - bool_first_el = true; - while (env_d[i]) - { - if (bool_first_el) - i = env_create_first_el(env_d[i], env); - if (bool_first_el && i < 0) - return (1); - if (bool_first_el) - bool_first_el = false; - else - { - new = env_create_el(env_d[i]); - if (!new) - { - ft_envclear(&env, free); - return (1); - } - ft_envadd_back(&env, new); - } - i++; - } - return (0); -} - -int env_append(char *name, char *content, t_env *env) -{ - char *new_content; - - while (env && ft_strcmp(env->name, name)) - env = env->next; - if (!env) - return (-1); - new_content = ft_calloc(1, ft_strlen(env->content) + ft_strlen(content)); - ft_strlcpy(new_content, env->content, ft_strlen(env->content) + 1); - ft_strlcpy(new_content + ft_strlen(env->content), - content, ft_strlen(content) + 1); - free(env->content); - env->content = new_content; - return (0); -} - -int env_edit(char *name, char *content, t_env *env) -{ - while (env && ft_strcmp(env->name, name)) - env = env->next; - if (!env) - return (-1); - free(env->content); - env->content = content; - return (0); -} - -int env_delete(char *name, t_env *env) -{ -// char *new_content; - t_env *tmp; - - while (env && env->next && ft_strcmp(env->next->name, name)) - env = env->next; - if (!env || !env->next) - return (-1); - ft_free("cc", &env->next->name, &env->next->content); - tmp = env->next; - env->next = env->next->next; - free(tmp); - return (0); -} - -void env_print(t_env *env) -{ - while (env) - { - printf("%s:%s\n", env->name, env->content); - env = env->next; - } -} diff --git a/src/env/env_cmd_BACKUP_1565172.c b/src/env/env_cmd_BACKUP_1565172.c deleted file mode 100644 index 224d576..0000000 --- a/src/env/env_cmd_BACKUP_1565172.c +++ /dev/null @@ -1,166 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* env_cmd.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: mmoussou >>>>>> 3c66d20 (「✨」 feat: split pile started) -/* */ -/* ************************************************************************** */ - -#include "minishell.h" - -char **env_get(t_env *env) -{ - char **exec_env; - int i; - - exec_env = malloc(sizeof(char *) * (ft_envsize(env) + 1)); - if (!exec_env) - return (exec_env); - exec_env[ft_envsize(env)] = NULL; - i = 0; - while (env) - { - exec_env[i] = malloc(ft_strlen(env->name) - + ft_strlen(env->content) + 2); - if (!exec_env[i]) - { - ft_free("a", exec_env); - return (NULL); - } - ft_strlcpy(exec_env[i], env->name, ft_strlen(env->name) + 1); - exec_env[i][ft_strlen(env->name)] = '='; - ft_strlcpy(exec_env[i] + ft_strlen(env->name) + 1, - env->content, ft_strlen(env->content) + 1); - env = env->next; - i++; - } - return (exec_env); -} - -int env_create_first_el(char *env_line, t_env *env) -{ -// t_env *new; - char *name; - char *content; - - content = ft_strdup(ft_strchr(env_line, '=') + 1); - if (!content) - return (-1); - ft_strchr(env_line, '=')[0] = 0; - name = ft_strdup(env_line); - if (!name) - return (-1); - env->name = name; - env->content = content; - env->next = NULL; - return (0); -} - -t_env *env_create_el(char *env_line) -{ - t_env *new; - char *name; - char *content; - - content = ft_strdup(ft_strchr(env_line, '=') + 1); - if (!content) - return (NULL); - ft_strchr(env_line, '=')[0] = 0; - name = ft_strdup(env_line); - if (!name) - return (NULL); - new = ft_envnew(name, content); - return (new); -} - -int env_init(char **env_d, t_env *env) -{ - t_env *new; - int i; - char bool_first_el; - - i = 0; - bool_first_el = true; - while (env_d[i]) - { - if (bool_first_el) - i = env_create_first_el(env_d[i], env); - if (bool_first_el && i < 0) - return (1); - if (bool_first_el) - bool_first_el = false; - else - { - new = env_create_el(env_d[i]); - if (!new) - { - ft_envclear(&env, free); - return (1); - } - ft_envadd_back(&env, new); - } - i++; - } - return (0); -} - -int env_append(char *name, char *content, t_env *env) -{ - char *new_content; - - while (env && ft_strcmp(env->name, name)) - env = env->next; - if (!env) - return (-1); - new_content = ft_calloc(1, ft_strlen(env->content) + ft_strlen(content)); - ft_strlcpy(new_content, env->content, ft_strlen(env->content) + 1); - ft_strlcpy(new_content + ft_strlen(env->content), - content, ft_strlen(content) + 1); - free(env->content); - env->content = new_content; - return (0); -} - -int env_edit(char *name, char *content, t_env *env) -{ - while (env && ft_strcmp(env->name, name)) - env = env->next; - if (!env) - return (-1); - free(env->content); - env->content = content; - return (0); -} - -int env_delete(char *name, t_env *env) -{ -// char *new_content; - t_env *tmp; - - while (env && env->next && ft_strcmp(env->next->name, name)) - env = env->next; - if (!env || !env->next) - return (-1); - ft_free("cc", &env->next->name, &env->next->content); - tmp = env->next; - env->next = env->next->next; - free(tmp); - return (0); -} - -void env_print(t_env *env) -{ - while (env) - { - printf("%s:%s\n", env->name, env->content); - env = env->next; - } -} diff --git a/src/env/env_cmd_BASE_1565069.c b/src/env/env_cmd_BASE_1565069.c deleted file mode 100644 index 8bbbebc..0000000 --- a/src/env/env_cmd_BASE_1565069.c +++ /dev/null @@ -1,162 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* env_cmd.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: mmoussou name) - + ft_strlen(env->content) + 2); - if (!exec_env[i]) - { - ft_free("a", exec_env); - return (NULL); - } - ft_strlcpy(exec_env[i], env->name, ft_strlen(env->name) + 1); - exec_env[i][ft_strlen(env->name)] = '='; - ft_strlcpy(exec_env[i] + ft_strlen(env->name) + 1, - env->content, ft_strlen(env->content) + 1); - env = env->next; - i++; - } - return (exec_env); -} - -int env_create_first_el(char *env_line, t_env *env) -{ - t_env *new; - char *name; - char *content; - - content = ft_strdup(ft_strchr(env_line, '=') + 1); - if (!content) - return (-1); - ft_strchr(env_line, '=')[0] = 0; - name = ft_strdup(env_line); - if (!name) - return (-1); - env->name = name; - env->content = content; - env->next = NULL; - return (0); -} - -t_env *env_create_el(char *env_line) -{ - t_env *new; - char *name; - char *content; - - content = ft_strdup(ft_strchr(env_line, '=') + 1); - if (!content) - return (NULL); - ft_strchr(env_line, '=')[0] = 0; - name = ft_strdup(env_line); - if (!name) - return (NULL); - new = ft_envnew(name, content); - return (new); -} - -int env_init(char **env_d, t_env *env) -{ - t_env *new; - int i; - char bool_first_el; - - i = 0; - bool_first_el = true; - while (env_d[i]) - { - if (bool_first_el) - i = env_create_first_el(env_d[i], env); - if (bool_first_el && i < 0) - return (1); - if (bool_first_el) - bool_first_el = false; - else - { - new = env_create_el(env_d[i]); - if (!new) - { - ft_envclear(&env, free); - return (1); - } - ft_envadd_back(&env, new); - } - i++; - } - return (0); -} - -int env_append(char *name, char *content, t_env *env) -{ - char *new_content; - - while (env && ft_strcmp(env->name, name)) - env = env->next; - if (!env) - return (-1); - new_content = ft_calloc(1, ft_strlen(env->content) + ft_strlen(content)); - ft_strlcpy(new_content, env->content, ft_strlen(env->content) + 1); - ft_strlcpy(new_content + ft_strlen(env->content), - content, ft_strlen(content) + 1); - free(env->content); - env->content = new_content; - return (0); -} - -int env_edit(char *name, char *content, t_env *env) -{ - while (env && ft_strcmp(env->name, name)) - env = env->next; - if (!env) - return (-1); - free(env->content); - env->content = content; - return (0); -} - -int env_delete(char *name, t_env *env) -{ - char *new_content; - t_env *tmp; - - while (env && env->next && ft_strcmp(env->next->name, name)) - env = env->next; - if (!env || !env->next) - return (-1); - ft_free("cc", &env->next->name, &env->next->content); - tmp = env->next; - env->next = env->next->next; - free(tmp); - return (0); -} - -void env_print(t_env *env) -{ - while (env) - { - printf("%s:%s\n", env->name, env->content); - env = env->next; - } -} diff --git a/src/env/env_cmd_BASE_1565172.c b/src/env/env_cmd_BASE_1565172.c deleted file mode 100644 index 8bbbebc..0000000 --- a/src/env/env_cmd_BASE_1565172.c +++ /dev/null @@ -1,162 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* env_cmd.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: mmoussou name) - + ft_strlen(env->content) + 2); - if (!exec_env[i]) - { - ft_free("a", exec_env); - return (NULL); - } - ft_strlcpy(exec_env[i], env->name, ft_strlen(env->name) + 1); - exec_env[i][ft_strlen(env->name)] = '='; - ft_strlcpy(exec_env[i] + ft_strlen(env->name) + 1, - env->content, ft_strlen(env->content) + 1); - env = env->next; - i++; - } - return (exec_env); -} - -int env_create_first_el(char *env_line, t_env *env) -{ - t_env *new; - char *name; - char *content; - - content = ft_strdup(ft_strchr(env_line, '=') + 1); - if (!content) - return (-1); - ft_strchr(env_line, '=')[0] = 0; - name = ft_strdup(env_line); - if (!name) - return (-1); - env->name = name; - env->content = content; - env->next = NULL; - return (0); -} - -t_env *env_create_el(char *env_line) -{ - t_env *new; - char *name; - char *content; - - content = ft_strdup(ft_strchr(env_line, '=') + 1); - if (!content) - return (NULL); - ft_strchr(env_line, '=')[0] = 0; - name = ft_strdup(env_line); - if (!name) - return (NULL); - new = ft_envnew(name, content); - return (new); -} - -int env_init(char **env_d, t_env *env) -{ - t_env *new; - int i; - char bool_first_el; - - i = 0; - bool_first_el = true; - while (env_d[i]) - { - if (bool_first_el) - i = env_create_first_el(env_d[i], env); - if (bool_first_el && i < 0) - return (1); - if (bool_first_el) - bool_first_el = false; - else - { - new = env_create_el(env_d[i]); - if (!new) - { - ft_envclear(&env, free); - return (1); - } - ft_envadd_back(&env, new); - } - i++; - } - return (0); -} - -int env_append(char *name, char *content, t_env *env) -{ - char *new_content; - - while (env && ft_strcmp(env->name, name)) - env = env->next; - if (!env) - return (-1); - new_content = ft_calloc(1, ft_strlen(env->content) + ft_strlen(content)); - ft_strlcpy(new_content, env->content, ft_strlen(env->content) + 1); - ft_strlcpy(new_content + ft_strlen(env->content), - content, ft_strlen(content) + 1); - free(env->content); - env->content = new_content; - return (0); -} - -int env_edit(char *name, char *content, t_env *env) -{ - while (env && ft_strcmp(env->name, name)) - env = env->next; - if (!env) - return (-1); - free(env->content); - env->content = content; - return (0); -} - -int env_delete(char *name, t_env *env) -{ - char *new_content; - t_env *tmp; - - while (env && env->next && ft_strcmp(env->next->name, name)) - env = env->next; - if (!env || !env->next) - return (-1); - ft_free("cc", &env->next->name, &env->next->content); - tmp = env->next; - env->next = env->next->next; - free(tmp); - return (0); -} - -void env_print(t_env *env) -{ - while (env) - { - printf("%s:%s\n", env->name, env->content); - env = env->next; - } -} diff --git a/src/env/env_cmd_LOCAL_1565069.c b/src/env/env_cmd_LOCAL_1565069.c deleted file mode 100644 index f7ab578..0000000 --- a/src/env/env_cmd_LOCAL_1565069.c +++ /dev/null @@ -1,162 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* env_cmd.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: mmoussou name) - + ft_strlen(env->content) + 2); - if (!exec_env[i]) - { - ft_free("a", exec_env); - return (NULL); - } - ft_strlcpy(exec_env[i], env->name, ft_strlen(env->name) + 1); - exec_env[i][ft_strlen(env->name)] = '='; - ft_strlcpy(exec_env[i] + ft_strlen(env->name) + 1, - env->content, ft_strlen(env->content) + 1); - env = env->next; - i++; - } - return (exec_env); -} - -int env_create_first_el(char *env_line, t_env *env) -{ -// t_env *new; - char *name; - char *content; - - content = ft_strdup(ft_strchr(env_line, '=') + 1); - if (!content) - return (-1); - ft_strchr(env_line, '=')[0] = 0; - name = ft_strdup(env_line); - if (!name) - return (-1); - env->name = name; - env->content = content; - env->next = NULL; - return (0); -} - -t_env *env_create_el(char *env_line) -{ - t_env *new; - char *name; - char *content; - - content = ft_strdup(ft_strchr(env_line, '=') + 1); - if (!content) - return (NULL); - ft_strchr(env_line, '=')[0] = 0; - name = ft_strdup(env_line); - if (!name) - return (NULL); - new = ft_envnew(name, content); - return (new); -} - -int env_init(char **env_d, t_env *env) -{ - t_env *new; - int i; - char bool_first_el; - - i = 0; - bool_first_el = true; - while (env_d[i]) - { - if (bool_first_el) - i = env_create_first_el(env_d[i], env); - if (bool_first_el && i < 0) - return (1); - if (bool_first_el) - bool_first_el = false; - else - { - new = env_create_el(env_d[i]); - if (!new) - { - ft_envclear(&env, free); - return (1); - } - ft_envadd_back(&env, new); - } - i++; - } - return (0); -} - -int env_append(char *name, char *content, t_env *env) -{ - char *new_content; - - while (env && ft_strcmp(env->name, name)) - env = env->next; - if (!env) - return (-1); - new_content = ft_calloc(1, ft_strlen(env->content) + ft_strlen(content)); - ft_strlcpy(new_content, env->content, ft_strlen(env->content) + 1); - ft_strlcpy(new_content + ft_strlen(env->content), - content, ft_strlen(content) + 1); - free(env->content); - env->content = new_content; - return (0); -} - -int env_edit(char *name, char *content, t_env *env) -{ - while (env && ft_strcmp(env->name, name)) - env = env->next; - if (!env) - return (-1); - free(env->content); - env->content = content; - return (0); -} - -int env_delete(char *name, t_env *env) -{ -// char *new_content; - t_env *tmp; - - while (env && env->next && ft_strcmp(env->next->name, name)) - env = env->next; - if (!env || !env->next) - return (-1); - ft_free("cc", &env->next->name, &env->next->content); - tmp = env->next; - env->next = env->next->next; - free(tmp); - return (0); -} - -void env_print(t_env *env) -{ - while (env) - { - printf("%s:%s\n", env->name, env->content); - env = env->next; - } -} diff --git a/src/env/env_cmd_LOCAL_1565172.c b/src/env/env_cmd_LOCAL_1565172.c deleted file mode 100644 index f7ab578..0000000 --- a/src/env/env_cmd_LOCAL_1565172.c +++ /dev/null @@ -1,162 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* env_cmd.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: mmoussou name) - + ft_strlen(env->content) + 2); - if (!exec_env[i]) - { - ft_free("a", exec_env); - return (NULL); - } - ft_strlcpy(exec_env[i], env->name, ft_strlen(env->name) + 1); - exec_env[i][ft_strlen(env->name)] = '='; - ft_strlcpy(exec_env[i] + ft_strlen(env->name) + 1, - env->content, ft_strlen(env->content) + 1); - env = env->next; - i++; - } - return (exec_env); -} - -int env_create_first_el(char *env_line, t_env *env) -{ -// t_env *new; - char *name; - char *content; - - content = ft_strdup(ft_strchr(env_line, '=') + 1); - if (!content) - return (-1); - ft_strchr(env_line, '=')[0] = 0; - name = ft_strdup(env_line); - if (!name) - return (-1); - env->name = name; - env->content = content; - env->next = NULL; - return (0); -} - -t_env *env_create_el(char *env_line) -{ - t_env *new; - char *name; - char *content; - - content = ft_strdup(ft_strchr(env_line, '=') + 1); - if (!content) - return (NULL); - ft_strchr(env_line, '=')[0] = 0; - name = ft_strdup(env_line); - if (!name) - return (NULL); - new = ft_envnew(name, content); - return (new); -} - -int env_init(char **env_d, t_env *env) -{ - t_env *new; - int i; - char bool_first_el; - - i = 0; - bool_first_el = true; - while (env_d[i]) - { - if (bool_first_el) - i = env_create_first_el(env_d[i], env); - if (bool_first_el && i < 0) - return (1); - if (bool_first_el) - bool_first_el = false; - else - { - new = env_create_el(env_d[i]); - if (!new) - { - ft_envclear(&env, free); - return (1); - } - ft_envadd_back(&env, new); - } - i++; - } - return (0); -} - -int env_append(char *name, char *content, t_env *env) -{ - char *new_content; - - while (env && ft_strcmp(env->name, name)) - env = env->next; - if (!env) - return (-1); - new_content = ft_calloc(1, ft_strlen(env->content) + ft_strlen(content)); - ft_strlcpy(new_content, env->content, ft_strlen(env->content) + 1); - ft_strlcpy(new_content + ft_strlen(env->content), - content, ft_strlen(content) + 1); - free(env->content); - env->content = new_content; - return (0); -} - -int env_edit(char *name, char *content, t_env *env) -{ - while (env && ft_strcmp(env->name, name)) - env = env->next; - if (!env) - return (-1); - free(env->content); - env->content = content; - return (0); -} - -int env_delete(char *name, t_env *env) -{ -// char *new_content; - t_env *tmp; - - while (env && env->next && ft_strcmp(env->next->name, name)) - env = env->next; - if (!env || !env->next) - return (-1); - ft_free("cc", &env->next->name, &env->next->content); - tmp = env->next; - env->next = env->next->next; - free(tmp); - return (0); -} - -void env_print(t_env *env) -{ - while (env) - { - printf("%s:%s\n", env->name, env->content); - env = env->next; - } -} diff --git a/src/env/env_cmd_REMOTE_1565069.c b/src/env/env_cmd_REMOTE_1565069.c deleted file mode 100644 index 4e3ef79..0000000 --- a/src/env/env_cmd_REMOTE_1565069.c +++ /dev/null @@ -1,162 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* env_cmd.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: mmoussou name) - + ft_strlen(env->content) + 2); - if (!exec_env[i]) - { - ft_free("a", exec_env); - return (NULL); - } - ft_strlcpy(exec_env[i], env->name, ft_strlen(env->name) + 1); - exec_env[i][ft_strlen(env->name)] = '='; - ft_strlcpy(exec_env[i] + ft_strlen(env->name) + 1, - env->content, ft_strlen(env->content) + 1); - env = env->next; - i++; - } - return (exec_env); -} - -int env_create_first_el(char *env_line, t_env *env) -{ -// t_env *new; - char *name; - char *content; - - content = ft_strdup(ft_strchr(env_line, '=') + 1); - if (!content) - return (-1); - ft_strchr(env_line, '=')[0] = 0; - name = ft_strdup(env_line); - if (!name) - return (-1); - env->name = name; - env->content = content; - env->next = NULL; - return (0); -} - -t_env *env_create_el(char *env_line) -{ - t_env *new; - char *name; - char *content; - - content = ft_strdup(ft_strchr(env_line, '=') + 1); - if (!content) - return (NULL); - ft_strchr(env_line, '=')[0] = 0; - name = ft_strdup(env_line); - if (!name) - return (NULL); - new = ft_envnew(name, content); - return (new); -} - -int env_init(char **env_d, t_env *env) -{ - t_env *new; - int i; - char bool_first_el; - - i = 0; - bool_first_el = true; - while (env_d[i]) - { - if (bool_first_el) - i = env_create_first_el(env_d[i], env); - if (bool_first_el && i < 0) - return (1); - if (bool_first_el) - bool_first_el = false; - else - { - new = env_create_el(env_d[i]); - if (!new) - { - ft_envclear(&env, free); - return (1); - } - ft_envadd_back(&env, new); - } - i++; - } - return (0); -} - -int env_append(char *name, char *content, t_env *env) -{ - char *new_content; - - while (env && ft_strcmp(env->name, name)) - env = env->next; - if (!env) - return (-1); - new_content = ft_calloc(1, ft_strlen(env->content) + ft_strlen(content)); - ft_strlcpy(new_content, env->content, ft_strlen(env->content) + 1); - ft_strlcpy(new_content + ft_strlen(env->content), - content, ft_strlen(content) + 1); - free(env->content); - env->content = new_content; - return (0); -} - -int env_edit(char *name, char *content, t_env *env) -{ - while (env && ft_strcmp(env->name, name)) - env = env->next; - if (!env) - return (-1); - free(env->content); - env->content = content; - return (0); -} - -int env_delete(char *name, t_env *env) -{ -// char *new_content; - t_env *tmp; - - while (env && env->next && ft_strcmp(env->next->name, name)) - env = env->next; - if (!env || !env->next) - return (-1); - ft_free("cc", &env->next->name, &env->next->content); - tmp = env->next; - env->next = env->next->next; - free(tmp); - return (0); -} - -void env_print(t_env *env) -{ - while (env) - { - printf("%s:%s\n", env->name, env->content); - env = env->next; - } -} diff --git a/src/env/env_cmd_REMOTE_1565172.c b/src/env/env_cmd_REMOTE_1565172.c deleted file mode 100644 index 4e3ef79..0000000 --- a/src/env/env_cmd_REMOTE_1565172.c +++ /dev/null @@ -1,162 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* env_cmd.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: mmoussou name) - + ft_strlen(env->content) + 2); - if (!exec_env[i]) - { - ft_free("a", exec_env); - return (NULL); - } - ft_strlcpy(exec_env[i], env->name, ft_strlen(env->name) + 1); - exec_env[i][ft_strlen(env->name)] = '='; - ft_strlcpy(exec_env[i] + ft_strlen(env->name) + 1, - env->content, ft_strlen(env->content) + 1); - env = env->next; - i++; - } - return (exec_env); -} - -int env_create_first_el(char *env_line, t_env *env) -{ -// t_env *new; - char *name; - char *content; - - content = ft_strdup(ft_strchr(env_line, '=') + 1); - if (!content) - return (-1); - ft_strchr(env_line, '=')[0] = 0; - name = ft_strdup(env_line); - if (!name) - return (-1); - env->name = name; - env->content = content; - env->next = NULL; - return (0); -} - -t_env *env_create_el(char *env_line) -{ - t_env *new; - char *name; - char *content; - - content = ft_strdup(ft_strchr(env_line, '=') + 1); - if (!content) - return (NULL); - ft_strchr(env_line, '=')[0] = 0; - name = ft_strdup(env_line); - if (!name) - return (NULL); - new = ft_envnew(name, content); - return (new); -} - -int env_init(char **env_d, t_env *env) -{ - t_env *new; - int i; - char bool_first_el; - - i = 0; - bool_first_el = true; - while (env_d[i]) - { - if (bool_first_el) - i = env_create_first_el(env_d[i], env); - if (bool_first_el && i < 0) - return (1); - if (bool_first_el) - bool_first_el = false; - else - { - new = env_create_el(env_d[i]); - if (!new) - { - ft_envclear(&env, free); - return (1); - } - ft_envadd_back(&env, new); - } - i++; - } - return (0); -} - -int env_append(char *name, char *content, t_env *env) -{ - char *new_content; - - while (env && ft_strcmp(env->name, name)) - env = env->next; - if (!env) - return (-1); - new_content = ft_calloc(1, ft_strlen(env->content) + ft_strlen(content)); - ft_strlcpy(new_content, env->content, ft_strlen(env->content) + 1); - ft_strlcpy(new_content + ft_strlen(env->content), - content, ft_strlen(content) + 1); - free(env->content); - env->content = new_content; - return (0); -} - -int env_edit(char *name, char *content, t_env *env) -{ - while (env && ft_strcmp(env->name, name)) - env = env->next; - if (!env) - return (-1); - free(env->content); - env->content = content; - return (0); -} - -int env_delete(char *name, t_env *env) -{ -// char *new_content; - t_env *tmp; - - while (env && env->next && ft_strcmp(env->next->name, name)) - env = env->next; - if (!env || !env->next) - return (-1); - ft_free("cc", &env->next->name, &env->next->content); - tmp = env->next; - env->next = env->next->next; - free(tmp); - return (0); -} - -void env_print(t_env *env) -{ - while (env) - { - printf("%s:%s\n", env->name, env->content); - env = env->next; - } -} diff --git a/src/main.c b/src/main.c index 2287988..ef8503f 100644 --- a/src/main.c +++ b/src/main.c @@ -6,7 +6,7 @@ /* By: adjoly +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/04/24 11:18:04 by adjoly #+# #+# */ -/* Updated: 2024/05/07 14:11:35 by adjoly ### ########.fr */ +/* Updated: 2024/05/09 18:05:14 by adjoly ### ########.fr */ /* */ /* ************************************************************************** */ @@ -68,7 +68,7 @@ int main(int ac, char **av, char **env) if (is_str(test, "exit")) break; cmd = split_pipe(test); - //print_pipe(cmd); + print_pipe(cmd); ft_free("a", &lll); } ft_free("a", &lll);