Kinou/Minishell
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'sadjigui'

Browse Source
This commit is contained in:
kinou-p 2022-04-15 01:14:03 +02:00
commit 20ca6b1b19
7 changed files with 61 additions and 177 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
includes/minishell.h
View File

@ -111,20 +111,20 @@ void lone_export(t_s_cmd *cmd);
int find_variable(char *variable, t_s_cmd *cmd); int find_variable(char *variable, t_s_cmd *cmd);
int find_it(char **str, char *s); int find_it(char **str, char *s);
int check_variable(char *variable); int check_variable(char *variable);
int cd_error_simple(char *str, int i); int cd_error(t_s_cmd *cmd, char *str, int i);
int msg_error(char *cmd, char *entry, char *error, int i); int msg_error(t_s_cmd *cmd, char *cm, char *entry, char *error, int i);
int size_path(char **str); int size_path(char **str);
int check_return(t_s_cmd *cmd, int var); int check_return(t_s_cmd *cmd, int var);
//real builtin //real builtin
void print_env(t_cmd *cmd); int print_env(t_cmd *cmd);
void ft_env(t_s_cmd *cmd, char **env); void ft_env(t_s_cmd *cmd, char **env);
void ft_exit(t_s_cmd *cmd); void ft_exit(t_s_cmd *cmd);
void ft_export(t_s_cmd *cmd); int ft_export(t_s_cmd *cmd);
void ft_unset(t_s_cmd *cmd); int ft_unset(t_s_cmd *cmd);
void ft_echo(t_s_cmd *cmd); int ft_echo(t_s_cmd *cmd);
void ft_pwd(t_s_cmd *cmd); int ft_pwd(t_s_cmd *cmd);
void open_directory(t_s_cmd *cmd);//cd int open_directory(t_s_cmd *cmd);//cd
//parse builtin //parse builtin
int is_builtin(char *cmd); int is_builtin(char *cmd);

25
srcs/built_in/cd.c
View File

@ -134,7 +134,7 @@ void check_home(t_s_cmd *cmd, char *p)
free(p); free(p);
} }
void open_directory(t_s_cmd *cmd) int open_directory(t_s_cmd *cmd)
{ {
char *p; char *p;
int j; int j;
@ -144,17 +144,17 @@ void open_directory(t_s_cmd *cmd)
j = size_path(cmd->big_cmd->env); j = size_path(cmd->big_cmd->env);
if (cmd->nb_args > 2) if (cmd->nb_args > 2)
{ {
ft_putstr_fd("Minishell: cd: too many arguments\n", 2); // ft_putstr_fd("Minishell: cd: too many arguments\n", 2);
return ; // return ;
// return (cd_erreur("Minishell: cd: too many arguments", 1)); return (cd_error(cmd, "Minishell: cd: too many arguments", 1));
} }
if (!cmd->args[1]) if (!cmd->args[1])
{ {
if (find_it(cmd->big_cmd->env, "HOME") < 0) if (find_it(cmd->big_cmd->env, "HOME") < 0)
{ {
ft_putstr_fd("Minishell: cd: HOME not set\n", 2); // ft_putstr_fd("Minishell: cd: HOME not set\n", 2);
return ; // return ;
// return (cd_erreur("Minishell: cd: HOME not set", 1)); return (cd_error(cmd, "Minishell: cd: HOME not set", 1));
} }
check_home(cmd, p); check_home(cmd, p);
} }
@ -169,12 +169,13 @@ void open_directory(t_s_cmd *cmd)
} }
else else
{ {
// return (msg_error("Minishell: cd: ", cmd->args[1], ": No such directory\n", 1)); return (msg_error(cmd, "Minishell: cd: ", cmd->args[1], ": No such directory\n", 1));
ft_putstr_fd("Minishell: cd: ", 2); // ft_putstr_fd("Minishell: cd: ", 2);
ft_putstr_fd(cmd->args[1], 2); // ft_putstr_fd(cmd->args[1], 2);
ft_putstr_fd(": No such directory\n", 2); // ft_putstr_fd(": No such directory\n", 2);
return ;//(1); // return ;//(1);
} }
} }
return (check_return(cmd, 0));
} }

130
srcs/built_in/echo.c
View File

