fixed norme
This commit is contained in:
@ -6,7 +6,7 @@
|
|||||||
/* By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ */
|
/* By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ */
|
||||||
/* +#+#+#+#+#+ +#+ */
|
/* +#+#+#+#+#+ +#+ */
|
||||||
/* Created: 2024/02/16 21:02:54 by marde-vr #+# #+# */
|
/* Created: 2024/02/16 21:02:54 by marde-vr #+# #+# */
|
||||||
/* Updated: 2024/04/23 20:06:06 by tomoron ### ########.fr */
|
/* Updated: 2024/04/24 10:43:52 by marde-vr ### ########.fr */
|
||||||
/* */
|
/* */
|
||||||
/* ************************************************************************** */
|
/* ************************************************************************** */
|
||||||
|
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
/* By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ */
|
/* By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ */
|
||||||
/* +#+#+#+#+#+ +#+ */
|
/* +#+#+#+#+#+ +#+ */
|
||||||
/* Created: 2024/03/28 13:50:14 by tomoron #+# #+# */
|
/* Created: 2024/03/28 13:50:14 by tomoron #+# #+# */
|
||||||
/* Updated: 2024/04/23 18:43:24 by tomoron ### ########.fr */
|
/* Updated: 2024/04/24 10:44:54 by marde-vr ### ########.fr */
|
||||||
/* */
|
/* */
|
||||||
/* ************************************************************************** */
|
/* ************************************************************************** */
|
||||||
|
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
/* By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ */
|
/* By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ */
|
||||||
/* +#+#+#+#+#+ +#+ */
|
/* +#+#+#+#+#+ +#+ */
|
||||||
/* Created: 2024/02/18 18:29:20 by marde-vr #+# #+# */
|
/* Created: 2024/02/18 18:29:20 by marde-vr #+# #+# */
|
||||||
/* Updated: 2024/04/23 12:49:46 by tomoron ### ########.fr */
|
/* Updated: 2024/04/24 10:42:54 by marde-vr ### ########.fr */
|
||||||
/* */
|
/* */
|
||||||
/* ************************************************************************** */
|
/* ************************************************************************** */
|
||||||
|
|
||||||
@ -66,7 +66,8 @@ void print_env_declare(t_msh *msh, t_env *env_orig)
|
|||||||
if (strcmp(env->name, "_"))
|
if (strcmp(env->name, "_"))
|
||||||
{
|
{
|
||||||
if (env->value && *(env->value))
|
if (env->value && *(env->value))
|
||||||
ft_printf_fd(msh->out_fd, "declare -x %s=\"%s\"\n", env->name, env->value);
|
ft_printf_fd(msh->out_fd, "declare -x %s=\"%s\"\n", env->name,
|
||||||
|
env->value);
|
||||||
else
|
else
|
||||||
ft_printf_fd(msh->out_fd, "declare -x %s\n", env->name);
|
ft_printf_fd(msh->out_fd, "declare -x %s\n", env->name);
|
||||||
}
|
}
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
/* By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ */
|
/* By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ */
|
||||||
/* +#+#+#+#+#+ +#+ */
|
/* +#+#+#+#+#+ +#+ */
|
||||||
/* Created: 2024/03/24 17:44:32 by marde-vr #+# #+# */
|
/* Created: 2024/03/24 17:44:32 by marde-vr #+# #+# */
|
||||||
/* Updated: 2024/04/24 09:57:20 by marde-vr ### ########.fr */
|
/* Updated: 2024/04/24 10:40:41 by marde-vr ### ########.fr */
|
||||||
/* */
|
/* */
|
||||||
/* ************************************************************************** */
|
/* ************************************************************************** */
|
||||||
|
|
||||||
@ -17,7 +17,6 @@ void get_here_doc_input(t_msh *msh, char *eof)
|
|||||||
char *line;
|
char *line;
|
||||||
|
|
||||||
line = NULL;
|
line = NULL;
|
||||||
//TODO: parse eof sans parse les variables
|
|
||||||
while (1)
|
while (1)
|
||||||
{
|
{
|
||||||
free(line);
|
free(line);
|
||||||
|
38
srcs/main.c
38
srcs/main.c
@ -6,7 +6,7 @@
|
|||||||
/* By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ */
|
/* By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ */
|
||||||
/* +#+#+#+#+#+ +#+ */
|
/* +#+#+#+#+#+ +#+ */
|
||||||
/* Created: 2024/02/02 21:59:20 by tomoron #+# #+# */
|
/* Created: 2024/02/02 21:59:20 by tomoron #+# #+# */
|
||||||
/* Updated: 2024/04/23 14:33:16 by tomoron ### ########.fr */
|
/* Updated: 2024/04/24 10:43:27 by marde-vr ### ########.fr */
|
||||||
/* */
|
/* */
|
||||||
/* ************************************************************************** */
|
/* ************************************************************************** */
|
||||||
|
|
||||||
@ -83,46 +83,12 @@ int init_minishell(t_msh **msh, int argc, char **argv, char **envp)
|
|||||||
(*msh)->env = get_env(envp);
|
(*msh)->env = get_env(envp);
|
||||||
tcgetattr(1, &t_p);
|
tcgetattr(1, &t_p);
|
||||||
(*msh)->echoctl = t_p.c_lflag & ECHOCTL;
|
(*msh)->echoctl = t_p.c_lflag & ECHOCTL;
|
||||||
signal(SIGINT, signal_handler_interactive); //enables ctrl-C
|
signal(SIGINT, signal_handler_interactive);
|
||||||
signal(SIGQUIT, signal_handler_interactive);
|
signal(SIGQUIT, signal_handler_interactive);
|
||||||
if (set_echoctl(0))
|
if (set_echoctl(0))
|
||||||
ft_exit(*msh, 1);
|
ft_exit(*msh, 1);
|
||||||
return (0);
|
return (0);
|
||||||
}
|
}
|
||||||
/*
|
|
||||||
mandatory
|
|
||||||
int main(int argc, char **argv, char **envp)
|
|
||||||
{
|
|
||||||
char *commands;
|
|
||||||
char *prompt;
|
|
||||||
t_msh *msh;
|
|
||||||
char *commands;
|
|
||||||
char *prompt;
|
|
||||||
t_msh *msh;
|
|
||||||
|
|
||||||
commands = (char *)1;
|
|
||||||
init_minishell(&msh, argc, argv, envp);
|
|
||||||
while (commands)
|
|
||||||
{
|
|
||||||
prompt = get_prompt(msh->env);
|
|
||||||
if (!prompt)
|
|
||||||
exit(1);
|
|
||||||
commands = readline(prompt);
|
|
||||||
free(prompt);
|
|
||||||
add_history(commands);
|
|
||||||
msh->tokens = parse_command(commands, msh->env);
|
|
||||||
print_parsed_cmd(msh->tokens);
|
|
||||||
free(commands);
|
|
||||||
exec_commands(msh);
|
|
||||||
free_token(msh->tokens);
|
|
||||||
|
|
||||||
}
|
|
||||||
rl_clear_history();
|
|
||||||
set_echoctl(msh->echoctl);
|
|
||||||
free_msh(msh);
|
|
||||||
ft_printf("exit\n");
|
|
||||||
return (g_return_code);
|
|
||||||
}*/
|
|
||||||
|
|
||||||
int main(int argc, char **argv, char **envp)
|
int main(int argc, char **argv, char **envp)
|
||||||
{
|
{
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
/* By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ */
|
/* By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ */
|
||||||
/* +#+#+#+#+#+ +#+ */
|
/* +#+#+#+#+#+ +#+ */
|
||||||
/* Created: 2024/02/04 17:31:38 by tomoron #+# #+# */
|
/* Created: 2024/02/04 17:31:38 by tomoron #+# #+# */
|
||||||
/* Updated: 2024/04/23 19:52:16 by tomoron ### ########.fr */
|
/* Updated: 2024/04/24 10:41:34 by marde-vr ### ########.fr */
|
||||||
/* */
|
/* */
|
||||||
/* ************************************************************************** */
|
/* ************************************************************************** */
|
||||||
|
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
/* By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ */
|
/* By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ */
|
||||||
/* +#+#+#+#+#+ +#+ */
|
/* +#+#+#+#+#+ +#+ */
|
||||||
/* Created: 2024/03/05 18:17:25 by marde-vr #+# #+# */
|
/* Created: 2024/03/05 18:17:25 by marde-vr #+# #+# */
|
||||||
/* Updated: 2024/04/23 18:51:29 by tomoron ### ########.fr */
|
/* Updated: 2024/04/24 10:42:16 by marde-vr ### ########.fr */
|
||||||
/* */
|
/* */
|
||||||
/* ************************************************************************** */
|
/* ************************************************************************** */
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user