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

Merge branch 'master' into sadjigui

Browse Source
This commit is contained in:
PrStein 2022-04-09 21:28:02 +02:00
commit 12529d99a5
5 changed files with 41 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -6,7 +6,7 @@
# By: apommier <apommier@student.42.fr> +#+ +:+ +#+ # # By: apommier <apommier@student.42.fr> +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ # # +#+#+#+#+#+ +#+ #
# Created: 2022/03/06 12:50:24 by apommier #+# #+# # # Created: 2022/03/06 12:50:24 by apommier #+# #+# #
# Updated: 2022/04/05 04:11:33 by apommier ### ########.fr # # Updated: 2022/04/09 21:11:51 by apommier ### ########.fr #
# # # #
# **************************************************************************** # # **************************************************************************** #
@ -25,6 +25,7 @@ SRCS = srcs/main.c\
srcs/built_in/utils_builtin.c\ srcs/built_in/utils_builtin.c\
srcs/built_in/init_builtin.c\ srcs/built_in/init_builtin.c\
srcs/built_in/export2.c\ srcs/built_in/export2.c\
srcs/built_in/env.c\
srcs/built_in/choose_builtin.c srcs/built_in/choose_builtin.c
OBJS = ${SRCS:.c=.o} OBJS = ${SRCS:.c=.o}
CC = clang CC = clang

5
includes/minishell.h
View File

@ -6,7 +6,7 @@
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */ /* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2022/03/09 22:33:49 by apommier #+# #+# */ /* Created: 2022/03/09 22:33:49 by apommier #+# #+# */
/* Updated: 2022/04/09 18:48:25 by apommier ### ########.fr */ /* Updated: 2022/04/09 21:24:05 by apommier ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -97,6 +97,7 @@ void lone_export(t_s_cmd *cmd);
void find_variable(char *variable, t_s_cmd *cmd); void find_variable(char *variable, t_s_cmd *cmd);
//real builtin //real builtin
void print_env(char **tab);
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); void ft_export(t_s_cmd *cmd);
@ -107,6 +108,6 @@ void open_directory(t_s_cmd *cmd);//cd
//parse builtin //parse builtin
int is_builtin(char *cmd); int is_builtin(char *cmd);
void call_builtin(t_cmd *cmd, char **env); void call_builtin(t_cmd *cmd);
#endif #endif

6
srcs/built_in/choose_builtin.c
View File

@ -6,7 +6,7 @@
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */ /* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2022/02/28 17:12:52 by sadjigui #+# #+# */ /* Created: 2022/02/28 17:12:52 by sadjigui #+# #+# */
/* Updated: 2022/04/09 05:00:15 by apommier ### ########.fr */ /* Updated: 2022/04/09 21:24:02 by apommier ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -29,10 +29,10 @@ int is_builtin(char *cmd)
return (0); return (0);
} }
void call_builtin(t_cmd *cmd, char **env) void call_builtin(t_cmd *cmd)
{ {
if (!ft_strcmp(cmd->current_s_cmd->cmd, "env")) if (!ft_strcmp(cmd->current_s_cmd->cmd, "env"))
print_double_fd(env, 0); print_env(cmd->env);
if (!ft_strcmp(cmd->current_s_cmd->cmd, "export")) if (!ft_strcmp(cmd->current_s_cmd->cmd, "export"))
ft_export(cmd->current_s_cmd); ft_export(cmd->current_s_cmd);
if (!ft_strcmp(cmd->current_s_cmd->cmd, "unset")) if (!ft_strcmp(cmd->current_s_cmd->cmd, "unset"))

32
srcs/built_in/env.c Normal file
View File

@ -0,0 +1,32 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* env.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2022/04/09 21:09:47 by apommier #+# #+# */
/* Updated: 2022/04/09 21:23:45 by apommier ### ########.fr */
/* */
/* ************************************************************************** */
#include "../../includes/minishell.h"
void print_env(char **tab)
{
int i;
i = 0;
if (tab)
{
while (tab[i])
{
if (ft_strchr(tab[i], '='))
{
ft_putstr_fd(tab[i], 1);
ft_putstr_fd("\n", 1);
}
i++;
}
}
}

30
srcs/set_redirection/redirection.c
View File