@ -12,126 +12,7 @@
#include "../../includes/minishell.h" #include "../../includes/minishell.h"
// int jump_space(char *str, int i) int ft_echo(t_s_cmd *d)
// {
// int j;
// j = i;
// while (str[j] == ' ')
// j++;
// return (j);
// }
// void print_value(char *str, char *input)
// {
// (void)input;
// int i;
// i = 0;
// while (str[i] && str[i] != '=')
// i++;
// i++;
// ft_putstr_fd(str + i, 0);
// /*while (str[i])
// {
// ft_putchar(str[i]);
// i++;
// }*/
// }
// void print_rest(char *input, char *str, int j)
// {
// int i;
//
// i = 0;
// j -= 1;
// while (input[j++])
// printf("%c", input[j]);
// printf("\n");
// while (input[j] && input[j] == str[i])
// {
// i++;
// j++;
// }
// printf("str == %s\n", str);
// if (input[j] != '\0')
// {
// j = jump_space(input, j);
// if (input[j] != '\0')
// while(input[j])
// {
// ft_putchar(input[j]);
// j++;
// }
// else
// return;
// }
// else
// return ;
// }
// void find_for_print(t_s_cmd *cmd, char *input)
// {
// char *str;
// // char *tmp;
// int i;
// int x;
// i = 0;
// // j = j + 1;
// // tmp = ft_substr(input, j, find_len(input, j, 32));
// // printf("%c\n", input[j]);
// str = ft_strjoin(input, "=");
// x = ft_strlen(str);
// // printf("%d\n", x);
// while (cmd->big_cmd->env[i])
// {
// if (ft_strncmp(cmd->big_cmd->env[i], str, x) == 0)
// {
// // printf("%s\n", cmd->big_cmd->env[i]);
// break ;
// }
// i++;
// }
// if (cmd->big_cmd->env[i] != NULL)
// {
// print_value(cmd->big_cmd->env[i], input);
// // print_rest(input, tmp, j);
// }
// }
// int dollar_or_not(char *str)
// {
// int i;
// i = 0;
// while (str[i])
// {
// if (str[i] == '$')
// return (1);
// i++;
// }
// return (0);
// }
// void find_value(t_s_cmd *cmd, char *str)
// {
// // int i;
// //
// // i = 0;
// while (*str)
// {
// if (*str == '$')
// break ;
// printf("%c", *str);
// str++;
// }
// str++;
// find_for_print(cmd, str);
// }
void ft_echo(t_s_cmd *d)
{ {
int i; int i;
size_t j; size_t j;
@ -144,9 +25,6 @@ void ft_echo(t_s_cmd *d)
j = 1; j = 1;
while (d->args[i][j] && d->args[i][j] == 'n') while (d->args[i][j] && d->args[i][j] == 'n')
j++; j++;
// printf("---->%zu\n", j);
// printf("--->%zu\n", ft_strlen(d->args[i]));
if (j == ft_strlen(d->args[i])) if (j == ft_strlen(d->args[i]))
is_option = 1; is_option = 1;
else else
@ -156,16 +34,12 @@ void ft_echo(t_s_cmd *d)
if (d->args[i]) if (d->args[i])
while (d->args[i]) while (d->args[i])
{ {
// if (dollar_or_not(d->args[i]) == 1)
// find_value(d, d->args[i]);
// else
printf("%s", d->args[i]); printf("%s", d->args[i]);
if (d->args[i + 1] != NULL) if (d->args[i + 1] != NULL)
printf(" "); printf(" ");
i++; i++;
} }
// else
// my_putstr(input, i);
if (is_option == 0) if (is_option == 0)
printf("\n"); printf("\n");
return (check_return(d, 0));
} }

12
srcs/built_in/env.c
View File

@ -12,7 +12,7 @@
#include "../../includes/minishell.h" #include "../../includes/minishell.h"
void print_env(t_cmd *cmd) int print_env(t_cmd *cmd)
{ {
int i; int i;
@ -22,7 +22,7 @@ void print_env(t_cmd *cmd)
ft_putstr_fd("Minishell: env: '", 2); ft_putstr_fd("Minishell: env: '", 2);
ft_putstr_fd(cmd->current_s_cmd->args[1], 2); ft_putstr_fd(cmd->current_s_cmd->args[1], 2);
ft_putstr_fd("': No such file or directory\n", 2); ft_putstr_fd("': No such file or directory\n", 2);
// return (127); return (check_return(cmd, 127));
} }
else if (cmd->env) else if (cmd->env)
{ {
@ -33,10 +33,10 @@ void print_env(t_cmd *cmd)
i++; i++;
} }
} }
// return (0); return (check_return(cmd, 0));
} }
void ft_pwd(t_s_cmd *cmd) int ft_pwd(t_s_cmd *cmd)
{ {
(void)cmd; (void)cmd;
int i; int i;
@ -48,9 +48,9 @@ void ft_pwd(t_s_cmd *cmd)
if (!str) if (!str)
{ {
ft_putstr_fd("Minishell: pwd: Not found\n", 2); ft_putstr_fd("Minishell: pwd: Not found\n", 2);
// return (1); return (check_return(cmd, 1));
} }
else else
ft_putendl_fd(p, 1); ft_putendl_fd(p, 1);
// return (0); return (check_return(cmd, 0));
} }

11
srcs/built_in/export.c
View File

