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

update

Browse source
This commit is contained in:
Maix0 2024-05-18 16:42:03 +02:00
parent 5d2202a0c9
commit 1d7112f982
14 changed files with 54 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

4
allocator/src/me_alloc/functions1.c
View file

@ -6,7 +6,7 @@
/* By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/05/14 18:02:12 by maiboyer #+# #+# */
/* Updated: 2024/05/17 15:21:57 by maiboyer ### ########.fr */
/* Updated: 2024/05/18 16:36:55 by maiboyer ### ########.fr */
/* */
/* ************************************************************************** */
@ -294,7 +294,7 @@ void *m_realloc(struct s_allocator_melloc *self, void *ptr, t_usize size)
old_size = chunk->size;
chunk->size += next->size + sizeof(*next);
vg_mem_defined(next, next->size + sizeof(*next));
mem_set_zero(next, next->size + sizeof(*next));
//mem_set_zero(next, next->size + sizeof(*next));
vg_block_resize((void *)chunk + sizeof(*chunk), old_size,
chunk->size);
vg_mem_no_access(chunk, sizeof(*chunk));

7
output/src/hashmap/env/env.c vendored
View file

@ -1,12 +1,12 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* env.c :+: :+: :+: */
/* hashmap_env.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2023/12/06 10:58:20 by maiboyer #+# #+# */
/* Updated: 2024/05/14 18:46:51 by maiboyer ### ########.fr */
/* Updated: 2023/12/11 15:32:51 by maiboyer ### ########.fr */
/* */
/* ************************************************************************** */
@ -14,6 +14,7 @@
#include "me/hash/sip.h"
#include "me/hashmap/hashmap_env.h"
#include "me/mem/mem.h"
#include "me/mem/mem_copy.h"
#include "me/types.h"
#include <stdlib.h>
@ -80,7 +81,9 @@ t_entry_env *hashmap_get_entry_env(t_hashmap_env *hmap,
entry = entry->next;
}
else
{
return (entry);
}
}
return (NULL);
}

4
output/src/hashmap/env/env_utils.c vendored
View file

@ -1,12 +1,12 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* env_utils.c :+: :+: :+: */
/* hashmap_env_utils.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2023/12/06 10:58:20 by maiboyer #+# #+# */
/* Updated: 2024/05/14 18:47:08 by maiboyer ### ########.fr */
/* Updated: 2023/12/11 15:35:37 by maiboyer ### ########.fr */
/* */
/* ************************************************************************** */

11
output/src/vec/parser_heredoc/parser_heredoc.c
View file

