fixed some norme
This commit is contained in:
@ -6,16 +6,17 @@
|
||||
/* By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ */
|
||||
/* +#+#+#+#+#+ +#+ */
|
||||
/* Created: 2024/02/18 18:29:20 by marde-vr #+# #+# */
|
||||
/* Updated: 2024/03/23 19:06:08 by tomoron ### ########.fr */
|
||||
/* Updated: 2024/03/23 19:22:48 by marde-vr ### ########.fr */
|
||||
/* */
|
||||
/* ************************************************************************** */
|
||||
|
||||
#include "minishell.h"
|
||||
void print_env_declare(t_env *env)
|
||||
|
||||
void print_env_declare(t_env *env)
|
||||
{
|
||||
while(env)
|
||||
while (env)
|
||||
{
|
||||
if(strcmp(env->name, "_"))
|
||||
if (strcmp(env->name, "_"))
|
||||
printf("declare -x %s=\"%s\"\n", env->name, env->value);
|
||||
env = env->next;
|
||||
}
|
||||
@ -23,45 +24,45 @@ void print_env_declare(t_env *env)
|
||||
|
||||
int check_var_name(char *name)
|
||||
{
|
||||
if(ft_isdigit(*name) || !*name)
|
||||
return(0);
|
||||
while(*name)
|
||||
if (ft_isdigit(*name) || !*name)
|
||||
return (0);
|
||||
while (*name)
|
||||
{
|
||||
if(!ft_isalnum(*name) && *name != '_')
|
||||
return(0);
|
||||
if (!ft_isalnum(*name) && *name != '_')
|
||||
return (0);
|
||||
name++;
|
||||
}
|
||||
return(1);
|
||||
return (1);
|
||||
}
|
||||
|
||||
int ft_export(t_msh *msh)
|
||||
{
|
||||
t_cmd *cmd;
|
||||
char *arg;
|
||||
char *arg;
|
||||
char *name;
|
||||
char *value;
|
||||
int len;
|
||||
|
||||
cmd = msh->cmds;
|
||||
if(cmd && (!cmd->next || (cmd->next && cmd->next->type != ARG)))
|
||||
print_env_declare(msh->env);
|
||||
if(cmd && cmd->next && cmd->next->type == ARG && (!cmd->next->next ||
|
||||
(cmd->next->next && cmd->next->next->type != ARG)))
|
||||
if (cmd && (!cmd->next || (cmd->next && cmd->next->type != ARG)))
|
||||
print_env_declare(msh->env);
|
||||
if (cmd && cmd->next && cmd->next->type == ARG && (!cmd->next->next
|
||||
|| (cmd->next->next && cmd->next->next->type != ARG)))
|
||||
{
|
||||
arg = cmd->next->token;
|
||||
len = 0;
|
||||
while(arg[len] && arg[len] != '=')
|
||||
while (arg[len] && arg[len] != '=')
|
||||
len++;
|
||||
name = ft_substr(arg, 0, len);
|
||||
if(!name || !check_var_name(name))
|
||||
if (!name || !check_var_name(name))
|
||||
{
|
||||
ft_putstr_fd("minishell: export: `", 2);
|
||||
ft_putstr_fd(arg, 2);
|
||||
ft_putstr_fd(arg, 2);
|
||||
ft_putstr_fd("': not a valid identifier\n", 2);
|
||||
free(name);
|
||||
return(1);
|
||||
return (1);
|
||||
}
|
||||
if(arg[len])
|
||||
if (arg[len])
|
||||
len++;
|
||||
value = ft_strdup(arg + len);
|
||||
msh->env = env_add_back(msh->env, name, value);
|
||||
@ -85,7 +86,7 @@ void delete_from_env(t_env *env, char *name)
|
||||
else
|
||||
prev->next = tmp_env->next;
|
||||
free(tmp_env);
|
||||
return;
|
||||
return ;
|
||||
}
|
||||
prev = tmp_env;
|
||||
tmp_env = tmp_env->next;
|
||||
@ -94,9 +95,9 @@ void delete_from_env(t_env *env, char *name)
|
||||
*/
|
||||
int ft_unset(t_msh *msh)
|
||||
{
|
||||
/*
|
||||
t_cmd *cmd;
|
||||
|
||||
/*
|
||||
cmd = msh->cmds;
|
||||
tmp_env = msh->env;
|
||||
prev = 0;
|
||||
@ -106,5 +107,5 @@ int ft_unset(t_msh *msh)
|
||||
return (0);
|
||||
*/
|
||||
(void)msh;
|
||||
return(0);
|
||||
return (0);
|
||||
}
|
||||
|
Reference in New Issue
Block a user