diff --git a/.cache/clangd/index/ft_printf.h.8A857667DE5A4FFB.idx b/.cache/clangd/index/ft_printf.h.8A857667DE5A4FFB.idx new file mode 100644 index 0000000..d7b1533 Binary files /dev/null and b/.cache/clangd/index/ft_printf.h.8A857667DE5A4FFB.idx differ diff --git a/.cache/clangd/index/get_next_line.h.94D3322A304D1F0E.idx b/.cache/clangd/index/get_next_line.h.94D3322A304D1F0E.idx new file mode 100644 index 0000000..4764a45 Binary files /dev/null and b/.cache/clangd/index/get_next_line.h.94D3322A304D1F0E.idx differ diff --git a/.cache/clangd/index/libft.h.F7455B850A972A1D.idx b/.cache/clangd/index/libft.h.F7455B850A972A1D.idx new file mode 100644 index 0000000..a24faff Binary files /dev/null and b/.cache/clangd/index/libft.h.F7455B850A972A1D.idx differ diff --git a/.cache/clangd/index/main.c.259C23514E408AC0.idx b/.cache/clangd/index/main.c.259C23514E408AC0.idx new file mode 100644 index 0000000..87663a2 Binary files /dev/null and b/.cache/clangd/index/main.c.259C23514E408AC0.idx differ diff --git a/Makefile b/Makefile index 7b267d3..1cb6e1f 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ # By: adjoly +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2023/11/01 11:03:22 by adjoly #+# #+# # -# Updated: 2024/03/21 10:10:54 by adjoly ### ########.fr # +# Updated: 2024/03/28 21:59:20 by adjoly ### ########.fr # # # # **************************************************************************** # @@ -18,9 +18,15 @@ OBJSDIR = obj/ SRCDIR = src/ -SRCS = main.c \ +SRC = $(shell find src -name '*.c') -OBJS = $(addprefix $(OBJSDIR), $(SRCS:.c=.o)) +I_DIR = include/ + +LIBFT_DIR = libft/ + +INCLUDE = -I $(I_DIR) -I $(LIBFT_DIR) + +OBJS = $(addprefix $(OBJSDIR), $(SRC:.c=.o)) FLAGS = -Werror -Wall -Wextra -g @@ -31,9 +37,9 @@ $(NAME): $(OBJS) @$(CC) $(FLAGS) $(OBJS) $(LIB) -o $(NAME) @echo "[✔] Compiled" -$(OBJSDIR)%.o: $(SRCDIR)%.c +$(OBJSDIR)%.o: %.c @mkdir -p $(@D) - @$(CC) $(FLAGS) $< -c -o $@ + @$(CC) $(INCLUDE) $(FLAGS) $< -c -o $@ @echo "[✔] $< compiled" all: $(NAME) diff --git a/compile_commands.json b/compile_commands.json new file mode 100644 index 0000000..ee1a673 --- /dev/null +++ b/compile_commands.json @@ -0,0 +1,21 @@ +[ + { + "directory": "/nfs/homes/adjoly/Documents/pipex", + "arguments": [ + "cc", + "-I", + "include/", + "-I", + "libft/", + "-Werror", + "-Wall", + "-Wextra", + "-g", + "src/main.c", + "-c", + "-o", + "obj/main.o" + ], + "file": "src/main.c" + } +] diff --git a/obj/src/main.o b/obj/src/main.o new file mode 100644 index 0000000..7e42941 Binary files /dev/null and b/obj/src/main.o differ diff --git a/pipex b/pipex new file mode 100755 index 0000000..0f714d9 Binary files /dev/null and b/pipex differ diff --git a/src/main.c b/src/main.c index 0d3be0d..03d9803 100644 --- a/src/main.c +++ b/src/main.c @@ -6,11 +6,14 @@ /* By: adjoly +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/03/21 10:03:04 by adjoly #+# #+# */ -/* Updated: 2024/03/22 21:12:44 by adjoly ### ########.fr */ +/* Updated: 2024/03/28 23:04:32 by adjoly ### ########.fr */ /* */ /* ************************************************************************** */ +#include "libft.h" + int main(int ac, char **av) { - + ft_putstr_fd(*av, 1); + return (ac); } diff --git a/src/parsing.c b/src/parsing/parsing.c similarity index 73% rename from src/parsing.c rename to src/parsing/parsing.c index b507e03..fce33e2 100644 --- a/src/parsing.c +++ b/src/parsing/parsing.c @@ -6,8 +6,29 @@ /* By: adjoly +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/03/22 21:13:26 by adjoly #+# #+# */ -/* Updated: 2024/03/22 21:13:45 by adjoly ### ########.fr */ +/* Updated: 2024/03/28 22:37:50 by adjoly ### ########.fr */ /* */ /* ************************************************************************** */ +#include "parsing.h" +#include "libft.h" + +t_pcmd split_cmd(char *cmd) +{ + char **split; + t_pcmd cmd; + + split = ft_split(cmd, 32); +} + +t_pcmd *parse_cmd(int ac, char **av) +{ + char **tmp; + + tmp = av + 1; + while (*tmp) + { + tmp++; + } +} diff --git a/src/parsing/parsing.h b/src/parsing/parsing.h new file mode 100644 index 0000000..e9852ba --- /dev/null +++ b/src/parsing/parsing.h @@ -0,0 +1,24 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* parsing.h :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: adjoly +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2024/03/28 16:54:40 by adjoly #+# #+# */ +/* Updated: 2024/03/28 22:37:29 by adjoly ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#ifndef PARSING_H +# define PARSING_H + +typedef struct s_pcmd +{ + char *cmd; + char **option; +} t_pcmd; + +void ft_freearr(char **arr); + +#endif diff --git a/src/utils/ft_freetab.c b/src/utils/ft_freetab.c new file mode 100644 index 0000000..324f693 --- /dev/null +++ b/src/utils/ft_freetab.c @@ -0,0 +1,25 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_freetab.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: adjoly +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2024/03/28 22:34:09 by adjoly #+# #+# */ +/* Updated: 2024/03/28 22:36:50 by adjoly ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include + +void ft_freearr(char **arr) +{ + char **tmp; + + tmp = arr; + while(*tmp) + { + free(*tmp); + tmp++; + } +}