@ -59,7 +59,8 @@ int ft_export_variable(t_s_cmd *cmd, char *variable)
ft_putstr_fd("Minishell: export: `", 2); ft_putstr_fd("Minishell: export: `", 2);
ft_putstr_fd(variable, 2); ft_putstr_fd(variable, 2);
ft_putstr_fd("': not a valid identifier\n", 2); ft_putstr_fd("': not a valid identifier\n", 2);
return (1); return (check_return(cmd, 1));
} }
dest = ft_strdup(variable); dest = ft_strdup(variable);
unset = ft_substr(dest, 0, find_len(dest, 0, '=')); unset = ft_substr(dest, 0, find_len(dest, 0, '='));
@ -67,17 +68,18 @@ int ft_export_variable(t_s_cmd *cmd, char *variable)
{ {
cmd->big_cmd->env[find_it(cmd->big_cmd->env, unset)] = dest; cmd->big_cmd->env[find_it(cmd->big_cmd->env, unset)] = dest;
free(unset); free(unset);
return (0); return (check_return(cmd, 0));
} }
register_env(cmd, dest); register_env(cmd, dest);
if (dest) if (dest)
free(dest); free(dest);
if (unset) if (unset)
free(unset); free(unset);
return (0); return (check_return(cmd, 0));
} }
void ft_export(t_s_cmd *cmd) int ft_export(t_s_cmd *cmd)
{ {
int i; int i;
int j; int j;
@ -92,4 +94,5 @@ void ft_export(t_s_cmd *cmd)
j = ft_export_variable(cmd, cmd->args[i]); j = ft_export_variable(cmd, cmd->args[i]);
i++; i++;
} }
return (j);
} }

21
srcs/built_in/unset.c
View File

@ -14,8 +14,8 @@
void unset_variable(t_s_cmd *cmd, int i) void unset_variable(t_s_cmd *cmd, int i)
{ {
int a; int a;
int b; int b;
char **tmp; char **tmp;
a = 0; a = 0;
@ -39,12 +39,6 @@ void unset_variable(t_s_cmd *cmd, int i)
if (!cmd->big_cmd->env) if (!cmd->big_cmd->env)
printf("no env\n"); printf("no env\n");
cmd->big_cmd->env = ft_dup_double(tmp); cmd->big_cmd->env = ft_dup_double(tmp);
// while (tmp[a])
// {
// cmd->big_cmd->env[a] = ft_strdup(tmp[a]);
// a++;
// }
// cmd->big_cmd->env[a] = NULL;
if (tmp) if (tmp)
free_double(tmp); free_double(tmp);
} }
@ -61,15 +55,16 @@ int find_variable(char *variable, t_s_cmd *cmd)
ft_putstr_fd("Minishell: unset: `", 2); ft_putstr_fd("Minishell: unset: `", 2);
ft_putstr_fd(variable, 2); ft_putstr_fd(variable, 2);
ft_putstr_fd("': not a valid identifier\n", 2); ft_putstr_fd("': not a valid identifier\n", 2);
return (2); return (check_return(cmd, 2));
} }
if (i == tab_len(cmd->big_cmd->env)) if (i == tab_len(cmd->big_cmd->env))
return (2); return (check_return(cmd, 2));
unset_variable(cmd, i); unset_variable(cmd, i);
return (0); return (check_return(cmd, 1));
} }
void ft_unset(t_s_cmd *cmd) int ft_unset(t_s_cmd *cmd)
{ {
int i; int i;
int j; int j;
@ -81,5 +76,5 @@ void ft_unset(t_s_cmd *cmd)
j = find_variable(cmd->args[i], cmd); j = find_variable(cmd->args[i], cmd);
i++; i++;
} }
// return (j); return (j);
} }

21
srcs/built_in/utils_builtin.c
View File

@ -35,19 +35,19 @@ int find_it(char **str, char *s)
return (i); return (i);
} }
int cd_error_simple(char *str, int i) int cd_error(t_s_cmd *cmd, char *str, int i)
{ {
ft_putstr_fd(str, 2); ft_putstr_fd(str, 2);
ft_putstr_fd("\n", 2); ft_putstr_fd("\n", 2);
return (i); return (check_return(cmd, i));
} }
int msg_error(char *cmd, char *entry, char *error, int i) int msg_error(t_s_cmd *cmd, char *cm, char *entry, char *error, int i)
{ {
ft_putstr_fd(cmd, 2); ft_putstr_fd(cm, 2);
ft_putstr_fd(entry, 2); ft_putstr_fd(entry, 2);
ft_putstr_fd(error, 2); ft_putstr_fd(error, 2);
return (i); return (check_return(cmd, i));
} }
int size_path(char **str) int size_path(char **str)
@ -62,3 +62,14 @@ int size_path(char **str)
free_double(s); free_double(s);
return (j); return (j);
} }
int check_return(t_s_cmd *cmd, int var)
{
if (cmd->big_cmd->current_s_cmd->child)
{
cmd->big_cmd->err_var = var;
return (var);
}
else
exit(var);
}