willem/minishell
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Made NOBANNER NOPROMPT and NOCOLOR FLAGS for make,

Browse Source 
make run FLAGS="-DNOCOLORS -DNOBANNER -DNOPROMPT"
This commit is contained in:
whaffman 2025-03-01 12:01:56 +01:00
parent 128cb915b9
commit 888476ea0c
4 changed files with 56 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -6,7 +6,7 @@
# By: qmennen <qmennen@student.codam.nl> +#+ # # By: qmennen <qmennen@student.codam.nl> +#+ #
# +#+ # # +#+ #
# Created: 2024/10/15 11:48:46 by whaffman #+# #+# # # Created: 2024/10/15 11:48:46 by whaffman #+# #+# #
# Updated: 2025/02/28 14:51:38 by whaffman ######## odam.nl # # Updated: 2025/03/01 11:59:38 by whaffman ######## odam.nl #
# # # #
# **************************************************************************** # # **************************************************************************** #
@ -49,7 +49,7 @@ $(1)_DEPENDS = $$(addprefix $$($(1)_OBJ_PATH)/, $$(SOURCES:.c=.d))
$(1)_OBJECTS = $$(addprefix $$($(1)_OBJ_PATH)/, $$(SOURCES:.c=.o)) $(1)_OBJECTS = $$(addprefix $$($(1)_OBJ_PATH)/, $$(SOURCES:.c=.o))
.PHONY: $(1) .PHONY: $(1)
$(1): CFLAGS = $$($(1)_CFLAGS) $(1): CFLAGS = $$($(1)_CFLAGS) $$(FLAGS)
$(1): $(BUILD_PATH)/$(1)/$(NAME) $(1): $(BUILD_PATH)/$(1)/$(NAME)
.PHONY: run_$(1) .PHONY: run_$(1)

34
inc/minishell.h
View File

@ -6,7 +6,7 @@
/* By: marvin <marvin@student.42.fr> +#+ */ /* By: marvin <marvin@student.42.fr> +#+ */
/* +#+ */ /* +#+ */
/* Created: 2025/02/04 16:13:13 by whaffman #+# #+# */ /* Created: 2025/02/04 16:13:13 by whaffman #+# #+# */
/* Updated: 2025/02/28 14:18:54 by whaffman ######## odam.nl */ /* Updated: 2025/03/01 11:22:11 by whaffman ######## odam.nl */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -34,6 +34,32 @@
# define SUCCESS 1 # define SUCCESS 1
# define FAILURE 0 # define FAILURE 0
# ifndef DBG
# define DBG
# endif
# ifdef NOPROMPT
# define PROMPT ">"
# else
# define PROMPT 0
# endif
# ifdef NOBANNER
# define NOBANNER 1
# else
# define NOBANNER 0
# endif // NOBANNER
# ifdef NOCOLORS
# define BOLD ""
# define RED ""
# define GREEN ""
# define YELLOW ""
# define BLUE ""
# define MAGENTA ""
# define CYAN ""
# define RESET ""
# else
# define BOLD "\001\033[1m\002" # define BOLD "\001\033[1m\002"
# define RED "\001\033[0;31m\002" # define RED "\001\033[0;31m\002"
# define GREEN "\001\033[0;32m\002" # define GREEN "\001\033[0;32m\002"
@ -42,17 +68,13 @@
# define MAGENTA "\001\033[0;35m\002" # define MAGENTA "\001\033[0;35m\002"
# define CYAN "\001\033[0;36m\002" # define CYAN "\001\033[0;36m\002"
# define RESET "\001\033[0m\002" # define RESET "\001\033[0m\002"
# endif // NOCOLORS
# ifndef DBG
# define DBG
# endif
# ifdef DEBUG # ifdef DEBUG
# define DEBUG 1 # define DEBUG 1
# else # else
# define DEBUG 0 # define DEBUG 0
# endif // DEBUG # endif // DEBUG
void token_print(void *param); void token_print(void *param);
#endif #endif

7
src/prompt/prompt.c
View File

@ -6,7 +6,7 @@
/* By: qmennen <qmennen@student.codam.nl> +#+ */ /* By: qmennen <qmennen@student.codam.nl> +#+ */
/* +#+ */ /* +#+ */
/* Created: 2025/02/04 16:13:08 by whaffman #+# #+# */ /* Created: 2025/02/04 16:13:08 by whaffman #+# #+# */
/* Updated: 2025/02/28 14:18:20 by whaffman ######## odam.nl */ /* Updated: 2025/03/01 11:22:45 by whaffman ######## odam.nl */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -94,6 +94,10 @@ char *ft_prompt(t_minishell *msh)
char *prompt; char *prompt;
char *user; char *user;
if (PROMPT)
line = readline(PROMPT);
else
{
cwd = get_path(msh); cwd = get_path(msh);
if (cwd == NULL) if (cwd == NULL)
return (NULL); return (NULL);
@ -106,6 +110,7 @@ char *ft_prompt(t_minishell *msh)
rl_on_new_line(); rl_on_new_line();
line = readline(prompt); line = readline(prompt);
free_safe(msh, (void **)&prompt); free_safe(msh, (void **)&prompt);
}
if (line == NULL) if (line == NULL)
return (NULL); return (NULL);
history_write(line); history_write(line);

4
src/utils/print_banner.c
View File

@ -6,7 +6,7 @@
/* By: whaffman <whaffman@student.codam.nl> +#+ */ /* By: whaffman <whaffman@student.codam.nl> +#+ */
/* +#+ */ /* +#+ */
/* Created: 2025/02/05 16:04:44 by whaffman #+# #+# */ /* Created: 2025/02/05 16:04:44 by whaffman #+# #+# */
/* Updated: 2025/02/25 17:27:28 by whaffman ######## odam.nl */ /* Updated: 2025/03/01 11:15:57 by whaffman ######## odam.nl */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -14,6 +14,8 @@
void print_banner(void) void print_banner(void)
{ {
if (NOBANNER)
return ;
printf("%s\n", printf("%s\n",
// "\033[2J\033[1;1H" GREEN // "\033[2J\033[1;1H" GREEN
GREEN GREEN