All moving on the shcat_c folder
This commit is contained in:
parent
dffb6ea577
commit
20391637b6
19 changed files with 36 additions and 39 deletions
|
|
@ -1,39 +0,0 @@
|
|||
/* ************************************************************************** */
|
||||
/* */
|
||||
/* ::: :::::::: */
|
||||
/* ft_cmd.c :+: :+: :+: */
|
||||
/* +:+ +:+ +:+ */
|
||||
/* By: rparodi <rparodi@student.42.fr> +#+ +:+ +#+ */
|
||||
/* +#+#+#+#+#+ +#+ */
|
||||
/* Created: 2024/04/01 01:00:30 by rparodi #+# #+# */
|
||||
/* Updated: 2024/04/01 15:48:48 by rparodi ### ########.fr */
|
||||
/* */
|
||||
/* ************************************************************************** */
|
||||
|
||||
#include "../includes/minishell.h"
|
||||
|
||||
void ft_exec_cmd(t_utils *utils, char *cmd, char *cmd_args)
|
||||
{
|
||||
const char **args = (const char **)ft_split(cmd_args, ' ');
|
||||
|
||||
if (execve(cmd, (char *const *)args, (char *const *)utils->envp) == -1)
|
||||
{
|
||||
ft_free_strs((char **)args);
|
||||
ft_exit(utils, 1);
|
||||
}
|
||||
}
|
||||
|
||||
void ft_other_cmd(t_utils *shcat, t_usize i)
|
||||
{
|
||||
pid_t pid;
|
||||
t_i32 options;
|
||||
|
||||
printf("ft_other_cmd = %s\n", shcat->strs_input[i]);
|
||||
options = 0;
|
||||
pid = fork();
|
||||
if (pid == -1)
|
||||
ft_exit(shcat, 1);
|
||||
if (pid == 0)
|
||||
ft_exec_cmd(shcat, shcat->strs_input[i], NULL);
|
||||
waitpid(pid, NULL, options);
|
||||
}
|
||||
|
|
@ -1,20 +0,0 @@
|
|||
/* ************************************************************************** */
|
||||
/* */
|
||||
/* ::: :::::::: */
|
||||
/* ft_echo.c :+: :+: :+: */
|
||||
/* +:+ +:+ +:+ */
|
||||
/* By: rparodi <rparodi@student.42.fr> +#+ +:+ +#+ */
|
||||
/* +#+#+#+#+#+ +#+ */
|
||||
/* Created: 2024/03/31 21:48:04 by rparodi #+# #+# */
|
||||
/* Updated: 2024/03/31 21:51:41 by rparodi ### ########.fr */
|
||||
/* */
|
||||
/* ************************************************************************** */
|
||||
|
||||
#include "../includes/minishell.h"
|
||||
|
||||
void ft_echo(t_str txt, t_str flag)
|
||||
{
|
||||
printf("%s", txt);
|
||||
if (ft_strcmp(flag, "-n") != 0)
|
||||
printf("\n");
|
||||
}
|
||||
|
|
@ -1,47 +0,0 @@
|
|||
/* ************************************************************************** */
|
||||
/* */
|
||||
/* ::: :::::::: */
|
||||
/* ft_exit.c :+: :+: :+: */
|
||||
/* +:+ +:+ +:+ */
|
||||
/* By: rparodi <rparodi@student.42.fr> +#+ +:+ +#+ */
|
||||
/* +#+#+#+#+#+ +#+ */
|
||||
/* Created: 2024/03/29 11:35:51 by rparodi #+# #+# */
|
||||
/* Updated: 2024/04/01 18:21:22 by rparodi ### ########.fr */
|
||||
/* */
|
||||
/* ************************************************************************** */
|
||||
|
||||
#include "../includes/minishell.h"
|
||||
|
||||
void ft_free_strs(t_str *strs)
|
||||
{
|
||||
t_usize i;
|
||||
|
||||
i = 0;
|
||||
while (strs[i])
|
||||
{
|
||||
free(strs[i]);
|
||||
i++;
|
||||
}
|
||||
free(strs);
|
||||
}
|
||||
|
||||
void ft_free_utils(t_utils *s)
|
||||
{
|
||||
if (s->name_shell)
|
||||
free(s->name_shell);
|
||||
if (s->str_input)
|
||||
free(s->str_input);
|
||||
if (s->strs_input)
|
||||
ft_free_strs(s->strs_input);
|
||||
if (s->path)
|
||||
ft_free_strs(s->path);
|
||||
free(s);
|
||||
}
|
||||
|
||||
void ft_exit(t_utils *maiboyerlpb, t_u8 exit_status)
|
||||
{
|
||||
if (maiboyerlpb != NULL)
|
||||
ft_free_utils(maiboyerlpb);
|
||||
printf("exit\n");
|
||||
exit(exit_status);
|
||||
}
|
||||
|
|
@ -1,35 +0,0 @@
|
|||
/* ************************************************************************** */
|
||||
/* */
|
||||
/* ::: :::::::: */
|
||||
/* ft_pwd.c :+: :+: :+: */
|
||||
/* +:+ +:+ +:+ */
|
||||
/* By: rparodi <rparodi@student.42.fr> +#+ +:+ +#+ */
|
||||
/* +#+#+#+#+#+ +#+ */
|
||||
/* Created: 2024/03/31 22:14:33 by rparodi #+# #+# */
|
||||
/* Updated: 2024/03/31 22:27:33 by rparodi ### ########.fr */
|
||||
/* */
|
||||
/* ************************************************************************** */
|
||||
|
||||
#include "../includes/minishell.h"
|
||||
|
||||
void ft_pwd(void)
|
||||
{
|
||||
t_str str;
|
||||
t_usize size;
|
||||
|
||||
size = 1024;
|
||||
str = (t_str)ft_calloc((size + 1), sizeof(t_i8));
|
||||
if (str == NULL)
|
||||
ft_exit(NULL, 0);
|
||||
while (getcwd(str, size) == NULL) {
|
||||
if (str)
|
||||
free(str);
|
||||
size *= 2;
|
||||
str = (t_str)ft_calloc(sizeof(t_i8), size);
|
||||
if (str == NULL) {
|
||||
ft_exit(NULL, 0);
|
||||
}
|
||||
}
|
||||
printf("%s\n", str);
|
||||
free(str);
|
||||
}
|
||||
135
sources/main.c
135
sources/main.c
|
|
@ -1,135 +0,0 @@
|
|||
/* ************************************************************************** */
|
||||
/* */
|
||||
/* ::: :::::::: */
|
||||
/* main.c :+: :+: :+: */
|
||||
/* +:+ +:+ +:+ */
|
||||
/* By: rparodi <rparodi@student.42.fr> +#+ +:+ +#+ */
|
||||
/* +#+#+#+#+#+ +#+ */
|
||||
/* Created: 2024/03/28 14:40:38 by rparodi #+# #+# */
|
||||
/* Updated: 2024/04/01 18:17:41 by rparodi ### ########.fr */
|
||||
/* */
|
||||
/* ************************************************************************** */
|
||||
|
||||
#include "../includes/minishell.h"
|
||||
|
||||
t_i32 ft_check_type_operators(t_str *operators)
|
||||
{
|
||||
t_usize i;
|
||||
|
||||
i = 0;
|
||||
while (operators[i])
|
||||
{
|
||||
if (ft_strcmp(operators[i], ">") == 0)
|
||||
printf("Have to redirect in the file\n");
|
||||
else if (ft_strcmp(operators[i], ">>") == 0)
|
||||
printf("Have to redirect at the end of the file after\n");
|
||||
else if (ft_strcmp(operators[i], ">&") == 0)
|
||||
printf("Have to redirect the stdout in the file\n");
|
||||
else if (ft_strcmp(operators[i], "<") == 0)
|
||||
printf("Have to redirect at the end of the file before\n");
|
||||
else if (ft_strcmp(operators[i], "<<") == 0)
|
||||
printf("Have to redirect at the end of the file after\n");
|
||||
else if (ft_strcmp(operators[i], "<&") == 0)
|
||||
printf("Have to redirect the stdout in the file\n");
|
||||
else if (ft_strcmp(operators[i], ";") == 0)
|
||||
printf("Have to execute one more command\n");
|
||||
else if (ft_strcmp(operators[i], ";") == 0)
|
||||
printf("Have to execute one more command\n");
|
||||
else if (ft_strcmp(operators[i], "|") == 0)
|
||||
printf("I have to pipe a operators !\n");
|
||||
else if (ft_strcmp(operators[i], "||") == 0)
|
||||
printf("Or something\n");
|
||||
else if (ft_strcmp(operators[i], "&&") == 0)
|
||||
printf("Only if the first has exit status 0\n");
|
||||
else if (ft_strcmp(operators[i], "&") == 0)
|
||||
printf("Parreil mais chelou\n");
|
||||
else
|
||||
return (0);
|
||||
i++;
|
||||
}
|
||||
return (1);
|
||||
}
|
||||
|
||||
void ft_check(t_utils *shcat, char **input)
|
||||
{
|
||||
t_usize i;
|
||||
|
||||
i = 0;
|
||||
while (input[i] != NULL)
|
||||
{
|
||||
if (ft_check_type_operators(input) == 1)
|
||||
printf("Operateur\n");
|
||||
else
|
||||
{
|
||||
if (ft_strcmp(input[i], "exit") == 0)
|
||||
ft_exit(shcat, 0);
|
||||
else if (ft_strcmp(input[i], "pwd") == 0)
|
||||
ft_pwd();
|
||||
else if (ft_strcmp(input[i], "cmd") == 0)
|
||||
ft_echo("ECHO MAIS PAS ARG BORDEL !\n", "flag");
|
||||
else
|
||||
ft_other_cmd(shcat, i);
|
||||
}
|
||||
i++;
|
||||
}
|
||||
}
|
||||
|
||||
void ft_take_args(t_utils *shcat)
|
||||
{
|
||||
t_i32 i;
|
||||
|
||||
i = 0;
|
||||
while (1)
|
||||
{
|
||||
shcat->str_input = readline((t_const_str)shcat->name_shell);
|
||||
if (!shcat->str_input)
|
||||
ft_exit(shcat, 0);
|
||||
shcat->strs_input = ft_split(shcat->str_input, ' ');
|
||||
if (!shcat->strs_input)
|
||||
exit(1);
|
||||
ft_check(shcat, shcat->strs_input);
|
||||
add_history(shcat->str_input);
|
||||
ft_free_strs(shcat->strs_input);
|
||||
free(shcat->str_input);
|
||||
i++;
|
||||
}
|
||||
}
|
||||
|
||||
void ft_init_arge(t_str arge[], t_utils *utils)
|
||||
{
|
||||
size_t i;
|
||||
char *temp;
|
||||
|
||||
i = 0;
|
||||
temp = NULL;
|
||||
while (arge[i] != NULL)
|
||||
{
|
||||
if (arge[i][0] == 'P' && arge[i][1] == 'A' && arge[i][2] == 'T' && \
|
||||
arge[i][3] == 'H' && arge[i][4] == '=')
|
||||
{
|
||||
temp = ft_strdup(arge[i] + 5);
|
||||
if (!temp)
|
||||
ft_exit(utils, 1);
|
||||
else
|
||||
utils->path = ft_split(temp, ':');
|
||||
break ;
|
||||
}
|
||||
i++;
|
||||
}
|
||||
if (temp != NULL)
|
||||
free(temp);
|
||||
}
|
||||
|
||||
t_i32 main(t_i32 argc, t_str argv[], t_str arge[])
|
||||
{
|
||||
t_utils *shcat;
|
||||
|
||||
shcat = (t_utils *)ft_calloc(sizeof(t_utils), 1);
|
||||
if (argc == 2)
|
||||
shcat->name_shell = ft_strdup(strcat(argv[1], " > "));
|
||||
else
|
||||
shcat->name_shell = ft_strdup("shcat > ");
|
||||
shcat->envp = arge;
|
||||
ft_init_arge(arge, shcat);
|
||||
ft_take_args(shcat);
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue