Merge branch 'launching_jack': nouveau builtin_env, et maintenant les

builtin renvoient leur exitstatus, et le launcher set la variable $?

42sh/Makefile

@@ -40,7 +40,6 @@ builtin/builtin_hash.c\
 builtin/builtin_history.c\
 builtin/builtin_math.c\
 builtin/builtin_read.c\
-builtin/builtin_return_status.c\
 builtin/builtin_setenv.c\
 builtin/builtin_unset.c\
 builtin/builtin_unsetenv.c\

42sh/includes/exec.h

@@ -131,7 +131,7 @@ struct	s_job
 struct	s_exec
 {
 	t_job		job;
-	int			fd_save[3];
+	int			fd_save[10];
 	t_flag		attrs;
 	int			fdin;
 	t_list		*op_stack;
@@ -140,7 +140,7 @@ struct	s_exec
 };
 
 int		exec_reset(void);
-int		do_the_muther_forker(t_process *p);
+int		process_fork(t_process *p);
 int		process_setgroup(t_process *p, pid_t pid);
 void	process_setsig(void);
 void	process_reset(t_process *p);

42sh/includes/minishell.h

@@ -67,7 +67,7 @@ int		data_init(int ac, char **av);
 void	data_exit(void);
 int		get_c_arg(char ***av, t_data *data);
 
-void		content_free(void *data, size_t content_size);
+/* void	content_free(void *data, size_t content_size); */
 
 char	*ft_putast(void *node);
 void	ft_putast2(void *node);

42sh/src/builtin/builtin_cd.c

@@ -81,14 +81,14 @@ int				builtin_cd(const char *path,
 	opts = CDOPT_L;
 	i = builtin_cd_opts(av, &opts);
 	if (!(target = builtin_cd_special(av + i, envp)))
-		return (builtin_return_status(0, 1));
+		return (1);
 	cwd = getcwd(NULL, 0);
 	builtin_setenv(path, (char*[4]){"setenv", "OLDPWD", cwd, NULL}, envp);
 	free(cwd);
 	if (chdir(target))
 	{
 		SH_ERR(CDERR_1, target);
-		return (builtin_return_status(0, 1));
+		return (1);
 	}
 	else if (target != av[i])
 		ft_printf("%s\n", target);
@@ -97,5 +97,5 @@ int				builtin_cd(const char *path,
 	free(cwd);
 	if (!ft_strcmp(*(av + i), "-"))
 		free(target);
-	return (builtin_return_status(0, 0));
+	return (0);
 }

42sh/src/builtin/builtin_echo.c

@@ -25,5 +25,5 @@ int		builtin_echo(const char *path, char *const av[], char *const envp[])
 			ft_putchar(' ');
 	}
 	ft_putchar('\n');
-	return (builtin_return_status(0, 0));
+	return (0);
 }

42sh/src/builtin/builtin_env.c

@@ -59,6 +59,6 @@ int			builtin_env(const char *path,
 	}
 	waitpid(pid, &status, 0);
 	ft_sstrfree(data.custom_env);
+	tcsetpgrp(STDIN, data_singleton()->jobc.shell_pgid);
 	return (0);
-	/* return (builtin_return_status(pid, 0)); */
 }

42sh/src/builtin/builtin_export.c

@@ -47,7 +47,7 @@ int					builtin_export(
 	if (cliopts_get((char**)av, g_export_opts, &data))
 		ft_perror();
 	if (data.flag & BT_EXPORT_LP)
-		return (builtin_return_status(0, bt_export_print()));
+		return (bt_export_print());
 	av = data.av_data;
 	while (*av)
 	{
@@ -61,5 +61,5 @@ int					builtin_export(
 		builtin_unsetenv("internal", (char*[]){"local", *av, NULL}, NULL);
 		av++;
 	}
-	return (builtin_return_status(0, 0));
+	return (0);
 }

42sh/src/builtin/builtin_hash.c

@@ -44,7 +44,7 @@ int			builtin_hash(const char *path, char *const av[], char *const envp[])
 	(void)path;
 	(void)envp;
 	if (!av || ft_hash_opt(av))
-		return (builtin_return_status(0, 1));
+		return (1);
 	i = 0;
 	while (i < MAX_HASH)
 	{
@@ -52,5 +52,5 @@ int			builtin_hash(const char *path, char *const av[], char *const envp[])
 			ft_hash_lst_print(g_hash[i]);
 		++i;
 	}
-	return (builtin_return_status(0, 0));
+	return (0);
 }

42sh/src/builtin/builtin_history.c

@@ -23,7 +23,7 @@ int		builtin_history(const char *path, char *const av[], char *const envp[])
 	head = data_singleton()->line.list_end;
 	len = 1;
 	if (!head)
-		return (builtin_return_status(0, 0));
+		return (0);
 	if (head && !head->str)
 		head = head->next;
 	while (head && head->str)
@@ -34,5 +34,5 @@ int		builtin_history(const char *path, char *const av[], char *const envp[])
 		++len;
 		head = head->next;
 	}
-	return (builtin_return_status(0, 0));
+	return (0);
 }

42sh/src/builtin/builtin_math.c

@@ -90,19 +90,19 @@ int			builtin_math(const char *path, char *const av[], char *const envp[])
 	(void)path;
 	(void)envp;
 	if (!av || !av[1] || !av[2] || !av[3] || av[4])
-		return (builtin_return_status(0, SH_ERR(MATHERR_0)));
+		return (SH_ERR(MATHERR_0));
 	init_math(&var, &value, &operator, &operand);
 	var = av[1];
 	if (get_value(var, &value))
-		return (builtin_return_status(0, 1));
+		return (1);
 	operator = av[2];
 	if (ft_strlen(operator) != 1 || !(ft_strchr("+-/*%", operator[0])))
-		return (builtin_return_status(0, SH_ERR(MATHERR_2)));
+		return (SH_ERR(MATHERR_2));
 	operand = av[3];
 	if (!ft_stris(operand, &ft_isdigit))
-		return (builtin_return_status(0, SH_ERR(MATHERR_3)));
+		return (SH_ERR(MATHERR_3));
 	if (do_math(&value, operator, operand))
-		return (builtin_return_status(0, 1));
+		return (1);
 	builtin_setenv("setenv", (char *[]){"local", var, value, 0}, NULL);
-	return (builtin_return_status(0, 0));
+	return (0);
 }

42sh/src/builtin/builtin_read.c

@@ -114,5 +114,5 @@ int			builtin_read(const char *path, char *const av[], char *const envp[])
 		SH_ERR("usage: read %s %s\n", US_READ, US_READ_1);
 	if (ret != 2)
 		bt_read_exit(&data);
-	return (builtin_return_status(0, ret));
+	return (ret);
 }

42sh/src/builtin/builtin_return_status.c

@@ -1,19 +0,0 @@
-/* ************************************************************************** */
-/*                                                                            */
-/*                                                        :::      ::::::::   */
-/*   builtin_return_status.c                            :+:      :+:    :+:   */
-/*                                                    +:+ +:+         +:+     */
-/*   By: wescande <wescande@student.42.fr>          +#+  +:+       +#+        */
-/*                                                +#+#+#+#+#+   +#+           */
-/*   Created: 2017/03/20 12:48:04 by wescande          #+#    #+#             */
-/*   Updated: 2017/03/21 15:21:09 by jhalford         ###   ########.fr       */
-/*                                                                            */
-/* ************************************************************************** */
-
-#include "minishell.h"
-
-int		builtin_return_status(int ret, int status)
-{
-	set_exitstatus(status, 1);
-	return (ret);
-}

42sh/src/builtin/builtin_setenv.c

@@ -44,8 +44,9 @@ int			builtin_setenv(const char *path,
 	int		ret;
 
 	(void)path;
+	(void)envp;
 	if (!av || !av[0])
-		return (builtin_return_status(0, 1));
+		return (1);
 	env = (ft_strcmp(av[0], "local") == 0) ? &data_singleton()->local_var :
 		&data_singleton()->env;
 	if (!av[1])
@@ -62,5 +63,5 @@ int			builtin_setenv(const char *path,
 			return (SH_ERR(SETERR_0, av[0], av[1]));
 		assign_var(av, env);
 	}
-	return (envp ? builtin_return_status(0, 0) : 0);
+	return (0);
 }

42sh/src/builtin/builtin_unsetenv.c

@@ -35,5 +35,5 @@ int		builtin_unsetenv(const char *path, char *const av[], char *const envp[])
 		}
 		i++;
 	}
-	return (builtin_return_status(0, 0));
+	return (0);
 }

42sh/src/exec/exec_leaf.c

@@ -38,9 +38,8 @@ int				exec_leaf(t_btree **ast)
 	if (p.type >= PROCESS_MAX)
 		return (1);
 	p.map = g_process_map[p.type];
-	if (!(process_launch(&p)))
+	if (process_launch(&p))
 	{
-		DG("check");
 		job_addprocess(&p);
 		if (IS_PIPEEND(p))
 		{
@@ -51,7 +50,5 @@ int				exec_leaf(t_btree **ast)
 			job->pgid = 0;
 		}
 	}
-	else
-DG("WHY HERE?");
 	return (0);
 }

42sh/src/exec/exec_reset.c

@@ -12,13 +12,6 @@
 
 #include "minishell.h"
 
-static int	print_error(char *std)
-{
-	ft_dprintf(2, "{red}%s: internal fcntl %s error errno=%i{eoc}\n",
-							SHELL_NAME, std, errno);
-	return (errno);
-}
-
 int			exec_reset_job(t_job *job)
 {
 	job->id = 0;
@@ -32,21 +25,13 @@ int			exec_reset(void)
 {
 	t_exec	*exec;
 	t_jobc	*jobc;
+	int		i;
 
 	exec = &data_singleton()->exec;
 	jobc = &data_singleton()->jobc;
-	if (errno != EBADF)
+	i = -1;
-	{
+	while (++i < 10)
-		if ((exec->fd_save[0] = fcntl(STDIN, F_DUPFD_CLOEXEC, 10)) == -1
+		exec->fd_save[i] = fcntl(i, F_DUPFD_CLOEXEC, 10);
-				&& errno != EBADF)
-			return (print_error("STDIN"));
-		if ((exec->fd_save[1] = fcntl(STDOUT, F_DUPFD_CLOEXEC, 10)) == -1
-				&& errno != EBADF)
-			return (print_error("STDOUT"));
-		if ((exec->fd_save[2] = fcntl(STDERR, F_DUPFD_CLOEXEC, 10)) == -1
-				&& errno != EBADF)
-			return (print_error("STDERR"));
-	}
 	exec->op_stack = NULL;
 	exec->fdin = STDIN;
 	exec->attrs = 0;

42sh/src/exec/plaunch_builtin.c

@@ -14,8 +14,8 @@
 
 int		plaunch_builtin(t_process *p)
 {
-	return ((*p->data.cmd.execf)(
+	return (*p->data.cmd.execf)(
 				p->data.cmd.path,
 				p->data.cmd.av,
-				data_singleton()->env));
+				data_singleton()->env);
 }

42sh/src/exec/plaunch_file.c

@@ -14,7 +14,7 @@
 
 static void		error_launch(char *error_ori, char *error_type, int error_code)
 {
-	ft_dprintf(2, "{red}%s: %s%s{eoc}\n", SHELL_NAME, error_ori, error_type);
+	SH_ERR("%s: %s%s", SHELL_NAME, error_ori, error_type);
 	exit(error_code);
 }
 

42sh/src/exec/process_launch.c

@@ -12,7 +12,7 @@
 
 #include "minishell.h"
 
-int				do_the_muther_forker(t_process *p)
+int		process_fork(t_process *p)
 {
 	pid_t		pid;
 
@@ -35,40 +35,25 @@ int				do_the_muther_forker(t_process *p)
 	exit(p->map.launch(p));
 }
 
-static int		do_the_fork_if_i_have_to(t_process *p)
+int		process_launch(t_process *p)
 {
+	p->state = PROCESS_RUNNING;
 	if (IS_PIPESINGLE(*p)
 			&& p->type != PROCESS_FILE && p->type != PROCESS_SUBSHELL)
 	{
 		if (process_redirect(p))
-		{
 			set_exitstatus(1, 1);
-			return (0);
+		else
-		}
+			set_exitstatus(p->map.launch(p), 1);
-		return (p->map.launch(p));
-		/* set_exitstatus(p->map.launch(p), 1); */
-		/* return (0); */
-	}
-	return (do_the_muther_forker(p));
-}
-
-int				process_launch(t_process *p)
-{
-	pid_t		pid;
-
-	p->state = PROCESS_RUNNING;
-	if (!(pid = do_the_fork_if_i_have_to(p)))
-	{
 		process_resetfds(p);
 		process_free(p, 0);
-		return (1);
+		return (0);
 	}
-	DG("FORK");
+	p->pid = process_fork(p);
-	p->pid = pid;
+	process_setgroup(p, p->pid);
-	process_setgroup(p, pid);
 	if (p->fdin != STDIN)
 		close(p->fdin);
 	if (p->fdout != STDOUT)
 		close(p->fdout);
-	return (0);
+	return (1);
 }

42sh/src/exec/process_resetfds.c

@@ -19,20 +19,10 @@ void	process_resetfds(t_process *p)
 
 	(void)p;
 	exec = &data_singleton()->exec;
-	i = 0;
+	i = -1;
-	while (i < 10)
+	while (++i < 10)
 	{
-		/* if (i!=3) //JACK SOME PB HERE  on close la sortie debug en forcant le close sur tous les fd... ne risque-t-on pas autre chose ??!!! */
+		if (exec->fd_save[i] != -1)
-		/* { */
+			dup2(exec->fd_save[i], i);
-			close(i++);
-		/* } */
-		/* else */
-		/* 	i++; */
 	}
-	if (exec->fd_save[0] != -1)
-		dup2(exec->fd_save[0], STDIN);
-	if (exec->fd_save[1] != -1)
-		dup2(exec->fd_save[1], STDOUT);
-	if (exec->fd_save[2] != -1)
-		dup2(exec->fd_save[2], STDERR);
 }

42sh/src/glob/command_getoutput.c

@@ -21,8 +21,7 @@ static char		*manage_output(int *fds)
 
 	output = NULL;
 	close(fds[PIPE_WRITE]);
-	while ((ret = read(fds[PIPE_READ], buf, BUF_SIZE)) > 0)
+	while ((ret = read(fds[PIPE_READ], buf, BUF_SIZE)) > 0) {
-	{
 		buf[ret] = 0;
 		ft_strappend(&output, buf);
 	}
@@ -89,7 +88,7 @@ char			*command_getoutput(char *command)
 	if (!command)
 		return (NULL);
 	pipe(fds);
-	if (!(pid = do_the_muther_forker(NULL)))
+	if (!(pid = process_fork(NULL)))
 	{
 		close(fds[PIPE_READ]);
 		dup2_close(fds[PIPE_WRITE], STDOUT);
@@ -110,7 +109,7 @@ int			command_setoutput(char *const av[], char **env)
 	if (!av)
 		return (0);
 	pid = 0;
-	if (!(pid = do_the_muther_forker(NULL)))
+	if (!(pid = process_fork(NULL)))
 		execute_command(av, env);
 	return (pid);
 }

42sh/src/job_control/job_wait.c

@@ -30,6 +30,7 @@ int		job_wait(int id)
 				&& errno != ECHILD)
 			ft_dprintf(2, "{red}%s: waitpid error errno=%i{eoc}\n",
 					SHELL_NAME, errno);
+		DG("wait trigger pid=%i", pid);
 		if (pid <= 1 || mark_process_status(pid, status)
 			|| job_is_stopped(j)
 			|| job_is_completed(j))

42sh/src/lexer/lexer_word.c

@@ -19,8 +19,9 @@ int			lexer_word(t_list **alst, t_lexer *lexer)
 
 	token = (*alst)->content;
 	token->type = token->type ? token->type : TK_WORD;
-	if ((state = get_state_global(lexer))
+	if (lexer->str[lexer->pos] != '!'
-		|| (state = get_state_redir(lexer)))
+		&& ((state = get_state_global(lexer))
+		|| (state = get_state_redir(lexer))))
 		lexer->state = state;
 	else if (lexer->str[lexer->pos] == '='
 			&& word_is_assignment((char *[]){token->data, (char *)token->esc}))

42sh/src/line_editing/get_key.c

@@ -58,7 +58,7 @@ static int	read_stdin(int *ret, int *j)
 {
 	*j = 0;
 	*ret = 0;
-	if (read(0, ret, sizeof(int)) < 0)
+	if (read(STDIN, ret, sizeof(int)) < 0)
 		return (-1);
 	return (1);
 }

42sh/src/main/data_init.c

@@ -17,11 +17,14 @@ extern char	**environ;
 static int		localenv_init(void)
 {
 	t_data	*data;
+	char	*pid;
 
+	pid = ft_itoa(getpid());
 	data = data_singleton();
 	data->local_var = NULL;
 	builtin_setenv(NULL, (char *[]){"local", "IFS", " \t\n", 0}, NULL);
 	builtin_setenv(NULL, (char *[]){"local", "PS2", " >", 0}, NULL);
+	ft_strdel(&pid);
 	return (0);
 }
 

42sh/src/main/main.c

@@ -43,6 +43,7 @@ static int		handle_instruction(t_list **token, t_btree **ast)
 			return (ret);
 		if (do_lexer_routine(token, stream) > 0)
 			continue ;
+		/* token_print(*token); */
 		if ((ret = do_parser_routine(token, ast)) == 1
 			&& SH_NO_INTERACTIVE(data->opts))
 			return (ret);