Skip to content
This repository has been archived by the owner on Oct 13, 2023. It is now read-only.

Commit

Permalink
refactor: wip (#3)
Browse files Browse the repository at this point in the history
  • Loading branch information
@mahautlatinis
mahautlatinis committed Oct 13, 2023
1 parent f2ca7c9 commit 5cf3475
Show file tree
Hide file tree
Showing 51 changed files with 536 additions and 1,294 deletions.
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
minishell - 2022 (Common Core).
Rewrite a simple shell using bash as reference.

- Actual Status : validated.
- Actual Status : validated (Linux bash compliant).
- Result : 101% (30/09/2021)

![minishell](https://github.com/malatinipro/minishell/assets/77189438/819fa3d3-f280-445a-a36b-8f0b134f6893)
Expand Down
134 changes: 65 additions & 69 deletions minishell/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,94 +3,90 @@
# ::: :::::::: #
# Makefile :+: :+: :+: #
# +:+ +:+ +:+ #
# By: malatini <malatini@student.42.fr> +#+ +:+ +#+ #
# By: mahautlatinis <mahautlatinis@student.42 +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ #
# Created: 2021/07/09 13:57:54 by malatini #+# #+# #
# Updated: 2021/09/30 20:54:22 by malatini ### ########.fr #
# Updated: 2023/10/13 16:44:27 by mahautlatin ### ########.fr #
# #
# **************************************************************************** #

NC = \033[0m
RED = \033[0;91m
GREEN = \033[0;92m
NC = \033[0m
RED = \033[0;91m
GREEN = \033[0;92m

SRC = ./srcs/main/main.c \
./srcs/parsing/parse_main.c \
./srcs/parsing/init.c \
./srcs/parsing/parse_sub.c \
./srcs/parsing/parsing_utils.c \
./srcs/parsing/parsing_utils1.c \
./srcs/parsing/parsing_utils2.c \
./srcs/parsing/parse_main_utils.c \
./srcs/parsing/parse_errors.c \
./srcs/execution/builtins/cd.c \
./srcs/execution/builtins/echo.c \
./srcs/execution/builtins/env.c \
./srcs/execution/builtins/pwd.c \
./srcs/execution/builtins/exit.c \
./srcs/execution/builtins/exit_utils.c \
./srcs/execution/builtins/unset.c \
./srcs/execution/builtins/export.c \
./srcs/execution/builtins/export_utils.c \
./srcs/execution/builtins/export_utils1.c \
./srcs/execution/builtins/export_utils2.c \
./srcs/execution/builtins/export_utils3.c \
./srcs/execution/builtins/export_utils4.c \
./srcs/execution/redirections/heredoc.c \
./srcs/execution/redirections/find_exec.c \
./srcs/execution/redirections/redirections.c \
./srcs/execution/exec/execution.c \
./srcs/execution/exec/execution_utils.c \
./srcs/execution/exec/execution_sub.c \
./srcs/execution/exec/exec_builtins.c \
./srcs/execution/exec/exec_env.c \
./srcs/execution/exec/close_fd.c \
./srcs/execution/exec/set_path.c \
./srcs/utils/error/error.c \
./srcs/utils/signals/signals.c \
./srcs/utils/basics/basics.c \
./srcs/utils/basics/basics1.c \
./srcs/utils/basics/basics2.c \
./srcs/utils/basics/split.c \
./srcs/utils/basics/itoa.c \
./srcs/utils/display/ascii_art.c \
./srcs/utils/free/free.c \
./srcs/utils/free/free1.c \
./srcs/utils/env/env_init.c \
./srcs/utils/env/env_keys.c \
./srcs/utils/env/env_values.c \
./srcs/utils/env/shell_level.c \
./srcs/utils/last_ret/last_return.c \
./srcs/utils/last_ret/last_return1.c \
SRC = ./srcs/main/main.c \
./srcs/parsing/parse_main.c \
./srcs/parsing/init.c \
./srcs/parsing/parse_sub.c \
./srcs/parsing/parsing_utils.c \
./srcs/parsing/parsing_utils1.c \
./srcs/parsing/parsing_utils2.c \
./srcs/parsing/parse_main_utils.c \
./srcs/parsing/parse_errors.c \
./srcs/execution/builtins/cd/cd.c \
./srcs/execution/builtins/echo/echo.c \
./srcs/execution/builtins/env/env.c \
./srcs/execution/builtins/pwd/pwd.c \
./srcs/execution/builtins/exit/exit.c \
./srcs/execution/builtins/unset/unset.c \
./srcs/execution/builtins/export/export.c \
./srcs/execution/builtins/export/export_display.c \
./srcs/execution/builtins/export/export_expand.c \
./srcs/execution/builtins/export/export_sort.c \
./srcs/execution/redirections/heredoc.c \
./srcs/execution/redirections/find_exec.c \
./srcs/execution/redirections/redirections.c \
./srcs/execution/exec/execution.c \
./srcs/execution/exec/execution_utils.c \
./srcs/execution/exec/execution_sub.c \
./srcs/execution/exec/exec_builtins.c \
./srcs/execution/exec/exec_env.c \
./srcs/execution/exec/close_fd.c \
./srcs/execution/exec/set_path.c \
./srcs/utils/error/error.c \
./srcs/utils/signals/signals.c \
./srcs/utils/basics/is_redirection.c \
./srcs/utils/basics/basics.c \
./srcs/utils/basics/split.c \
./srcs/utils/basics/itoa.c \
./srcs/utils/display/ascii_art.c \
./srcs/utils/free/free_struct.c \
./srcs/utils/free/free_struct_elem.c \
./srcs/utils/env/env_init.c \
./srcs/utils/env/env_keys.c \
./srcs/utils/env/env_values.c \
./srcs/utils/env/shell_level.c \
./srcs/utils/codes/return_codes.c \
./srcs/utils/codes/return_codes_list.c \

HEAD = ./includes/
OBJS = ${SRC:.c=.o}
INCLUDES = ./includes/minishell.h

CC = clang
RM = rm -rf
NAME = minishell
CFLAGS = -Wall -Wextra -Werror -g
CC = clang
RM = rm -rf
NAME = minishell
CFLAGS = -Wall -Wextra -Werror -g

READLINE = -lreadline
READLINE = -lreadline

all: ${NAME}
all: ${NAME}

${NAME}: $(OBJS)
@${CC} $(CFLAGS) -I${HEAD} -lncurses $(OBJS) -o $(NAME) ${READLINE}
@echo "${GREEN} Compilation done ${NC}"
${NAME}: $(OBJS)
@${CC} $(CFLAGS) -I${HEAD} -lncurses $(OBJS) -o $(NAME) ${READLINE}
@echo "${GREEN} Compilation done ${NC}"

%.o: %.c
@${CC} ${CFLAGS} -I${HEAD} -c $< -o $@
@${CC} ${CFLAGS} -I${HEAD} -c $< -o $@

readline:
sudo apt-get install libreadline-dev
sudo apt-get install libreadline-dev
clean:
$(RM) $(OBJS)
$(RM) $(OBJS)

fclean: clean
$(RM) $(NAME)
fclean: clean
$(RM) $(NAME)

re: clean all
re: clean all

.PHONY: all clean fclean re readline
.PHONY: all clean fclean re readline
Loading

0 comments on commit 5cf3475

Please sign in to comment.