aboutsummaryrefslogtreecommitdiff
path: root/src/builtin/unset.c
diff options
context:
space:
mode:
authorCharles Cabergs <me@cacharle.xyz>2020-09-15 17:54:48 +0200
committerCharles Cabergs <me@cacharle.xyz>2020-09-15 17:54:48 +0200
commitf626f2715ab696fdb326ed67256d012d86faef9f (patch)
treef25f2d95688a89c662622e3c2f11786f27689713 /src/builtin/unset.c
parent170d0b74fa725196bca0fa549520d0d8bfa07576 (diff)
downloadminishell-f626f2715ab696fdb326ed67256d012d86faef9f.tar.gz
minishell-f626f2715ab696fdb326ed67256d012d86faef9f.tar.bz2
minishell-f626f2715ab696fdb326ed67256d012d86faef9f.zip
Refactoring env, Removing bloat from utils, exec and env
Diffstat (limited to 'src/builtin/unset.c')
-rw-r--r--src/builtin/unset.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/builtin/unset.c b/src/builtin/unset.c
index 9d0c66f..3f3ae42 100644
--- a/src/builtin/unset.c
+++ b/src/builtin/unset.c
@@ -6,7 +6,7 @@
/* By: charles <charles@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2020/04/01 17:10:51 by charles #+# #+# */
-/* Updated: 2020/09/13 20:22:35 by charles ### ########.fr */
+/* Updated: 2020/09/15 17:46:55 by charles ### ########.fr */
/* */
/* ************************************************************************** */
@@ -27,21 +27,21 @@
int builtin_unset(char **argv, t_env env)
{
size_t i;
- int found_index;
+ size_t found_index;
int status;
status = 0;
i = 0;
while (argv[++i] != NULL)
{
- if (!utils_valid_identifier(argv[i]))
+ if (*argv[i] == '\0'
+ || env_key_len(argv[i], false) != ft_strlen(argv[i]))
{
errorf("unset: `%s': not a valid identifier\n", argv[i]);
status = 1;
continue ;
}
- found_index = env_search_index(env, argv[i]);
- if (found_index == -1)
+ if (env_search(env, argv[i], &found_index) == NULL)
continue ;
ft_vecremove(env, found_index, free);
}