@ -34,18 +34,9 @@ t_vec_parser_heredoc vec_parser_heredoc_new(t_usize capacity,
/// Return true in case of an error
t_error vec_parser_heredoc_push(t_vec_parser_heredoc *vec, t_heredoc element)
{
size_t new_capacity;
if (vec == NULL)
return (ERROR);
if (vec->len + 1 > vec->capacity)
{
new_capacity = (vec->capacity * 3) / 2 + 1;
while (vec->len + 1 > new_capacity)
new_capacity = (new_capacity * 3) / 2 + 1;
vec->buffer = mem_realloc_array(vec->buffer, new_capacity, sizeof(t_heredoc));
vec->capacity = new_capacity;
}
vec_parser_heredoc_reserve(vec, vec->len + 1);
vec->buffer[vec->len] = element;
vec->len += 1;
return (NO_ERROR);

11
output/src/vec/parser_range/parser_range.c
View file

@ -34,18 +34,9 @@ t_vec_parser_range vec_parser_range_new(t_usize capacity,
/// Return true in case of an error
t_error vec_parser_range_push(t_vec_parser_range *vec, t_parser_range element)
{
size_t new_capacity;
if (vec == NULL)
return (ERROR);
if (vec->len + 1 > vec->capacity)
{
new_capacity = (vec->capacity * 3) / 2 + 1;
while (vec->len + 1 > new_capacity)
new_capacity = (new_capacity * 3) / 2 + 1;
vec->buffer = mem_realloc_array(vec->buffer, new_capacity, sizeof(t_parser_range));
vec->capacity = new_capacity;
}
vec_parser_range_reserve(vec, vec->len + 1);
vec->buffer[vec->len] = element;
vec->len += 1;
return (NO_ERROR);

11
output/src/vec/reduce_action/reduce_action.c
View file

@ -34,18 +34,9 @@ t_vec_reduce_action vec_reduce_action_new(t_usize capacity,
/// Return true in case of an error
t_error vec_reduce_action_push(t_vec_reduce_action *vec, t_reduce_action element)
{
size_t new_capacity;
if (vec == NULL)
return (ERROR);
if (vec->len + 1 > vec->capacity)
{
new_capacity = (vec->capacity * 3) / 2 + 1;
while (vec->len + 1 > new_capacity)
new_capacity = (new_capacity * 3) / 2 + 1;
vec->buffer = mem_realloc_array(vec->buffer, new_capacity, sizeof(t_reduce_action));
vec->capacity = new_capacity;
}
vec_reduce_action_reserve(vec, vec->len + 1);
vec->buffer[vec->len] = element;
vec->len += 1;
return (NO_ERROR);

11
output/src/vec/str/str.c
View file

@ -34,18 +34,9 @@ t_vec_str vec_str_new(t_usize capacity,
/// Return true in case of an error
t_error vec_str_push(t_vec_str *vec, t_str element)
{
size_t new_capacity;
if (vec == NULL)
return (ERROR);
if (vec->len + 1 > vec->capacity)
{
new_capacity = (vec->capacity * 3) / 2 + 1;
while (vec->len + 1 > new_capacity)
new_capacity = (new_capacity * 3) / 2 + 1;
vec->buffer = mem_realloc_array(vec->buffer, new_capacity, sizeof(t_str));
vec->capacity = new_capacity;
}
vec_str_reserve(vec, vec->len + 1);
vec->buffer[vec->len] = element;
vec->len += 1;
return (NO_ERROR);

35
sources/exec/handle_command.c
View file

@ -6,56 +6,63 @@
/* By: rparodi <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/05/09 15:00:53 by rparodi #+# #+# */
/* Updated: 2024/05/18 14:32:02 by rparodi ### ########.fr */
/* Updated: 2024/05/18 16:41:54 by maiboyer ### ########.fr */
/* */
/* ************************************************************************** */
#include "app/env.h"
#include "app/state.h"
#include "me/types.h"
#include "gmr/symbols.h"
#include "app/node.h"
#include "app/state.h"
#include "gmr/symbols.h"
#include "me/types.h"
#include "me/vec/vec_str.h"
// #include "app/node/handle_program.h"
#include "app/node/handle_command.h"
#include "minishell.h"
#include "me/string/str_clone.h"
#include "minishell.h"
#include <time.h>
t_error handle_command(t_node *self, t_utils *shcat, t_i32 *out_exit_code)
{
t_usize i;
t_usize i;
t_spawn_info spawn_info;
t_str tmp;
t_str tmp;
spawn_info.arguments = vec_str_new(self->childs_count, (void (*)(t_str))mem_free);
spawn_info.arguments = vec_str_new(64, (void (*)(t_str))mem_free); // TODO: FIX VECTOR
if (self->kind != sym_command)
return (ERROR);
return (ERROR);
i = 0;
while (i < self->childs_count)
{
if (self->childs[i].kind == sym_command_name)
{
spawn_info.binary_path = str_clone(node_getstr(&self->childs[i]));
vec_str_push(&spawn_info.arguments, str_clone(spawn_info.binary_path));
printf("%s\n", spawn_info.arguments.buffer[0]);
}
else if (self->childs[i].kind == sym_file_redirect)
printf("PAS ENCORE HANDLE FDP redirect!\n");
else if (self->childs[i].kind == sym_variable_assignment)
printf("PAS ENCORE HANDLE FDP asignement!\n");
else
{
printf("%s %s\n", self->childs[i].kind_str, node_getstr(&self->childs[i]));
printf("arg %s %s\n", self->childs[i].kind_str,
node_getstr(&self->childs[i]));
if (handle_node_getstr(&self->childs[i], shcat, &tmp))
return (vec_str_free(spawn_info.arguments), ERROR);
if (vec_str_push(&spawn_info.arguments, tmp))
if (vec_str_push(&spawn_info.arguments, str_clone(tmp)))
return (ERROR);
}
}
i++;
}
vec_str_push_front(&spawn_info.arguments, str_clone(spawn_info.binary_path));
printf("%zu\n", spawn_info.arguments.len);
vec_str_push(&spawn_info.arguments, NULL);
for (i = 0; i < spawn_info.arguments.len; i++)
printf("[%zu]\t%s\n", i, spawn_info.arguments.buffer[i]);
spawn_info.stdin = inherited();
spawn_info.stdout = inherited();
spawn_info.stderr = inherited();
spawn_info.forked_free = NULL;
spawn_info.forked_free = NULL;
if (build_envp(shcat->env, &spawn_info.environement))
return (vec_str_free(spawn_info.arguments), ERROR);
if (spawn_process(spawn_info, &shcat->ret))

22
sources/main.c
View file

@ -6,12 +6,13 @@
/* By: rparodi <rparodi@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/03/28 14:40:38 by rparodi #+# #+# */
/* Updated: 2024/05/08 19:22:47 by maiboyer ### ########.fr */
/* Updated: 2024/05/18 16:15:44 by maiboyer ### ########.fr */
/* */
/* ************************************************************************** */
#include "app/env.h"
#include "app/node.h"
#include "app/node/handle_concat.h"
#include "app/node/handle_program.h"
#include "app/signal_handler.h"
#include "gmr/symbols.h"
@ -19,7 +20,6 @@
#include "me/string/str_len.h"
#include "minishell.h"
#include "parser/api.h"
#include "app/node/handle_concat.h"
#include <sys/types.h>
#undef free
@ -35,19 +35,19 @@ t_first_tree *ts_parser_parse_string(t_first_parser *, t_first_tree *oldtree,
void ts_parser_delete(t_first_parser *self);
void ts_parser_set_language(t_first_parser *self, t_language *lang);
t_error handle_node_getstr(t_node *self, t_utils *shcat, t_str *out)
{
switch (self->kind)
*out = NULL;
if (self->kind == sym_word)
{
case sym_word:
*out = node_getstr(self);
return (NO_ERROR);
case sym_concatenation:
return (handle_concat(self, shcat, out));
default:
return (ERROR);
printf("word!!!\n");
*out = node_getstr(self);
return (NO_ERROR);
}
if (self->kind == sym_concatenation)
return (handle_concat(self, shcat, out));
return (ERROR);
}
void print_node_data(t_node *t, t_usize depth)

2
sources/node/node.c
View file

@ -6,7 +6,7 @@
/* By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/04/28 18:36:40 by maiboyer #+# #+# */
/* Updated: 2024/05/08 18:35:15 by maiboyer ### ########.fr */
/* Updated: 2024/05/18 16:14:55 by maiboyer ### ########.fr */
/* */
/* ************************************************************************** */

3
stdme/generic_sources/src/hashmap/C__PREFIX__.c__TEMPLATE__
View file

@ -13,8 +13,7 @@
#include "me/hash/hasher.h"
#include "me/hash/sip.h"
#include "me/hashmap/hashmap_C__PREFIX__.h"
#include "me/mem/mem_alloc.h"
#include "me/mem/mem_alloc_array.h"
#include "me/mem/mem.h"
#include "me/mem/mem_copy.h"
#include "me/types.h"
#include <stdlib.h>

3
stdme/generic_sources/src/hashmap/C__PREFIX___utils.c__TEMPLATE__
View file

@ -12,8 +12,7 @@
#include "me/hash/sip.h"
#include "me/hashmap/hashmap_C__PREFIX__.h"
#include "me/mem/mem_alloc.h"
#include "me/mem/mem_alloc_array.h"
#include "me/mem/mem.h"
#include "me/mem/mem_copy.h"
#include "me/types.h"
#include <stdlib.h>

11
stdme/generic_sources/src/vec/C__PREFIX__.c__TEMPLATE__
View file

@ -34,18 +34,9 @@ t_vec_C__PREFIX__ vec_C__PREFIX___new(t_usize capacity,
/// Return true in case of an error
t_error vec_C__PREFIX___push(t_vec_C__PREFIX__ *vec, C__TYPENAME__ element)
{
size_t new_capacity;
if (vec == NULL)
return (ERROR);
if (vec->len + 1 > vec->capacity)
{
new_capacity = (vec->capacity * 3) / 2 + 1;
while (vec->len + 1 > new_capacity)
new_capacity = (new_capacity * 3) / 2 + 1;
vec->buffer = mem_realloc_array(vec->buffer, new_capacity, sizeof(C__TYPENAME__));
vec->capacity = new_capacity;
}
vec_C__PREFIX___reserve(vec, vec->len + 1);
vec->buffer[vec->len] = element;
vec->len += 1;
return (NO_ERROR);

10
stdme/src/string/str_clone.c
View file

@ -6,23 +6,23 @@
/* By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2023/11/06 16:05:48 by maiboyer #+# #+# */
/* Updated: 2023/12/09 18:15:57 by maiboyer ### ########.fr */
/* Updated: 2024/05/18 16:34:33 by maiboyer ### ########.fr */
/* */
/* ************************************************************************** */
#include "me/mem/mem_alloc.h"
#include "me/string/str_clone.h"
#include "me/mem/mem.h"
#include "me/string/str_l_copy.h"
#include "me/string/str_len.h"
#include <stdlib.h>
t_str str_clone(t_const_str source)
t_str str_clone(t_const_str source)
{
t_str res;
t_usize len;
t_usize len;
len = str_len(source) + 1;
res = mem_alloc(sizeof(unsigned char) * len);
res = mem_alloc_array(sizeof(*res), len);
if (res == NULL)
return (NULL);
str_l_copy(res, source, len);