42_adjoly/ft_minipowershell
1
0
Fork 0
mirror of https://github.com/KeyZox71/ft_minipowershell.git synced 2025-03-15 19:36:50 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

「🎉」 init: Merged adjoly

Browse Source
This commit is contained in:
Adam JOLY
2024-06-04 13:26:32 +02:00
parent 0e572cd344 e6e7a823d4
commit 7455f17209
4 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/parsing.h
View File

@ -6,7 +6,7 @@
/* By: adjoly <adjoly@student.42angouleme.fr> +#+ +:+ +#+ */ /* By: adjoly <adjoly@student.42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/04/25 12:20:26 by adjoly #+# #+# */ /* Created: 2024/04/25 12:20:26 by adjoly #+# #+# */
/* Updated: 2024/05/31 13:17:38 by adjoly ### ########.fr */ /* Updated: 2024/06/04 13:15:24 by adjoly ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -19,7 +19,7 @@
typedef struct s_cmd typedef struct s_cmd
{ {
char *cmd; char *cmd;
char *argv; char **argv;
int infile; int infile;
int outfile; int outfile;
} t_cmd; } t_cmd;

11
src/parsing/debug_print.c
View File

@ -48,6 +48,9 @@ void print_token(t_token *token)
void print_cmd(t_cmd *cmd) void print_cmd(t_cmd *cmd)
{ {
char **tmp;
tmp = cmd->argv;
ft_putstr_fd("INFILE fd : ", STDOUT_FILENO); ft_putstr_fd("INFILE fd : ", STDOUT_FILENO);
ft_putnbr_fd(cmd->infile, STDOUT_FILENO); ft_putnbr_fd(cmd->infile, STDOUT_FILENO);
ft_putchar_fd('\n', STDOUT_FILENO); ft_putchar_fd('\n', STDOUT_FILENO);
@ -57,5 +60,11 @@ void print_cmd(t_cmd *cmd)
ft_putstr_fd("cmd : ", STDOUT_FILENO); ft_putstr_fd("cmd : ", STDOUT_FILENO);
ft_putendl_fd(cmd->cmd, STDOUT_FILENO); ft_putendl_fd(cmd->cmd, STDOUT_FILENO);
ft_putstr_fd("argv : ", STDOUT_FILENO); ft_putstr_fd("argv : ", STDOUT_FILENO);
ft_putendl_fd(cmd->argv, STDOUT_FILENO); while (*tmp)
{
ft_putstr_fd(*tmp, STDOUT_FILENO);
ft_putchar_fd(' ', STDOUT_FILENO);
tmp++;
}
ft_putchar_fd('\n', STDOUT_FILENO);
} }

7
src/parsing/split_cmd.c
View File

@ -6,7 +6,7 @@
/* By: adjoly <adjoly@student.42angouleme.fr> +#+ +:+ +#+ */ /* By: adjoly <adjoly@student.42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/05/04 15:00:32 by adjoly #+# #+# */ /* Created: 2024/05/04 15:00:32 by adjoly #+# #+# */
/* Updated: 2024/05/31 12:57:18 by adjoly ### ########.fr */ /* Updated: 2024/06/04 13:15:47 by adjoly ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -21,9 +21,6 @@ t_cmd *split_cmd(char *cmd_av, t_cmd *cmd)
tmp = cmd_av; tmp = cmd_av;
split = ft_split(cmd_av, ' '); split = ft_split(cmd_av, ' ');
cmd->cmd = ft_strdup(*split); cmd->cmd = ft_strdup(*split);
ft_free("a", &split); cmd->argv = split;
while (*tmp && *tmp == ' ')
tmp++;
cmd->argv = ft_strdup(tmp);
return (cmd); return (cmd);
} }

4
src/parsing/tokenizer/__to_token.c
View File

@ -6,7 +6,7 @@
/* By: adjoly <adjoly@student.42angouleme.fr> +#+ +:+ +#+ */ /* By: adjoly <adjoly@student.42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/05/20 21:05:04 by adjoly #+# #+# */ /* Created: 2024/05/20 21:05:04 by adjoly #+# #+# */
/* Updated: 2024/05/30 16:37:16 by adjoly ### ########.fr */ /* Updated: 2024/05/31 19:55:28 by adjoly ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -31,8 +31,6 @@ size_t __get_sizeof_redir(char *redir_s, t_redirection *redir)
while (*++tmp && *tmp == ' ') while (*++tmp && *tmp == ' ')
i++; i++;
i += ft_strlen(redir->file_name); i += ft_strlen(redir->file_name);
//if (redir->sign == OUT_APPEND || redir->sign == HEREDOC)
//i++;
return (i); return (i);
} }