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

Merge commit, fixed warnings

Browse source
This commit is contained in:
Maieul BOYER 2024-08-14 18:16:54 +02:00
commit 13bc603a59
No known key found for this signature in database
13 changed files with 158 additions and 113 deletions
Download patch file Download diff file Expand all files Collapse all files

3
exec/src/builtins/_debug.c
View file

@ -6,7 +6,7 @@
/* By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/08/10 18:43:18 by maiboyer #+# #+# */
/* Updated: 2024/08/11 12:11:43 by maiboyer ### ########.fr */
/* Updated: 2024/08/14 18:14:27 by maiboyer ### ########.fr */
/* */
/* ************************************************************************** */
@ -26,6 +26,7 @@ static t_error _debug_fd(t_state *state, t_builtin_spawn_info info, t_i32 *exit_
const t_fd_array *fds = get_fd_arrays();
t_usize i;
(void)(state);
i = 0;
while (i < FILE_SLOT_LEN)
{

3
exec/src/builtins/cd.c
View file

@ -6,7 +6,7 @@
/* By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/08/10 18:43:18 by maiboyer #+# #+# */
/* Updated: 2024/08/13 15:13:11 by maiboyer ### ########.fr */
/* Updated: 2024/08/14 18:15:22 by maiboyer ### ########.fr */
/* */
/* ************************************************************************** */
@ -24,6 +24,7 @@ t_error builtin_cd____(t_state *state, t_builtin_spawn_info info, t_i32 *exit_co
t_str *home;
t_str path;
(void)(state);
if (info.args.len <= 1)
{
home = hmap_env_get(state->tmp_var, (t_str *)&key);

4
exec/src/builtins/echo.c
View file

@ -6,7 +6,7 @@
/* By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/08/10 18:43:18 by maiboyer #+# #+# */
/* Updated: 2024/08/11 11:30:09 by maiboyer ### ########.fr */
/* Updated: 2024/08/14 18:15:30 by maiboyer ### ########.fr */
/* */
/* ************************************************************************** */
@ -22,6 +22,7 @@ t_error builtin_echo__(t_state *state, t_builtin_spawn_info info, t_i32 *exit_co
bool print_line;
t_string s;
(void)(state);
print_line = true;
i = 1;
s = string_new(1024);
@ -39,7 +40,6 @@ t_error builtin_echo__(t_state *state, t_builtin_spawn_info info, t_i32 *exit_co
string_push(&s, info.args.buffer[i]);
if (print_line)
string_push_char(&s, '\n');
// TODO: change the null to the actual redirection thingy, this needs to be done in the handle_builtin function beforehand
me_printf_fd(info.stdout, "%s", s.buf);
string_free(s);
return (*exit_code = 0, NO_ERROR);

3
exec/src/builtins/env.c
View file

@ -6,7 +6,7 @@
/* By: rparodi <rparodi@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/08/07 14:22:50 by rparodi #+# #+# */
/* Updated: 2024/08/12 14:16:45 by rparodi ### ########.fr */
/* Updated: 2024/08/14 18:14:46 by maiboyer ### ########.fr */
/* */
/* ************************************************************************** */
@ -26,6 +26,7 @@ static t_error _print_env(t_usize _idx, const t_str *key, t_str *value, void *vc
const struct s_print_env_state *ctx = vctx;
t_str *val;
(void)(_idx);
val = hmap_env_get(ctx->state->tmp_var, (t_str *)key);
if (val == NULL)
val = value;

3
exec/src/builtins/exit.c
View file

@ -6,7 +6,7 @@
/* By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/08/10 18:43:18 by maiboyer #+# #+# */
/* Updated: 2024/08/11 12:41:07 by maiboyer ### ########.fr */
/* Updated: 2024/08/14 18:15:05 by maiboyer ### ########.fr */
/* */
/* ************************************************************************** */
@ -18,6 +18,7 @@ t_error builtin_exit__(t_state *state, t_builtin_spawn_info info, t_i32 *exit_co
{
t_i32 actual_exit_code;
(void)(state);
if (info.args.len < 2)
actual_exit_code = 0;
else if (str_to_i32(info.args.buffer[1], 10, &actual_exit_code))

5
exec/src/builtins/export.c
View file

@ -6,7 +6,7 @@
/* By: rparodi <rparodi@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/08/07 14:13:41 by rparodi #+# #+# */
/* Updated: 2024/08/12 15:58:55 by maiboyer ### ########.fr */
/* Updated: 2024/08/14 18:16:28 by maiboyer ### ########.fr */
/* */
/* ************************************************************************** */
@ -53,6 +53,7 @@ static t_error _print_export(t_usize _idx, const t_str *key, t_str *value, void
t_str *val;
t_str true_val;
(void)(_idx);
val = hmap_env_get(ctx->state->tmp_var, (t_str *)key);
if (val == NULL)
val = value;
@ -69,6 +70,8 @@ t_error builtin_export(t_state *state, t_builtin_spawn_info info, t_i32 *exit_co
{
struct s_print_export_state print_ctx;
struct s_assign_export_state assign_ctx;
(void)(state);
print_ctx.info = &info;
print_ctx.state = state;
assign_ctx.info = &info;

3
exec/src/builtins/pwd.c
View file

@ -6,7 +6,7 @@
/* By: rparodi <rparodi@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/08/07 13:58:37 by rparodi #+# #+# */
/* Updated: 2024/08/13 15:14:47 by maiboyer ### ########.fr */
/* Updated: 2024/08/14 18:15:16 by maiboyer ### ########.fr */
/* */
/* ************************************************************************** */
@ -20,6 +20,7 @@ t_error builtin_pwd___(t_state *state, t_builtin_spawn_info info, t_i32 *exit_co
{
t_string s;
(void)(state);
s = string_new(1024);
while (getcwd(s.buf, s.capacity - 1) == NULL)
{

3
exec/src/builtins/unset.c
View file

@ -6,7 +6,7 @@
/* By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/08/10 18:43:18 by maiboyer #+# #+# */
/* Updated: 2024/08/12 17:11:12 by maiboyer ### ########.fr */
/* Updated: 2024/08/14 18:15:19 by maiboyer ### ########.fr */
/* */
/* ************************************************************************** */
@ -21,6 +21,7 @@ t_error builtin_unset_(t_state *state, t_builtin_spawn_info info, t_i32 *exit_co
{
t_usize i;
(void)(state);
i = 1;
while (i < info.args.len)
hmap_env_remove(state->env, &info.args.buffer[i++]);

17
exec/src/run_ast.c
View file

@ -6,7 +6,7 @@
/* By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/07/11 17:22:29 by maiboyer #+# #+# */
/* Updated: 2024/08/14 18:07:51 by maiboyer ### ########.fr */
/* Updated: 2024/08/14 18:13:54 by maiboyer ### ########.fr */
/* */
/* ************************************************************************** */
@ -34,6 +34,20 @@
#include <stdio.h>
#define NOT_DONE \
{ \
printf("function `%s` isn't done !\n", __func__); \
return (ERROR); \
}
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-variable"
#pragma GCC diagnostic ignored "-Wunknown-pragmas"
#pragma GCC diagnostic ignored "-Wempty-body"
#pragma clang diagnostic ignored "-Wunknown-pragmas"
#pragma clang diagnostic ignored "-Wunused-parameter"
#pragma clang diagnostic ignored "-Wunused-variable"
bool _is_special_var(t_ast_expansion *self)
{
char name;
@ -509,6 +523,7 @@ t_error _ast_into_str(t_ast_node self, t_state *state, t_vec_str *append)
// t_error run_heredoc_redirection(t_ast_heredoc_redirection *heredoc_redirection, t_state *state, void *out) NOT_DONE;
// t_error run_raw_string(t_ast_raw_string *raw_string, t_state *state, void *out) NOT_DONE;
t_error run_case_(t_ast_case *case_, t_state *state, void *out) NOT_DONE;
t_error run_case_item(t_ast_case_item *case_item, t_state *state, void *out) NOT_DONE;
t_error run_command_substitution(t_ast_command_substitution *command_substitution, t_state *state, void *out) NOT_DONE;