Merge branch 'sadjigui'

This commit is contained in:
kinou-p 2022-04-19 07:24:03 +02:00
commit aeed660535
3 changed files with 26 additions and 22 deletions

View File

@ -105,6 +105,7 @@ void print_double_fd(char **tab, int fd);
void free_double(char **tab); void free_double(char **tab);
//builtins utils //builtins utils
void ft_shlvl(char **env);
void register_env(t_s_cmd *cmd, char *variable); void register_env(t_s_cmd *cmd, char *variable);
void ft_env(t_s_cmd *cmd, char **env); void ft_env(t_s_cmd *cmd, char **env);
int find_pwd(t_s_cmd *cmd); int find_pwd(t_s_cmd *cmd);

View File

@ -12,28 +12,30 @@
#include "../../includes/minishell.h" #include "../../includes/minishell.h"
// void join_variable(t_s_cmd *cmd, char **v_v, int size, char **tab) void ft_shlvl(char **env)
// { {
// char *str; int i;
// char *tmp; int index;
// char *str;
// while (tab[size])
// { i = 0;
// cmd->big_cmd->env[size] = ft_strdup(tab[size]); index = find_it(env, "SHLVL");
// // printf("tmp----%s\n", tmp[size]); if (index != -1)
// // printf("envy---%s\n", cmd->big_cmd->env[size]); {
// size++; while (env[index][i] && env[index][i] != '=')
// } i++;
// str = ft_strjoin(v_v[0], "="); str = ft_substr(env[index], i + 1, ft_strlen(env[index]));
// tmp = ft_strdup(str); i = ft_atoi(str);
// free(str); free (str);
// str = ft_strjoin(tmp,v_v[1]); i += 1;
// cmd->big_cmd->env[size] = ft_strdup(str); str = ft_itoa(i);
// printf("ici\n"); free (env[index]);
// free(str); env[index] = ft_strjoin("SHLVL=", str);
// free(tmp); free (str);
// cmd->big_cmd->env[size + 1] = NULL; printf("%s\n", env[index]);
// }
}
}
void register_env(t_s_cmd *cmd, char *variable) void register_env(t_s_cmd *cmd, char *variable)
{ {

View File

@ -142,6 +142,7 @@ int main(int ac, char **av, char **path)
printf("---MINISHELL START---\n"); printf("---MINISHELL START---\n");
signal(SIGINT, crtl_c); signal(SIGINT, crtl_c);
//signal(SIGQUIT, sig_quit); //signal(SIGQUIT, sig_quit);
ft_shlvl(env);
print_prompt(env); print_prompt(env);
return (0); return (0);
} }