diff --git a/.cache/clangd/index/parsing.c.B79530D8B421E683.idx b/.cache/clangd/index/parsing.c.B79530D8B421E683.idx index 67e46c7..b9700ac 100644 Binary files a/.cache/clangd/index/parsing.c.B79530D8B421E683.idx and b/.cache/clangd/index/parsing.c.B79530D8B421E683.idx differ diff --git a/obj/src/main.o b/obj/src/main.o deleted file mode 100644 index 6065fca..0000000 Binary files a/obj/src/main.o and /dev/null differ diff --git a/obj/src/parsing/parsing.o b/obj/src/parsing/parsing.o deleted file mode 100644 index 5bcd4a8..0000000 Binary files a/obj/src/parsing/parsing.o and /dev/null differ diff --git a/obj/src/utils/ft_freetab.o b/obj/src/utils/ft_freetab.o deleted file mode 100644 index f8b2a9c..0000000 Binary files a/obj/src/utils/ft_freetab.o and /dev/null differ diff --git a/pipex b/pipex deleted file mode 100755 index 62e9c4c..0000000 Binary files a/pipex and /dev/null differ diff --git a/src/main.c b/src/main.c index 6c3294a..bd7f577 100644 --- a/src/main.c +++ b/src/main.c @@ -6,7 +6,7 @@ /* By: adjoly +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/03/21 10:03:04 by adjoly #+# #+# */ -/* Updated: 2024/03/30 13:22:17 by adjoly ### ########.fr */ +/* Updated: 2024/04/02 11:08:15 by adjoly ### ########.fr */ /* */ /* ************************************************************************** */ @@ -19,7 +19,7 @@ int main(int ac, char **av) t_pcmd *tmp; char **option_tmp; - cmd = parse_cmd(ac, av); + cmd = parse_cmd(ac, av + 2); tmp = cmd; while (tmp && (*tmp).cmd) { diff --git a/src/parsing/parsing.c b/src/parsing/parsing.c index eb8845c..42624eb 100644 --- a/src/parsing/parsing.c +++ b/src/parsing/parsing.c @@ -6,13 +6,28 @@ /* By: adjoly +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/03/22 21:13:26 by adjoly #+# #+# */ -/* Updated: 2024/03/30 12:01:17 by adjoly ### ########.fr */ +/* Updated: 2024/04/02 11:08:57 by adjoly ### ########.fr */ /* */ /* ************************************************************************** */ #include "parsing.h" #include "libft.h" +size_t ft_arrlen(char **arr) +{ + size_t len; + char **tmp; + + tmp = arr; + len = 0; + while (*tmp) + { + len += ft_strlen(*tmp); + tmp++; + } + return (len); +} + t_pcmd split_cmd(char *cmd_av) { char **split; @@ -21,8 +36,7 @@ t_pcmd split_cmd(char *cmd_av) split = ft_split(cmd_av, 32); tmp_split = split; - cmd.cmd = *tmp_split; - tmp_split++; + cmd.cmd = ft_strdup(*tmp_split); cmd.option = tmp_split; return (cmd); } @@ -34,9 +48,9 @@ t_pcmd *parse_cmd(int ac, char **av) t_pcmd *cmd_tmp; (void)ac; - cmd_arr = ft_calloc(10000, 1); + cmd_arr = ft_calloc(ac, sizeof(t_pcmd) + 1); cmd_tmp = cmd_arr; - tmp = av + 2; + tmp = av; while (*tmp) { *cmd_tmp = split_cmd(*tmp);