raphael/minishell
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed stuff

Browse source
This commit is contained in:
Maix0 2024-05-18 18:49:15 +02:00
parent be1d3ff2d3
commit f4e8596f3b
15 changed files with 130 additions and 103 deletions
Download patch file Download diff file Expand all files Collapse all files

33
sources/env.c
View file

@ -6,7 +6,7 @@
/* By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/05/04 18:32:50 by maiboyer #+# #+# */
/* Updated: 2024/05/14 18:46:13 by maiboyer ### ########.fr */
/* Updated: 2024/05/18 18:44:24 by maiboyer ### ########.fr */
/* */
/* ************************************************************************** */
@ -14,15 +14,22 @@
#include "me/buffered_str/buf_str.h"
#include "me/hash/hasher.h"
#include "me/hashmap/hashmap_env.h"
#include "me/mem/mem.h"
#include "me/string/str_clone.h"
#include "me/string/str_compare.h"
#include "me/string/str_len.h"
#include "me/types.h"
#include "me/vec/vec_str.h"
#include "me/mem/mem.h"
#include <stdlib.h>
static void _hash_str(t_hasher *hasher, t_str *s)
{
hasher_write_str(hasher, *s);
t_usize len;
len = str_len(*s);
hasher_write_u64(hasher, (t_u64)len);
hasher_write_bytes(hasher, (t_u8 *)*s, len);
hasher_write_u8(hasher, 0);
}
static bool _cmp_str(t_str *s1, t_str *s2)
@ -33,9 +40,9 @@ static bool _cmp_str(t_str *s1, t_str *s2)
static void _free_env(t_kv_env kv)
{
if (kv.key)
free(kv.key);
mem_free(kv.key);
if (kv.val)
free(kv.val);
mem_free(kv.val);
}
t_hashmap_env *create_env_map(void)
@ -47,15 +54,17 @@ t_error _build_envp_iterator(t_usize idx, const t_str *key, t_str *val,
void *ctx)
{
struct s_build_envp_state *s;
t_str push;
(void)(idx);
s = ctx;
if (push_str_buffer(&s->buf, *key) && push_str_char(&s->buf, '=') &&
if (push_str_buffer(&s->buf, *key) || push_str_buffer(&s->buf, "=") ||
push_str_buffer(&s->buf, *val))
return (vec_str_free(s->out), ERROR);
if (vec_str_push(&s->out, s->buf.buf))
push = str_clone(s->buf.buf);
if (vec_str_push(&s->out, push))
return (str_free(s->buf), ERROR);
s->buf = alloc_new_buffer(50);
str_clear(&s->buf);
return (NO_ERROR);
}
@ -63,12 +72,12 @@ t_error build_envp(t_hashmap_env *envs, t_vec_str *envp)
{
struct s_build_envp_state state;
state.out = vec_str_new(envs->num_buckets, (void (*)(t_str))mem_free);
state.buf = alloc_new_buffer(50);
state.buf = alloc_new_buffer(8096);
state.out = vec_str_new(1024, (void (*)(t_str))mem_free);
if (hashmap_env_iter(envs, _build_envp_iterator, &state))
return (ERROR);
return (str_free(state.buf), printf("iter failed\n"), ERROR);
if (vec_str_push(&state.out, NULL))
return (ERROR);
return (str_free(state.buf), printf("coun't push null\n"), ERROR);
*envp = state.out;
str_free(state.buf);
return (NO_ERROR);