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

<< start working

Browse Source
This commit is contained in:
kinou-p 2022-03-12 00:26:18 +01:00
parent 610073ec06
commit c27d653eaf
2 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
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/03/11 16:57:53 by apommier ### ########.fr */ /* Updated: 2022/03/11 23:24:09 by apommier ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -174,23 +174,28 @@ char **add_line(char **tab, char *line)
int i; int i;
i = 0; i = 0;
size = double_size(tab); size = 0;
ret = malloc(sizeof(char *) * size + 2); ret = 0;
if (tab)
size = double_size(tab);
//printf("size= %d\n", size);
ret = ft_calloc(size + 2, sizeof(char*));
if (!ret) if (!ret)
{ {
if (tab) // if (tab)
free_double(tab); // free_double(tab);
return (0); return (0);
} }
while (tab && tab[i]) while (tab && tab[i])
{ {
ret[i] == tab[i]; printf("tab[i]= %s\n", tab[i]);
ret[i] = ft_strjoin(tab[i], 0);
i++; i++;
} }
ret[i] = line; ret[i] = line;
ret[i + 1] = 0; ret[i + 1] = 0;
if (tab) //if (tab)
free_double(tab); // free_double(tab);
return(ret); return(ret);
} }
@ -205,8 +210,13 @@ void wait_prompt(t_s_cmd *cmd)
{ {
input = readline("> "); input = readline("> ");
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);
cmd->infile = 0;
} }
char *set_redirection(t_s_cmd *cmd, char *line) char *set_redirection(t_s_cmd *cmd, char *line)

6
srcs/set_redirection/utils.c
View File

@ -6,7 +6,7 @@
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */ /* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2022/03/11 16:35:37 by apommier #+# #+# */ /* Created: 2022/03/11 16:35:37 by apommier #+# #+# */
/* Updated: 2022/03/11 17:04:07 by apommier ### ########.fr */ /* Updated: 2022/03/11 23:28:49 by apommier ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -46,9 +46,9 @@ void print_double(char **tab)
{ {
while (tab[i]) while (tab[i])
{ {
printf("%d -%s-\n", i, tab[i]); dprintf(1 , "%d -%s-\n", i, tab[i]);
i++; i++;
} }
printf("end double\n"); dprintf(1 , "end double\n");
} }
} }