Skip to content

Commit acc6863

Browse files
Francois PetitFrancois Petit
authored andcommitted
norm
1 parent 2a9f4b7 commit acc6863

4 files changed

Lines changed: 28 additions & 48 deletions

File tree

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,3 +35,4 @@ m_tester
3535
eoc
3636
exec
3737
outfile
38+
minishell_bonus

srcs/bonus/srcs/main_bonus.c

Lines changed: 0 additions & 31 deletions
This file was deleted.

srcs/builtins/env.c

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,23 @@
66
/* By: fpetit <fpetit@student.42.fr> +#+ +:+ +#+ */
77
/* +#+#+#+#+#+ +#+ */
88
/* Created: 2025/03/27 15:31:15 by fpetit #+# #+# */
9-
/* Updated: 2025/03/27 17:27:37 by fpetit ### ########.fr */
9+
/* Updated: 2025/04/04 01:30:16 by fpetit ### ########.fr */
1010
/* */
1111
/* ************************************************************************** */
1212

1313
#include "shell.h"
1414

15+
static void check_print(t_keyval *current, t_token *token)
16+
{
17+
if (current->value[0] && \
18+
ft_strcmp(current->key, LAST_RETURN_CODE))
19+
ft_printfd(token->out, "%s=%s\n", current->key, \
20+
current->value);
21+
else if (!current->value[0])
22+
ft_printfd(token->out, "%s=\n", current->key, \
23+
current->value);
24+
}
25+
1526
static void print_envvar(t_data *data, t_token *token)
1627
{
1728
t_keyval *current;
@@ -29,13 +40,7 @@ static void print_envvar(t_data *data, t_token *token)
2940
current = keyvals[i];
3041
while (current)
3142
{
32-
if (current->value[0] && \
33-
ft_strcmp(current->key, LAST_RETURN_CODE))
34-
ft_printfd(token->out, "%s=%s\n", current->key, \
35-
current->value);
36-
else if (!current->value[0])
37-
ft_printfd(token->out, "%s=\n", current->key, \
38-
current->value);
43+
check_print(current, token);
3944
current = current->next;
4045
}
4146
}

srcs_bonus/builtins/env_bonus.c

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,28 @@
11
/* ************************************************************************** */
22
/* */
33
/* ::: :::::::: */
4-
/* env.c :+: :+: :+: */
4+
/* env_bonus.c :+: :+: :+: */
55
/* +:+ +:+ +:+ */
66
/* By: fpetit <fpetit@student.42.fr> +#+ +:+ +#+ */
77
/* +#+#+#+#+#+ +#+ */
88
/* Created: 2025/03/27 15:31:15 by fpetit #+# #+# */
9-
/* Updated: 2025/03/27 17:27:37 by fpetit ### ########.fr */
9+
/* Updated: 2025/04/04 01:31:47 by fpetit ### ########.fr */
1010
/* */
1111
/* ************************************************************************** */
1212

1313
#include "shell.h"
1414

15+
static void check_print(t_keyval *current, t_token *token)
16+
{
17+
if (current->value[0] && \
18+
ft_strcmp(current->key, LAST_RETURN_CODE))
19+
ft_printfd(token->out, "%s=%s\n", current->key, \
20+
current->value);
21+
else if (!current->value[0])
22+
ft_printfd(token->out, "%s=\n", current->key, \
23+
current->value);
24+
}
25+
1526
static void print_envvar(t_data *data, t_token *token)
1627
{
1728
t_keyval *current;
@@ -29,13 +40,7 @@ static void print_envvar(t_data *data, t_token *token)
2940
current = keyvals[i];
3041
while (current)
3142
{
32-
if (current->value[0] && \
33-
ft_strcmp(current->key, LAST_RETURN_CODE))
34-
ft_printfd(token->out, "%s=%s\n", current->key, \
35-
current->value);
36-
else if (!current->value[0])
37-
ft_printfd(token->out, "%s=\n", current->key, \
38-
current->value);
43+
check_print(current, token);
3944
current = current->next;
4045
}
4146
}

0 commit comments

Comments
 (0)