unset
This commit is contained in:
parent
c2f08b31e3
commit
bdccd9f1e4
@ -99,9 +99,10 @@ int find_len(char *input, int i, char c);
|
||||
void lone_export(t_s_cmd *cmd);
|
||||
void find_variable(char *variable, t_s_cmd *cmd);
|
||||
int find_it(char **str, char *s);
|
||||
int check_variable(char *variable);
|
||||
|
||||
//real builtin
|
||||
void print_env(char **tab);
|
||||
void print_env(t_cmd *cmd);
|
||||
void ft_env(t_s_cmd *cmd, char **env);
|
||||
void ft_exit(t_s_cmd *cmd);
|
||||
void ft_export(t_s_cmd *cmd);
|
||||
|
||||
@ -200,20 +200,3 @@ void open_directory(t_s_cmd *cmd)
|
||||
}
|
||||
}
|
||||
|
||||
void ft_pwd(t_s_cmd *cmd)
|
||||
{
|
||||
int i;
|
||||
char p[1024];
|
||||
char *str;
|
||||
|
||||
i = 1;
|
||||
str = getcwd(p, sizeof(p));
|
||||
if (!str)
|
||||
{
|
||||
cmd->big_cmd->err_var = 1;
|
||||
ft_putstr_fd("Minishell: pwd: Not found\n", 2);
|
||||
}
|
||||
else
|
||||
ft_putendl_fd(p, 1);
|
||||
|
||||
}
|
||||
@ -32,7 +32,7 @@ int is_builtin(char *cmd)
|
||||
void call_builtin(t_cmd *cmd)
|
||||
{
|
||||
if (!ft_strcmp(cmd->current_s_cmd->cmd, "env"))
|
||||
print_env(cmd->env);
|
||||
print_env(cmd);
|
||||
if (!ft_strcmp(cmd->current_s_cmd->cmd, "export"))
|
||||
ft_export(cmd->current_s_cmd);
|
||||
if (!ft_strcmp(cmd->current_s_cmd->cmd, "unset"))
|
||||
|
||||
@ -12,21 +12,42 @@
|
||||
|
||||
#include "../../includes/minishell.h"
|
||||
|
||||
void print_env(char **tab)
|
||||
void print_env(t_cmd *cmd)
|
||||
{
|
||||
int i;
|
||||
|
||||
i = 0;
|
||||
if (tab)
|
||||
if (cmd->current_s_cmd->nb_args > 1)
|
||||
{
|
||||
while (tab[i])
|
||||
ft_putstr_fd("Minishell: env: '", 2);
|
||||
ft_putstr_fd(cmd->current_s_cmd->args[1], 2);
|
||||
ft_putstr_fd("': No such file or directory\n", 2);
|
||||
// 127
|
||||
}
|
||||
else if (cmd->env)
|
||||
{
|
||||
while (cmd->env[i])
|
||||
{
|
||||
if (ft_strchr(tab[i], '='))
|
||||
{
|
||||
ft_putstr_fd(tab[i], 1);
|
||||
ft_putstr_fd("\n", 1);
|
||||
}
|
||||
if (ft_strchr(cmd->env[i], '='))
|
||||
ft_putendl_fd(cmd->env[i], 1);
|
||||
i++;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void ft_pwd(t_s_cmd *cmd)
|
||||
{
|
||||
int i;
|
||||
char p[1024];
|
||||
char *str;
|
||||
|
||||
i = 1;
|
||||
str = getcwd(p, sizeof(p));
|
||||
if (!str)
|
||||
{
|
||||
cmd->big_cmd->err_var = 1;
|
||||
ft_putstr_fd("Minishell: pwd: Not found\n", 2);
|
||||
}
|
||||
else
|
||||
ft_putendl_fd(p, 1);
|
||||
}
|
||||
@ -58,9 +58,9 @@ void ft_export_variable(t_s_cmd *cmd, char *variable)
|
||||
i = 0;
|
||||
if (check_variable(variable) == 1)
|
||||
{
|
||||
ft_putstr_fd("Minishell: export: ", 2);
|
||||
ft_putstr_fd("Minishell: export: `", 2);
|
||||
ft_putstr_fd(variable, 2);
|
||||
ft_putstr_fd(": not a valid identifier\n", 2);
|
||||
ft_putstr_fd("': not a valid identifier\n", 2);
|
||||
// 1
|
||||
return ;
|
||||
}
|
||||
|
||||
@ -65,6 +65,14 @@ void find_variable(char *variable, t_s_cmd *cmd)
|
||||
i = find_it(cmd->big_cmd->env, variable);
|
||||
// str = ft_strjoin(variable, "=");
|
||||
j = 0;
|
||||
if (check_variable(variable) == 1)
|
||||
{
|
||||
ft_putstr_fd("Minishell: unset: `", 2);
|
||||
ft_putstr_fd(variable, 2);
|
||||
ft_putstr_fd("': not a valid identifier\n", 2);
|
||||
// 2
|
||||
return ;
|
||||
}
|
||||
// while (str[j])
|
||||
// j++;
|
||||
// while (cmd->big_cmd->env[i] && !(ft_strncmp(cmd->big_cmd->env[i], str, j) == 0))
|
||||
|
||||
Loading…
Reference in New Issue
Block a user