Skip to content

Feature/prompt interactions #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hchereau merged 5 commits into from
Dec 10, 2024
Merged

Feature/prompt interactions #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9b95a77
test_prompt_interactions
Dec 10, 2024
62bb0e9
Merge branch 'main' into feature/prompt_interactions
ShellDigitalFactory-max Dec 10, 2024
34fd0e3
essai_MAJ_main
Dec 10, 2024
5ee8415
test
hchereau Dec 10, 2024
c7ab6a2
Merge branch 'main' into feature/prompt_interactions
hchereau Dec 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,10 @@ ifeq ($(sanitize), true)
CFLAGS += -fsanitize=address,undefined -g3
endif

### RL_FLAG ####################################################################

RL_FLAG := -lreadline

### COLORS #####################################################################

GREEN := \033[0;32m
Expand Down Expand Up @@ -70,7 +74,7 @@ all: $(NAME)

$(NAME): $(LIBFT) $(OBJS)
@echo "$(BLUE)Compiling $(NAME)...$(WHITE)"
@$(CC) $(CFLAGS) $(OBJS) -o $(NAME) $(LIBFT) -I $(PATH_INCLUDES) -I $(PATH_INCLUDES_LIBFT)
@$(CC) $(CFLAGS) $(OBJS) -o $(NAME) $(LIBFT) -I $(PATH_INCLUDES) -I $(PATH_INCLUDES_LIBFT) $(RL_FLAG)
@echo "$(GREEN)$(NAME) Compiled !$(WHITE)"

$(OBJS): $(PATH_OBJS)%.o: %.c $(HEADERS)
Expand Down
14 changes: 11 additions & 3 deletions includes/minishell.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,26 @@
/* ::: :::::::: */
/* minishell.h :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: hucherea <hucherea@student.42.fr> +#+ +:+ +#+ */
/* By: tchobert <tchobert@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/12/09 16:11:56 by hucherea #+# #+# */
/* Updated: 2024/12/10 11:08:32 by hucherea ### ########.fr */
/* Updated: 2024/12/10 16:41:31 by tchobert ### ########.fr */
/* */
/* ************************************************************************** */

#ifndef MINISHELL_H
# define MINISHELL_H

// INCLUDES

# include <stdio.h>
# include <stdlib.h>
# include <readline/readline.h>
# include <readline/history.h>

// DEFINES

# define LOOP 1
# define MSH_LOOP 1
# define MSH_PROMPT "SDF$> "

#endif
11 changes: 8 additions & 3 deletions srcs/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,24 @@
/* ::: :::::::: */
/* main.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: hucherea <hucherea@student.42.fr> +#+ +:+ +#+ */
/* By: tchobert <tchobert@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/12/09 16:11:39 by hucherea #+# #+# */
/* Updated: 2024/12/10 10:39:56 by hucherea ### ########.fr */
/* Updated: 2024/12/10 16:47:37 by tchobert ### ########.fr */
/* */
/* ************************************************************************** */

#include "minishell.h"

static int core_routine(void)
{
while (LOOP)
char *user_input_line;

user_input_line = NULL;
while (MSH_LOOP)
{
user_input_line = readline(MSH_PROMPT);
free(user_input_line);
}
return (EXIT_SUCCESS);
}
Expand Down
Loading