@ -6,7 +6,7 @@
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */ /* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2022/03/09 15:18:58 by apommier #+# #+# */ /* Created: 2022/03/09 15:18:58 by apommier #+# #+# */
/* Updated: 2022/04/09 19:04:35 by apommier ### ########.fr */ /* Updated: 2022/04/09 21:05:43 by apommier ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -25,42 +25,30 @@ char *cut_str(char *str, int start, int end)
char *swap; char *swap;
char *del; char *del;
//printf("before cut :%s\n", str);
del = str; del = str;
swap = ft_strjoin(&str[end], 0); swap = ft_strjoin(&str[end], 0);
//printf("&str[start] :%s\n", &str[start]);
str[start] = 0; str[start] = 0;
str = ft_strjoin(str, swap); str = ft_strjoin(str, swap);
free(del); free(del);
free(swap); free(swap);
//printf("after cut :%s\n", str);
return (str); return (str);
} }
char *get_word(char *str, int start) char *get_word(char *str, int start)
{ {
char *new; char *new;
//char *swap;
int i; int i;
i = 0; i = 0;
//printf("str de get_word %s\n", str);
while (str[start + i] == '<' || str[start + i] == '>') while (str[start + i] == '<' || str[start + i] == '>')
i++; i++;
while (str[start + i] == ' ') while (str[start + i] == ' ')
i++; i++;
//printf("srt= %s\n", &str[start + i]);
new = ft_strjoin(&str[start + i], 0); new = ft_strjoin(&str[start + i], 0);
//printf("char= %c\n",new[end - start - i]);
//printf("char str= %s end=%d start=%d out=%d\n", &new[0], end, start, end - start - i - 1);
i = 0; i = 0;
while (new[i] && new[i] != ' ' && new[i] != '>' && new[i] != '<') while (new[i] && new[i] != ' ' && new[i] != '>' && new[i] != '<')
i++; i++;
new[i] = 0; new[i] = 0;
//new[end - start - start] = 0;
//swap = new;
//new = ft_strjoin(&new[i], 0);
//free(swap);
printf("get word= %s\n", new); printf("get word= %s\n", new);
return (new); return (new);
} }
@ -76,7 +64,6 @@ char *set_input(char *line, t_s_cmd *cmd, int index)
int i; int i;
int word_index; int word_index;
//printf("&line[index] :%s\n", &line[index]);
word_index = 0; word_index = 0;
i = index; i = index;
i++; i++;
@ -97,7 +84,6 @@ char *set_output(char *line, t_s_cmd *cmd, int index)
int i; int i;
int word_index; int word_index;
//printf("&line[index] :%s\n", &line[index]);
word_index = 0; word_index = 0;
i = index; i = index;
i++; i++;
@ -177,17 +163,11 @@ char **add_line(char **tab, char *line)
ret = 0; ret = 0;
if (tab) if (tab)
size = double_size(tab); size = double_size(tab);
//printf("size= %d\n", size);
ret = ft_calloc(size + 2, sizeof(char*)); ret = ft_calloc(size + 2, sizeof(char*));
if (!ret) if (!ret)
{
// if (tab)
// free_double(tab);
return (0); return (0);
}
while (tab && tab[i]) while (tab && tab[i])
{ {
//printf("tab[i]= %s\n", tab[i]);
ret[i] = ft_strjoin(tab[i], 0); ret[i] = ft_strjoin(tab[i], 0);
i++; i++;
} }
@ -206,7 +186,6 @@ char *set_heredoc(int index, char **in)
int i; int i;
i = 0; i = 0;
//print_double_fd(in, 1);
if (index) if (index)
{ {
nbr_file = ft_itoa(index + 1); nbr_file = ft_itoa(index + 1);
@ -231,27 +210,20 @@ void wait_prompt(t_s_cmd *cmd, int index)
history = 0; history = 0;
input = 0; input = 0;
//printf("-%s-\n", cmd->infile);
while (ft_strcmp(input, cmd->infile)) while (ft_strcmp(input, cmd->infile))
{ {
ft_putstr_fd("> ", 0); ft_putstr_fd("> ", 0);
input = get_next_line(0); input = get_next_line(0);
//printf("input = -%s-\n", input);
if (!input) if (!input)
return ; return ;
input[ft_strlen(input) - 1] = 0; input[ft_strlen(input) - 1] = 0;
//printf("input2 = -%s-\n", input);
if (ft_strcmp(input, cmd->infile)) if (ft_strcmp(input, cmd->infile))
history = add_line(history, input); history = add_line(history, input);
//print_double(history);
} }
//print_double(history);
//free_double(history);
free(input); free(input);
free(cmd->infile); free(cmd->infile);
cmd->infile = 0;//option? cmd->infile = 0;//option?
cmd->infile = set_heredoc(index, history); cmd->infile = set_heredoc(index, history);
//cmd->infile = 0;
cmd->in_type = 0; cmd->in_type = 0;
} }