willem/minishell
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

export without args

Browse Source
This commit is contained in:
whaffman 2025-03-04 16:33:32 +01:00
parent 8c9a3a1e74
commit 35083ca6c8
4 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
inc/environment.h
View File

@ -6,7 +6,7 @@
/* By: whaffman <whaffman@student.codam.nl> +#+ */ /* By: whaffman <whaffman@student.codam.nl> +#+ */
/* +#+ */ /* +#+ */
/* Created: 2025/02/04 16:26:35 by whaffman #+# #+# */ /* Created: 2025/02/04 16:26:35 by whaffman #+# #+# */
/* Updated: 2025/03/03 21:32:49 by whaffman ######## odam.nl */ /* Updated: 2025/03/04 16:30:03 by whaffman ######## odam.nl */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -17,7 +17,7 @@
void environment_add(t_minishell *msh, void environment_add(t_minishell *msh,
char *name, char *value); char *name, char *value);
void environment_print(t_minishell *msh); void environment_print(t_minishell *msh, int export);
t_environment *environment_get(t_minishell *msh, char *name); t_environment *environment_get(t_minishell *msh, char *name);
void environment_free_list(t_minishell *msh); void environment_free_list(t_minishell *msh);
int environment_parse(t_minishell *msh, char **envp); int environment_parse(t_minishell *msh, char **envp);

4
src/builtin/builtin_env.c
View File

@ -6,7 +6,7 @@
/* By: whaffman <whaffman@student.codam.nl> +#+ */ /* By: whaffman <whaffman@student.codam.nl> +#+ */
/* +#+ */ /* +#+ */
/* Created: 2025/02/20 11:33:02 by whaffman #+# #+# */ /* Created: 2025/02/20 11:33:02 by whaffman #+# #+# */
/* Updated: 2025/02/26 15:46:55 by whaffman ######## odam.nl */ /* Updated: 2025/03/04 16:33:16 by whaffman ######## odam.nl */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -15,6 +15,6 @@
int builtin_env(t_minishell *msh, t_command *cmd) int builtin_env(t_minishell *msh, t_command *cmd)
{ {
(void)cmd; (void)cmd;
environment_print(msh); environment_print(msh, FALSE);
return (SUCCESS); return (SUCCESS);
} }

4
src/builtin/builtin_export.c
View File

@ -6,7 +6,7 @@
/* By: whaffman <whaffman@student.codam.nl> +#+ */ /* By: whaffman <whaffman@student.codam.nl> +#+ */
/* +#+ */ /* +#+ */
/* Created: 2025/02/20 11:32:53 by whaffman #+# #+# */ /* Created: 2025/02/20 11:32:53 by whaffman #+# #+# */
/* Updated: 2025/03/03 23:00:38 by whaffman ######## odam.nl */ /* Updated: 2025/03/04 16:31:48 by whaffman ######## odam.nl */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -33,6 +33,8 @@ int builtin_export(t_minishell *msh, t_command *cmd)
i = 0; i = 0;
arr = NULL; arr = NULL;
if (cmd->args[1] == NULL)
environment_print(msh, TRUE);
while (cmd->args[++i] != NULL) while (cmd->args[++i] != NULL)
{ {
arr = ft_split_safe(msh, cmd->args[i], '='); arr = ft_split_safe(msh, cmd->args[i], '=');

22
src/environment/environment_print.c
View File

@ -6,23 +6,25 @@
/* By: willem <willem@student.codam.nl> +#+ */ /* By: willem <willem@student.codam.nl> +#+ */
/* +#+ */ /* +#+ */
/* Created: 2025/02/08 13:52:08 by willem #+# #+# */ /* Created: 2025/02/08 13:52:08 by willem #+# #+# */
/* Updated: 2025/03/01 14:24:19 by whaffman ######## odam.nl */ /* Updated: 2025/03/04 16:29:49 by whaffman ######## odam.nl */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
#include "minishell.h" #include "minishell.h"
void environment_print(t_minishell *msh) void environment_print(t_minishell *msh, int export)
{ {
char **arr; t_list *env_list;
int i; t_environment *env;
arr = environment_get_arr(msh); env_list = msh->environment;
i = 0; while(env_list != NULL)
while (arr[i] != NULL)
{ {
printf("%s\n", arr[i]); env = (t_environment *)env_list->content;
i++; if (export)
printf("declare -x %s=\"%s\"\n", env->name, env->value);
else
printf("%s=%s\n", env->name, env->value);
env_list = env_list->next;
} }
ft_free_arr_safe(msh, arr);
} }