jack/42-archive
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge correcitf segv

Browse source
This commit is contained in:
wescande 2017-03-03 18:00:43 +01:00
commit e9d0324189
52 changed files with 366 additions and 418 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
42sh/Makefile
View file

@ -6,7 +6,11 @@
# By: wescande <wescande@student.42.fr> +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ #
# Created: 2016/08/29 21:32:58 by wescande #+# #+# #
<<<<<<< HEAD
# Updated: 2017/03/03 14:36:32 by ariard ### ########.fr #
=======
# Updated: 2017/03/02 16:23:48 by jhalford ### ########.fr #
>>>>>>> pda_execution
# #
# **************************************************************************** #
@ -14,7 +18,7 @@ NAME = 42sh
CC = gcc
FLAGS = -Wall -Wextra -Werror
D_FLAGS = -g
D_FLAGS = -g
DELTA = $$(echo "$$(tput cols)-47"|bc)
@ -71,10 +75,8 @@ exec/exec_else.c\
exec/exec_for.c\
exec/exec_func.c\
exec/exec_if.c\
exec/exec_less.c\
exec/exec_or_if.c\
exec/exec_pipe.c\
exec/exec_redir.c\
exec/exec_semi.c\
exec/exec_until.c\
exec/exec_var.c\
@ -85,7 +87,6 @@ exec/ft_findexec.c\
exec/launch_process.c\
exec/process_redirect.c\
exec/process_reset.c\
exec/process_resetfds.c\
exec/process_setexec.c\
exec/process_setgroup.c\
exec/process_setsig.c\
@ -137,11 +138,11 @@ history/history_parsing_toolz.c\
history/history_parsing_toolz_2.c\
history/list_toolz.c\
history/surch_in_history.c\
job-control/add_new_job.c\
job-control/builtin_bg.c\
job-control/builtin_fg.c\
job-control/builtin_jobs.c\
job-control/do_job_notification.c\
job-control/job_addprocess.c\
job-control/job_cmp_id.c\
job-control/job_format.c\
job-control/job_format_head.c\

65
42sh/includes/exec.h
View file

@ -6,7 +6,7 @@
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2016/11/27 20:29:56 by jhalford #+# #+# */
/* Updated: 2017/02/20 20:20:15 by ariard ### ########.fr */
/* Updated: 2017/03/03 16:39:06 by jhalford ### ########.fr */
/* */
/* ************************************************************************** */
@ -21,19 +21,31 @@
# define PROCESS_SCRIPT (1 << 2)
# define PROCESS_SUBSHELL (1 << 3)
# define PROCESS_UNKNOWN (1 << 4)
# define PROCESS_PIPESTART (1 << 5)
# define PROCESS_PIPEEND (1 << 6)
# define PROCESS_COMPLETED (1 << 7)
# define PROCESS_SUSPENDED (1 << 8)
# define PROCESS_RUNNING (1 << 9)
# define PROCESS_CONTINUED (1 << 10)
# define PROCESS_COMPLETED (1 << 5)
# define PROCESS_SUSPENDED (1 << 6)
# define PROCESS_RUNNING (1 << 7)
# define PROCESS_CONTINUED (1 << 8)
# define PROCESS_TYPE_MASK (1 << 0 | 1 << 1 | 1 << 2 | 1 << 3 | 1 << 4)
# define PROCESS_STATE_MASK (1 << 7 | 1 << 8 | 1 << 9 | 1 << 10)
# define PROCESS_STATE_MASK (1 << 5 | 1 << 6 | 1 << 7 | 1 << 8)
# define IS_PIPESTART(a) (a & PROCESS_PIPESTART)
# define IS_PIPEEND(a) (a & PROCESS_PIPEEND)
# define IS_PIPESINGLE(a) ((a & PROCESS_PIPESTART) && (a & PROCESS_PIPEEND))
# define IS_PIPESTART(p) ((p).fdin == STDIN)
# define IS_PIPEEND(p) ((p).fdout == STDOUT)
# define IS_PIPESINGLE(p) (IS_PIPESTART(p) && IS_PIPEEND(p))
# define EXEC_BG (1 << 1)
# define EXEC_AND_IF (1 << 2)
# define EXEC_OR_IF (1 << 3)
# define EXEC_IF_BRANCH (1 << 4)
# define EXEC_CASE_BRANCH (1 << 5)
# define EXEC_IS_BG(j) (j & EXEC_BG)
# define EXEC_IS_FG(j) (!EXEC_IS_BG(j))
# define EXEC_IS_AND_IF(j) (j & EXEC_AND_IF)
# define EXEC_IS_OR_IF(j) (j & EXEC_JOB_OR_IF)
# define EXEC_AOL_MASK (EXEC_AND_IF | EXEC_OR_IF)
# define EXEC_IS_IF_BRANCH(j) (j & EXEC_IF_BRANCH)
# define EXEC_IS_CASE_BRANCH(j) (j & EXEC_CASE_BRANCH)
# include "libft.h"
# include "types.h"
@ -47,24 +59,23 @@ struct s_process
pid_t pid;
int fdin;
int fdout;
int to_close;
t_list *redirs;
int toclose;
int status;
t_flag attributes;
t_condition if_branch;
t_condition case_branch;
char *case_pattern;
};
struct s_exec
{
char *aol_status;
int aol_search;
/* char *aol_status; */
/* int aol_search; */
t_job job;
t_process process;
int fd0save;
int fd1save;
int fd2save;
/* t_process process; */
int fd_save[3];
t_flag attrs;
int fdin;
t_list *op_stack;
char *case_pattern;
};
struct s_execmap
@ -93,10 +104,10 @@ int exec_ampersand(t_btree **ast);
int exec_or_if(t_btree **ast);
int exec_and_if(t_btree **ast);
int exec_pipe(t_btree **ast);
int exec_redir(t_btree **ast);
int exec_command(t_btree **ast);
/* int exec_redir(t_btree **ast); */
int exec_cmd(t_btree **ast);
int exec_while(t_btree **ast);
int exec_while(t_btree **ast);
int exec_if(t_btree **ast);
int exec_elif(t_btree **ast);
int exec_else(t_btree **ast);
@ -108,7 +119,7 @@ int exec_case(t_btree **ast);
int exec_case_branch(t_btree **ast);
int launch_process(t_process *p);
int process_setexec(t_type type, t_process *p);
int process_setexec(t_process *p);
int process_setgroup(t_process *p, pid_t pid);
void process_setsig(void);
void process_free(void *content, size_t content_size);
@ -131,6 +142,8 @@ void set_exitstatus(int status, int override);
void ast_free(void *data, size_t content_size);
char **token_to_argv(t_astnode *node);
char **token_to_argv(t_ld *ld);
int add_new_job(t_job *job);
#endif

8
42sh/includes/job_control.h
View file

@ -6,7 +6,7 @@
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2016/12/10 16:55:09 by jhalford #+# #+# */
/* Updated: 2017/02/03 14:43:34 by ariard ### ########.fr */
/* Updated: 2017/03/03 16:38:51 by jhalford ### ########.fr */
/* */
/* ************************************************************************** */
@ -22,15 +22,15 @@
# define JOB_NOTIFIED (1 << 0)
# define JOB_BG (1 << 1)
# define JOB_IS_BG(j) (j & JOB_BG)
# define JOB_IS_FG(j) !(j & JOB_BG)
# define JOB_IS_FG(j) (!JOB_IS_BG(j))
#define JOBS_OPTS_L (1 << 0)
# define JOBS_OPTS_L (1 << 0)
struct s_job
{
int id;
pid_t pgid;
t_flag attributes;
t_flag attrs;
t_list *first_process;
struct termios tmodes;
};

4
42sh/includes/lexer.h
View file

@ -6,7 +6,7 @@
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2016/12/01 12:15:50 by jhalford #+# #+# */
/* Updated: 2017/02/24 21:46:08 by ariard ### ########.fr */
/* Updated: 2017/03/02 17:15:15 by jhalford ### ########.fr */
/* */
/* ************************************************************************** */
@ -42,8 +42,6 @@ enum e_lexstate
PAREN,
CURLY_BRACKETS,
ASSIGNEMENT_WORD,
// VAR,
// SPECIAL,
COMMENT,
END,
};

2
42sh/includes/minishell.h
View file

@ -6,7 +6,7 @@
/* By: jhalford <jhalford@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2016/11/10 13:07:44 by jhalford #+# #+# */
/* Updated: 2017/02/21 18:51:18 by jhalford ### ########.fr */
/* Updated: 2017/03/02 17:15:12 by jhalford ### ########.fr */
/* */
/* ************************************************************************** */

5
42sh/includes/parser.h
View file

@ -1,12 +1,11 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* */ /* ::: :::::::: */
/* parser.h :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2016/12/01 12:15:54 by jhalford #+# #+# */
/* Updated: 2017/03/03 14:16:02 by ariard ### ########.fr */
/* Updated: 2017/03/02 17:10:21 by jhalford ### ########.fr */
/* */
/* ************************************************************************** */

2
42sh/includes/types.h
View file

@ -6,7 +6,7 @@
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2016/12/13 17:11:48 by jhalford #+# #+# */
/* Updated: 2017/03/03 14:33:49 by ariard ### ########.fr */
/* Updated: 2017/03/03 17:30:47 by jhalford ### ########.fr */
/* */
/* ************************************************************************** */

2
42sh/libft

@ -1 +1 @@
Subproject commit 8f6e64fa9b4ac1dd3e3d5200fb93471ddfeedd40
Subproject commit 318efc7cfb7b7cc9d3714fa19fd2be7382b6adec

2
42sh/src/builtin/builtin_env.c
View file

@ -6,7 +6,7 @@
/* By: jhalford <jhalford@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2016/11/28 14:14:20 by jhalford #+# #+# */
/* Updated: 2017/02/17 15:56:55 by gwojda ### ########.fr */
/* Updated: 2017/03/03 16:07:30 by jhalford ### ########.fr */
/* */
/* ************************************************************************** */

4
42sh/src/builtin/is_builtin.c
View file

@ -6,7 +6,7 @@
/* By: jhalford <jhalford@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2016/12/13 13:09:57 by jhalford #+# #+# */
/* Updated: 2017/02/20 20:30:54 by ariard ### ########.fr */
/* Updated: 2017/03/02 21:00:13 by jhalford ### ########.fr */
/* */
/* ************************************************************************** */
@ -36,7 +36,9 @@ t_execf *is_builtin(t_process *p)
i = -1;
while (g_builtin[++i].name)
{
if (ft_strcmp(g_builtin[i].name, p->av[0]) == 0)
return (g_builtin[i].f);
}
return (NULL);
}

18
42sh/src/exec/exec_ampersand.c
View file

@ -6,7 +6,7 @@
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2016/12/10 16:01:30 by jhalford #+# #+# */
/* Updated: 2017/02/05 22:10:08 by ariard ### ########.fr */
/* Updated: 2017/03/03 16:05:30 by jhalford ### ########.fr */
/* */
/* ************************************************************************** */
@ -14,13 +14,21 @@
int exec_ampersand(t_btree **ast)
{
if (SH_HAS_JOBC(data_singleton()->opts))
data_singleton()->exec.job.attributes |= JOB_BG;
t_exec *exec;
exec = &data_singleton()->exec;
push(&exec->op_stack, TK_AMP);
ft_exec(&(*ast)->left);
if (SH_HAS_JOBC(data_singleton()->opts))
data_singleton()->exec.job.attributes &= ~JOB_BG;
exec->attrs &= ~EXEC_BG;
ft_exec(&(*ast)->right);
/* if (SH_HAS_JOBC(data_singleton()->opts)) */
/* data_singleton()->exec.job.attributes |= JOB_BG; */
/* ft_exec(&(*ast)->left); */
/* if (SH_HAS_JOBC(data_singleton()->opts)) */
/* data_singleton()->exec.job.attributes &= ~JOB_BG; */
/* ft_exec(&(*ast)->right); */
// btree_delone(ast, &ast_free);
return (0);
}

43
42sh/src/exec/exec_and_if.c
View file

@ -6,7 +6,7 @@
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2016/11/30 20:52:28 by jhalford #+# #+# */
/* Updated: 2017/02/05 22:10:38 by ariard ### ########.fr */
/* Updated: 2017/03/03 16:05:42 by jhalford ### ########.fr */
/* */
/* ************************************************************************** */
@ -14,24 +14,31 @@
int exec_and_if(t_btree **ast)
{
t_data *data;
/* t_data *data; */
t_exec *exec;
data = data_singleton();
if (data->exec.aol_status == NULL
|| (data->exec.aol_search == TK_AND_IF
&& *data->exec.aol_status == '0')
|| (data->exec.aol_search == TK_OR_IF
&& *data->exec.aol_status != '0'))
{
ft_exec(&(*ast)->left);
data->exec.aol_status = ft_getenv(data->env, "?");
}
data->exec.aol_search = TK_AND_IF;
if (*data->exec.aol_status == '0'
|| ((t_astnode*)(*ast)->right->item)->type != TK_COMMAND)
ft_exec(&(*ast)->right);
data->exec.aol_status = NULL;
data->exec.aol_search = 0;
exec = &data_singleton()->exec;
push(&exec->op_stack, TK_AND_IF);
ft_exec(&(*ast)->left);
exec->attrs |= EXEC_AND_IF;
ft_exec(&(*ast)->right);
/* data = data_singleton(); */
/* if (data->exec.aol_status == NULL */
/* || (data->exec.aol_search == TK_AND_IF */
/* && *data->exec.aol_status == '0') */
/* || (data->exec.aol_search == TK_OR_IF */
/* && *data->exec.aol_status != '0')) */
/* { */
/* ft_exec(&(*ast)->left); */
/* data->exec.aol_status = ft_getenv(data->env, "?"); */
/* } */
/* data->exec.aol_search = TK_AND_IF; */
/* if (*data->exec.aol_status == '0' */
/* || ((t_astnode*)(*ast)->right->item)->type != TK_COMMAND) */
/* ft_exec(&(*ast)->right); */
/* data->exec.aol_status = NULL; */
/* data->exec.aol_search = 0; */
// btree_delone(ast, &ast_free);
return (0);

15
42sh/src/exec/exec_case.c
View file

@ -6,7 +6,7 @@
/* By: ariard <ariard@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2017/02/06 18:07:31 by ariard #+# #+# */
/* Updated: 2017/03/01 16:29:20 by ariard ### ########.fr */
/* Updated: 2017/03/03 16:29:52 by jhalford ### ########.fr */
/* */
/* ************************************************************************** */
@ -15,11 +15,16 @@
int exec_case(t_btree **ast)
{
t_astnode *node;
char **av;
/* char **av; */
t_exec *exec;
exec = &data_singleton()->exec;
/* data_singleton()->exec.process.case_branch = 0; */
exec->attrs |= EXEC_CASE_BRANCH;
data_singleton()->exec.process.case_branch = 0;
node = (*ast)->item;
av = token_to_argv(node);
data_singleton()->exec.process.case_pattern = av[0];
/* av = token_to_argv(node); */
/* data_singleton()->exec.process.case_pattern = av[0]; */
/* exec->case_pattern = av[0]; */
return (0);
}

21
42sh/src/exec/exec_case_branch.c
View file

@ -6,7 +6,7 @@
/* By: ariard <ariard@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2017/02/06 18:07:31 by ariard #+# #+# */
/* Updated: 2017/02/20 22:31:46 by jhalford ### ########.fr */
/* Updated: 2017/03/03 16:28:15 by jhalford ### ########.fr */
/* */
/* ************************************************************************** */
@ -15,16 +15,19 @@
int exec_case_branch(t_btree **ast)
{
t_astnode *node;
char **av;
/* char **av; */
t_exec *exec;
if (data_singleton()->exec.process.case_branch == 1)
exec = &data_singleton()->exec;
/* if (data_singleton()->exec.process.case_branch == 1) */
if (EXEC_IS_CASE_BRANCH(exec->attrs))
return (0);
node = (*ast)->item;
av = token_to_argv(node);
if (ft_strcmp(av[0], data_singleton()->exec.process.case_pattern) == 1)
{
data_singleton()->exec.process.case_branch = 1;
ft_exec(&(*ast)->right);
}
/* av = token_to_argv(node); */
/* if (ft_strcmp(av[0], data_singleton()->exec.process.case_pattern) == 1) */
/* { */
/* data_singleton()->exec.process.case_branch = 1; */
/* ft_exec(&(*ast)->right); */
/* } */
return (0);
}

80
42sh/src/exec/exec_command.c
View file

@ -6,67 +6,69 @@
/* By: jhalford <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2016/11/14 17:28:14 by jhalford #+# #+# */
/* Updated: 2017/03/01 16:32:26 by ariard ### ########.fr */
/* Updated: 2017/03/03 17:31:12 by jhalford ### ########.fr */
/* */
/* ************************************************************************** */
#include "exec.h"
char **token_to_argv(t_astnode *node)
char **token_to_argv(t_ld *ld)
{
char **my_tab;
int index;
char **expand;
char **content;
t_ld *ld;
if (node->type == TK_WORD || node->type == TK_ASSIGNEMENT_WORD)
my_tab = NULL;
while (ld)
{
ld = NULL;
// ld = node->data.cmd.token;
my_tab = NULL;
while (ld)
content = ld->content;
if ((expand = glob(content[0], (unsigned char *)content[1], (unsigned char *)content[2])))
{
content = ld->content;
if ((expand = glob(content[0], (unsigned char *)content[1], (unsigned char *)content[2])))
{
index = -1;
while (expand[++index])
my_tab = ft_sstradd(my_tab, expand[index]);
ft_tabdel(&expand);
}
ld = ld->next;
index = -1;
while (expand[++index])
my_tab = ft_sstradd(my_tab, expand[index]);
ft_tabdel(&expand);
}
return (my_tab);
ld = ld->next;
}
else if (node->type == TK_SUBSHELL)
return (ft_sstrdup(node->data.sstr));
return (NULL);
return (my_tab);
}
int exec_command(t_btree **ast)
int exec_cmd(t_btree **ast)
{
t_astnode *node;
t_process *p;
t_cmd *cmd;
t_job *job;
t_exec *exec;
t_process p;
int fds[2];
int op;
node = (*ast)->item;
p = &data_singleton()->exec.process;
cmd = &((t_astnode *)(*ast)->item)->data.cmd;
exec = &data_singleton()->exec;
job = &data_singleton()->exec.job;
p->av = token_to_argv(node);
process_setexec(node->type, p);
if (!(launch_process(p)))
process_reset(&p);
op = pop(&exec->op_stack);
fds[PIPE_WRITE] = STDOUT;
fds[PIPE_READ] = STDIN;
if (op == TK_AMP)
exec->attrs |= JOB_BG;
else if (op == TK_PIPE)
pipe(fds);
p.fdin = exec->fdin;
p.fdout = fds[PIPE_WRITE];
exec->fdin = fds[PIPE_READ];
if (IS_PIPESTART(p))
{
job_addprocess(p);
if (IS_PIPEEND(p->attributes))
{
JOB_IS_FG(job->attributes) ?
put_job_in_foreground(job, 0):
put_job_in_background(job, 0);
job->pgid = 0;
}
job->first_process = NULL;
job->attrs = EXEC_IS_FG(exec->attrs) ? 0 : JOB_BG;
}
process_reset(p);
// btree_delone(ast, &ast_free);
if (!(p.av = token_to_argv(cmd->token)))
return (1);
process_setexec(&p);
if (!(launch_process(&p)))
ft_lstadd(&job->first_process, ft_lstnew(&p, sizeof(p)));
if (IS_PIPEEND(p))
add_new_job(job);
return (0);
}

14
42sh/src/exec/exec_elif.c
View file

@ -6,7 +6,7 @@
/* By: ariard <ariard@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2017/02/06 18:08:53 by ariard #+# #+# */
/* Updated: 2017/02/20 22:35:47 by jhalford ### ########.fr */
/* Updated: 2017/03/03 16:14:25 by jhalford ### ########.fr */
/* */
/* ************************************************************************** */
@ -14,12 +14,18 @@
int exec_elif(t_btree **ast)
{
if (data_singleton()->exec.process.if_branch == 1)
t_exec *exec;
exec = &data_singleton()->exec;
/* if (data_singleton()->exec.process.if_branch == 1) */
if (EXEC_IS_IF_BRANCH(exec->attrs))
return (0);
ft_exec(&(*ast)->left);
if (data_singleton()->exec.process.status == 1)
if (ft_strcmp(ft_getenv(data_singleton()->env, "?"), "0"))
/* if (data_singleton()->exec.process.status == 1) */
{
data_singleton()->exec.process.if_branch = 1;
/* data_singleton()->exec.process.if_branch = 1; */
exec->attrs |= EXEC_IF_BRANCH;
ft_exec(&(*ast)->right);
}
return (0);

11
42sh/src/exec/exec_else.c
View file

@ -6,7 +6,7 @@
/* By: ariard <ariard@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2017/02/06 18:55:07 by ariard #+# #+# */
/* Updated: 2017/02/06 19:13:05 by ariard ### ########.fr */
/* Updated: 2017/03/03 15:56:25 by jhalford ### ########.fr */
/* */
/* ************************************************************************** */
@ -14,9 +14,14 @@
int exec_else(t_btree **ast)
{
if (data_singleton()->exec.process.if_branch == 0)
t_exec *exec;
exec = &data_singleton()->exec;
if (EXEC_IS_IF_BRANCH(exec->attrs))
/* if (data_singleton()->exec.process.if_branch == 0) */
{
data_singleton()->exec.process.if_branch = 1;
exec->attrs |= EXEC_IF_BRANCH;
/* data_singleton()->exec.process.if_branch = 1; */
ft_exec(&(*ast)->right);
}
return (0);

2
42sh/src/exec/exec_for.c
View file

@ -6,7 +6,7 @@
/* By: ariard <ariard@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2017/02/06 20:42:20 by ariard #+# #+# */
/* Updated: 2017/02/06 20:42:21 by ariard ### ########.fr */
/* Updated: 2017/03/03 16:26:40 by jhalford ### ########.fr */
/* */
/* ************************************************************************** */

15
42sh/src/exec/exec_if.c
View file

@ -6,7 +6,7 @@
/* By: ariard <ariard@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2017/02/06 18:07:31 by ariard #+# #+# */
/* Updated: 2017/02/20 22:31:46 by jhalford ### ########.fr */
/* Updated: 2017/03/03 16:30:46 by jhalford ### ########.fr */
/* */
/* ************************************************************************** */
@ -14,11 +14,18 @@
int exec_if(t_btree **ast)
{
data_singleton()->exec.process.if_branch = 0;
t_exec *exec;
exec = &data_singleton()->exec;
/* data_singleton()->exec.process.if_branch = 0; */
exec->attrs &= ~EXEC_IF_BRANCH;
ft_exec(&(*ast)->left);
if (data_singleton()->exec.process.status == 1)
/* if (data_singleton()->exec.process.status == 1) */
if (ft_strcmp(ft_getenv(data_singleton()->env, "?"), "0") == 0)
{
data_singleton()->exec.process.if_branch = 1;
/* data_singleton()->exec.process.if_branch = 1; */
exec->attrs |= EXEC_IF_BRANCH;
ft_exec(&(*ast)->right);
}
return (0);

32
42sh/src/exec/exec_less.c
View file

@ -1,32 +0,0 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* exec_less.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: jhalford <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2016/11/14 17:27:08 by jhalford #+# #+# */
/* Updated: 2017/03/01 16:37:28 by ariard ### ########.fr */
/* */
/* ************************************************************************** */
#include "exec.h"
int exec_less(t_btree **ast)
{
t_astnode *node;
int fd;
fd = 0;
node = (*ast)->item;
// fd = open(node->data.redir.word.word, O_RDONLY);
data_singleton()->exec.process.fdin = fd;
/* ft_strappend(&data->exec.process.command, "<"); */
/* ft_strappend(&data->exec.process.command, node->data.redir.word.word); */
ft_exec(&(*ast)->left);
data_singleton()->exec.process.fdin = STDIN;
/* data->exec.process.command = NULL; */
// btree_delone(ast, &ast_free);
return (0);
}

43
42sh/src/exec/exec_or_if.c
View file

@ -6,7 +6,7 @@
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2016/11/30 21:06:17 by jhalford #+# #+# */
/* Updated: 2017/02/05 22:12:08 by ariard ### ########.fr */
/* Updated: 2017/03/03 16:07:35 by jhalford ### ########.fr */
/* */
/* ************************************************************************** */
@ -14,24 +14,31 @@
int exec_or_if(t_btree **ast)
{
t_data *data;
/* t_data *data; */
t_exec *exec;
data = data_singleton();
if (data->exec.aol_status == NULL
|| (data->exec.aol_search == TK_AND_IF
&& *data->exec.aol_status == '0')
|| (data->exec.aol_search == TK_OR_IF
&& *data->exec.aol_status != '0'))
{
ft_exec(&(*ast)->left);
data->exec.aol_status = ft_getenv(data->env, "?");
}
data->exec.aol_search = TK_OR_IF;
if (*data->exec.aol_status != '0'
|| ((t_astnode*)(*ast)->right->item)->type != TK_COMMAND)
ft_exec(&(*ast)->right);
data->exec.aol_status = NULL;
data->exec.aol_search = 0;
exec = &data_singleton()->exec;
push(&exec->op_stack, TK_OR_IF);
ft_exec(&(*ast)->left);
exec->attrs |= EXEC_OR_IF;
ft_exec(&(*ast)->right);
/* data = data_singleton(); */
/* if (data->exec.aol_status == NULL */
/* || (data->exec.aol_search == TK_AND_IF */
/* && *data->exec.aol_status == '0') */
/* || (data->exec.aol_search == TK_OR_IF */
/* && *data->exec.aol_status != '0')) */
/* { */
/* ft_exec(&(*ast)->left); */
/* data->exec.aol_status = ft_getenv(data->env, "?"); */
/* } */
/* data->exec.aol_search = TK_OR_IF; */
/* if (*data->exec.aol_status != '0' */
/* || ((t_astnode*)(*ast)->right->item)->type != TK_COMMAND) */
/* ft_exec(&(*ast)->right); */
/* data->exec.aol_status = NULL; */
/* data->exec.aol_search = 0; */
// btree_delone(ast, &ast_free);
return (0);

34
42sh/src/exec/exec_pipe.c
View file

@ -6,7 +6,7 @@
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2016/11/27 21:13:23 by jhalford #+# #+# */
/* Updated: 2017/02/20 20:32:52 by ariard ### ########.fr */
/* Updated: 2017/03/03 16:27:48 by jhalford ### ########.fr */
/* */
/* ************************************************************************** */
@ -14,36 +14,12 @@
int exec_pipe(t_btree **ast)
{
int fds[2];
int start;
t_data *data;
t_process *p;
t_exec *exec;
data = data_singleton();
p = &data_singleton()->exec.process;
pipe(fds);
/* DG("pipe %i->%i", fds[PIPE_WRITE], fds[PIPE_READ]); */
p->fdout = fds[PIPE_WRITE];
start = IS_PIPESTART(p->attributes);
p->toclose = fds[PIPE_READ];
p->attributes &= ~PROCESS_PIPEEND;
exec = &data_singleton()->exec;
push(&exec->op_stack, TK_PIPE);
ft_exec(&(*ast)->left);
p->attributes &= ~PROCESS_PIPESTART;
p->toclose = STDIN;
close(fds[PIPE_WRITE]);
p->fdout = STDOUT;
p->fdin = fds[PIPE_READ];
p->attributes |= PROCESS_PIPEEND;
ft_exec(&(*ast)->right);
if (start)
p->attributes |= PROCESS_PIPESTART;
close(fds[PIPE_READ]);
p->fdin = STDIN;
btree_delone(ast, &ast_free);
/* btree_delone(ast, &ast_free); */
return (0);
}

27
42sh/src/exec/exec_redir.c
View file

@ -1,27 +0,0 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* exec_redir.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: jhalford <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2016/11/14 17:27:51 by jhalford #+# #+# */
/* Updated: 2017/03/01 16:38:01 by ariard ### ########.fr */
/* */
/* ************************************************************************** */
#include "exec.h"
int exec_redir(t_btree **ast)
{
t_astnode *node;
t_process *p;
p = &data_singleton()->exec.process;
node = (*ast)->item;
// node->data.redir.type = node->type;
// ft_lsteadd(&p->redirs, ft_lstnew(&node->data.redir,sizeof(node->data.redir)));
ft_exec(&(*ast)->left);
// btree_delone(ast, &ast_free);
return (0);
}

10
42sh/src/exec/exec_semi.c
View file

@ -6,7 +6,7 @@
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2016/11/30 20:52:05 by jhalford #+# #+# */
/* Updated: 2017/02/06 18:34:38 by ariard ### ########.fr */
/* Updated: 2017/03/03 16:26:08 by jhalford ### ########.fr */
/* */
/* ************************************************************************** */
@ -14,9 +14,13 @@
int exec_semi(t_btree **ast)
{
ft_exec(&(*ast)->left);
ft_exec(&(*ast)->right);
t_exec *exec;
exec = &data_singleton()->exec;
push(&exec->op_stack, TK_SEMI);
ft_exec(&(*ast)->left);
exec->attrs &= ~EXEC_AOL_MASK;
ft_exec(&(*ast)->right);
// btree_delone(ast, &ast_free);
return (0);
}

4
42sh/src/exec/exec_until.c
View file

@ -6,7 +6,7 @@
/* By: ariard <ariard@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2017/02/06 20:42:20 by ariard #+# #+# */
/* Updated: 2017/02/06 20:42:21 by ariard ### ########.fr */
/* Updated: 2017/03/03 16:30:13 by jhalford ### ########.fr */
/* */
/* ************************************************************************** */
@ -15,7 +15,7 @@
int exec_until(t_btree **ast)
{
ft_exec(&(*ast)->left);
while (data_singleton()->exec.process.status == 0)
while (ft_strcmp(ft_getenv(data_singleton()->env, "?"), "0") == 0)
{
ft_exec(&(*ast)->right);
ft_exec(&(*ast)->left);

4
42sh/src/exec/exec_var.c
View file

@ -6,7 +6,7 @@
/* By: ariard <ariard@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2017/01/30 17:33:53 by ariard #+# #+# */
/* Updated: 2017/02/06 22:05:35 by ariard ### ########.fr */
/* Updated: 2017/03/03 16:28:41 by jhalford ### ########.fr */
/* */
/* ************************************************************************** */
@ -18,7 +18,7 @@ int exec_var(t_btree **ast)
char **av;
node = (*ast)->item;
av = token_to_argv(node);
/* av = token_to_argv(node); */
builtin_setenv("setenv", av, data_singleton()->local_var);
return (0);
}

4
42sh/src/exec/exec_while.c
View file

@ -6,7 +6,7 @@
/* By: ariard <ariard@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2017/01/30 17:33:53 by ariard #+# #+# */
/* Updated: 2017/02/06 22:05:35 by ariard ### ########.fr */
/* Updated: 2017/03/03 16:05:12 by jhalford ### ########.fr */
/* */
/* ************************************************************************** */
@ -15,7 +15,7 @@
int exec_while(t_btree **ast)
{
ft_exec(&(*ast)->left);
while (data_singleton()->exec.process.status == 1)
while (ft_strcmp(ft_getenv(data_singleton()->env, "?"), "0"))
{
ft_exec(&(*ast)->right);
ft_exec(&(*ast)->left);

25
42sh/src/exec/ft_exec.c
View file

@ -6,7 +6,7 @@
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2016/11/27 20:30:32 by jhalford #+# #+# */
/* Updated: 2017/02/21 18:50:05 by ariard ### ########.fr */
/* Updated: 2017/03/03 16:28:22 by jhalford ### ########.fr */
/* */
/* ************************************************************************** */
@ -15,24 +15,18 @@
t_execmap g_execmap[] =
{
{TK_NEWLINE, &exec_semi},
{TK_AND_IF, &exec_and_if},
{TK_OR_IF, &exec_or_if},
{TK_SEMI, &exec_semi},
{TK_AMP, &exec_ampersand},
{TK_PIPE, &exec_pipe},
{TK_LESS, &exec_redir},
{TK_GREAT, &exec_redir},
{TK_DLESS, &exec_redir},
{TK_DGREAT, &exec_redir},
{TK_LESSAND, &exec_redir},
{TK_GREATAND, &exec_redir},
{TK_AND_IF, &exec_and_if},
{TK_OR_IF, &exec_or_if},
/* {TK_PIPE, &exec_pipe}, */
{TK_WHILE, &exec_while},
{TK_IF, &exec_if},
{TK_ELIF, &exec_elif},
{TK_ELSE, &exec_else},
{TK_UNTIL, &exec_until},
{TK_SUBSHELL, &exec_command},
{TK_WORD, &exec_command},
/* {TK_SUBSHELL, &exec_}, */
{TK_WORD, &exec_cmd},
{0, 0},
};
@ -49,10 +43,9 @@ int ft_exec(t_btree **ast)
{
if (item->type == g_execmap[i].type)
{
DG("match : %s and %s",
read_state(item->type), read_state(g_execmap[i].type));
/* return ((*g_execmap[i].f)(ast)); */
(*g_execmap[i].f)(ast);
/* DG("match : %s and %s", */
/* read_state(item->type), read_state(g_execmap[i].type)); */
return ((*g_execmap[i].f)(ast));
}
i++;
}

15
42sh/src/exec/launch_process.c
View file

@ -6,7 +6,7 @@
/* By: jhalford <jhalford@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2016/12/13 14:20:45 by jhalford #+# #+# */
/* Updated: 2017/02/21 20:09:54 by jhalford ### ########.fr */
/* Updated: 2017/03/03 16:29:12 by jhalford ### ########.fr */
/* */
/* ************************************************************************** */
@ -18,12 +18,7 @@ int launch_process(t_process *p)
int pid;
exec = &data_singleton()->exec;
if (p->attributes & PROCESS_UNKNOWN)
{
ft_dprintf(2, "{red}%s: command not found: %s{eoc}\n", SHELL_NAME, p->av[0]);
set_exitstatus(127, 1);
}
else if (p->attributes & PROCESS_BUILTIN && IS_PIPESINGLE(p->attributes))
if (p->attributes & PROCESS_BUILTIN && IS_PIPESINGLE(*p))
{
if (process_redirect(p))
return (1);
@ -43,6 +38,12 @@ int launch_process(t_process *p)
pid = fork();
if (pid == 0)
{
if (p->attributes & PROCESS_UNKNOWN)
{
ft_dprintf(2, "{red}%s: command not found: %s{eoc}\n", SHELL_NAME, p->av[0]);
exit(127);
/* set_exitstatus(127, 1); */
}
process_setgroup(p, 0);
process_setsig();
if (process_redirect(p))

9
42sh/src/exec/process_redirect.c
View file

@ -6,7 +6,7 @@
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2016/11/29 16:04:18 by jhalford #+# #+# */
/* Updated: 2017/02/07 17:36:46 by jhalford ### ########.fr */
/* Updated: 2017/03/02 19:44:42 by jhalford ### ########.fr */
/* */
/* ************************************************************************** */
@ -48,12 +48,11 @@ int process_redirect(t_process *p)
}
redirs = redirs->next;
}
if (p->toclose != STDIN)
close(p->toclose);
if (p->to_close != 0)
close(p->to_close);
if (p->fdin != STDIN)
dup2_close(p->fdin, STDIN);
dup2_close(p->fdout, STDOUT);
if (p->fdout != STDOUT)
dup2_close(p->fdout, STDOUT);
ft_lstdel(&p->redirs, ft_lst_cfree);
return (0);
}

11
42sh/src/exec/process_reset.c
View file

@ -6,7 +6,7 @@
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2017/02/07 17:44:22 by jhalford #+# #+# */
/* Updated: 2017/02/07 17:48:22 by jhalford ### ########.fr */
/* Updated: 2017/03/03 16:36:06 by jhalford ### ########.fr */
/* */
/* ************************************************************************** */
@ -14,9 +14,14 @@
void process_reset(t_process *p)
{
process_resetfds();
p->av = NULL;
p->path = NULL;
p->execf = NULL;
p->pid = 0;
/* p->fdin = STDIN; */
/* p->fdout = STDOUT; */
p->to_close = 0;
p->redirs = NULL;
p->attributes &= ~(PROCESS_STATE_MASK | PROCESS_TYPE_MASK);
p->status = -1;
p->attributes = 0;
}

23
42sh/src/exec/process_resetfds.c
View file

@ -1,23 +0,0 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* process_resetfds.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2017/02/07 17:39:14 by jhalford #+# #+# */
/* Updated: 2017/02/07 17:50:52 by jhalford ### ########.fr */
/* */
/* ************************************************************************** */
#include "minishell.h"
void process_resetfds(void)
{
t_exec *exec;
exec = &data_singleton()->exec;
dup2(exec->fd0save, 0);
dup2(exec->fd1save, 1);
dup2(exec->fd2save, 2);
}

14
42sh/src/exec/process_setexec.c
View file

@ -6,25 +6,17 @@
/* By: jhalford <jhalford@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2016/12/13 17:07:10 by jhalford #+# #+# */
/* Updated: 2017/02/20 20:42:02 by ariard ### ########.fr */
/* Updated: 2017/03/03 16:32:15 by jhalford ### ########.fr */
/* */
/* ************************************************************************** */
#include "minishell.h"
int process_setexec(t_type type, t_process *p)
int process_setexec(t_process *p)
{
p->path = NULL;
if (type == TK_SUBSHELL)
{
p->execf = &execve;
p->attributes |= PROCESS_SUBSHELL;
p->path = ft_strdup(p->av[0]);
}
else if ((p->execf = is_builtin(p)))
{
if ((p->execf = is_builtin(p)))
p->attributes |= PROCESS_BUILTIN;
}
else if (ft_strchr(p->av[0], '/'))
{
p->execf = &execve;

4
42sh/src/exec/process_setgroup.c
View file

@ -6,7 +6,7 @@
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2016/12/13 17:48:10 by jhalford #+# #+# */
/* Updated: 2017/01/11 14:45:36 by jhalford ### ########.fr */
/* Updated: 2017/03/03 16:34:02 by jhalford ### ########.fr */
/* */
/* ************************************************************************** */
@ -26,7 +26,7 @@ int process_setgroup(t_process *p, pid_t pid)
if (!j->pgid)
j->pgid = pid ? pid : getpid();
setpgid(pid, j->pgid);
if (pid == 0 && JOB_IS_FG(j->attributes))
if (pid == 0 && JOB_IS_FG(j->attrs))
tcsetpgrp(STDIN, j->pgid);
return (0);
}

59
42sh/src/glob/command_getoutput.c
View file

@ -6,7 +6,7 @@
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2017/01/12 14:01:59 by jhalford #+# #+# */
/* Updated: 2017/02/24 22:04:43 by ariard ### ########.fr */
/* Updated: 2017/03/03 16:45:40 by jhalford ### ########.fr */
/* */
/* ************************************************************************** */
@ -15,33 +15,34 @@
char *command_getoutput(char *command)
{
int fds[2];
t_btree *ast;
t_astnode item;
char *output;
char buf[BUF_SIZE + 1];
int ret;
t_exec *exec;
return (command);
/* int fds[2]; */
/* t_btree *ast; */
/* t_astnode item; */
/* char *output; */
/* char buf[BUF_SIZE + 1]; */
/* int ret; */
/* t_exec *exec; */
output = NULL;
exec = &data_singleton()->exec;
item.type = TK_SUBSHELL;
item.data.sstr = malloc(4 * sizeof(char *));
item.data.sstr[0] = ft_strdup(data_singleton()->argv[0]);
item.data.sstr[1] = ft_strdup("-c");
item.data.sstr[2] = ft_strdup(command);
item.data.sstr[3] = NULL;
ast = btree_create_node(&item, sizeof(item));
pipe(fds);
exec->process.fdout = fds[PIPE_WRITE];
exec_command(&ast);
exec->process.fdout = STDOUT;
close(fds[PIPE_WRITE]);
while ((ret = read(fds[PIPE_READ], buf, BUF_SIZE)))
{
buf[ret] = 0;
ft_strappend(&output, buf);
}
close(fds[PIPE_READ]);
return (output);
/* output = NULL; */
/* exec = &data_singleton()->exec; */
/* item.type = TK_SUBSHELL; */
/* item.data.sstr = malloc(4 * sizeof(char *)); */
/* item.data.sstr[0] = ft_strdup(data_singleton()->argv[0]); */
/* item.data.sstr[1] = ft_strdup("-c"); */
/* item.data.sstr[2] = ft_strdup(command); */
/* item.data.sstr[3] = NULL; */
/* ast = btree_create_node(&item, sizeof(item)); */
/* pipe(fds); */
/* exec->process.fdout = fds[PIPE_WRITE]; */
/* exec_command(&ast); */
/* exec->process.fdout = STDOUT; */
/* close(fds[PIPE_WRITE]); */
/* while ((ret = read(fds[PIPE_READ], buf, BUF_SIZE))) */
/* { */
/* buf[ret] = 0; */
/* ft_strappend(&output, buf); */
/* } */
/* close(fds[PIPE_READ]); */
/* return (output); */
}

33
42sh/src/job-control/job_addprocess.c → 42sh/src/job-control/add_new_job.c
View file

@ -1,37 +1,32 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* job_addprocess.c :+: :+: :+: */
/* add_new_job.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2016/12/13 13:54:51 by jhalford #+# #+# */
/* Updated: 2017/01/31 15:07:16 by jhalford ### ########.fr */
/* Created: 2017/03/02 20:44:21 by jhalford #+# #+# */
/* Updated: 2017/03/03 16:47:47 by jhalford ### ########.fr */
/* */
/* ************************************************************************** */
#include "job_control.h"
int job_addprocess(t_process *p)
int add_new_job(t_job *job)
{
t_jobc *jobc;
t_job *job;
if (!job->first_process)
return (1);
jobc = &data_singleton()->jobc;
job = &data_singleton()->exec.job;
if (IS_PIPESTART(p->attributes))
{
job_update_id();
job->id = jobc->current_id;
job->pgid = p->pid;
ft_lstadd(&jobc->first_job, ft_lstnew(job, sizeof(*job)));
}
job = jobc->first_job->content;
if (p->pid > 0)
{
ft_lsteadd(&job->first_process, ft_lstnew(p, sizeof(*p)));
}
if (JOB_IS_BG(job->attributes) && IS_PIPEEND(p->attributes))
job_update_id();
job->id = jobc->current_id;
job->pgid = ((t_process*)job->first_process->content)->pid;
ft_lstadd(&jobc->first_job, ft_lstnew(job, sizeof(*job)));
if (JOB_IS_FG(job->attrs))
put_job_in_foreground(job, 0);
else
job_notify_new(job);
put_job_in_background(job, 0);
return (0);
}

6
42sh/src/job-control/do_job_notification.c
View file

@ -6,7 +6,7 @@
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2016/12/15 13:01:19 by jhalford #+# #+# */
/* Updated: 2017/02/03 15:47:44 by jhalford ### ########.fr */
/* Updated: 2017/03/03 16:46:51 by jhalford ### ########.fr */
/* */
/* ************************************************************************** */
@ -27,14 +27,14 @@ int do_job_notification(void)
{
j = jlist->content;
if (job_is_completed(j->id)
|| (job_is_stopped(j->id) && !(j->attributes & JOB_NOTIFIED)))
|| (job_is_stopped(j->id) && !(j->attrs & JOB_NOTIFIED)))
{
ret = 1;
job_notify_change(j->id);
if (job_is_completed(j->id))
job_remove(j->id);
else
j->attributes |= JOB_NOTIFIED;
j->attrs |= JOB_NOTIFIED;
}
jlist = jlist->next;
}

2
42sh/src/job-control/job_update_id.c
View file

@ -6,7 +6,7 @@
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2016/12/12 13:33:08 by jhalford #+# #+# */
/* Updated: 2017/01/10 13:22:11 by jhalford ### ########.fr */
/* Updated: 2017/03/02 20:59:46 by jhalford ### ########.fr */
/* */
/* ************************************************************************** */

4
42sh/src/job-control/mark_job_as_running.c
View file

@ -6,7 +6,7 @@
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2017/01/08 14:40:40 by jhalford #+# #+# */
/* Updated: 2017/01/31 15:08:11 by jhalford ### ########.fr */
/* Updated: 2017/03/03 16:47:28 by jhalford ### ########.fr */
/* */
/* ************************************************************************** */
@ -28,5 +28,5 @@ void mark_job_as_running(t_job *j)
}
plist = plist->next;
}
j->attributes &= ~JOB_NOTIFIED;
j->attrs &= ~JOB_NOTIFIED;
}

2
42sh/src/job-control/process_free.c
View file

@ -6,7 +6,7 @@
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2016/12/12 12:41:11 by jhalford #+# #+# */
/* Updated: 2017/02/03 13:59:25 by jhalford ### ########.fr */
/* Updated: 2017/03/02 17:48:50 by jhalford ### ########.fr */
/* */
/* ************************************************************************** */

2
42sh/src/job-control/put_job_in_background.c
View file

@ -6,7 +6,7 @@
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2016/12/13 15:03:29 by jhalford #+# #+# */
/* Updated: 2017/02/20 21:52:28 by jhalford ### ########.fr */
/* Updated: 2017/03/02 20:57:36 by jhalford ### ########.fr */
/* */
/* ************************************************************************** */

2
42sh/src/job-control/put_job_in_foreground.c
View file

@ -6,7 +6,7 @@
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2016/12/13 14:58:36 by jhalford #+# #+# */
/* Updated: 2017/01/31 15:10:45 by jhalford ### ########.fr */
/* Updated: 2017/03/02 20:59:44 by jhalford ### ########.fr */
/* */
/* ************************************************************************** */

6
42sh/src/lexer/get_state_global.c
View file

@ -6,7 +6,7 @@
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2017/02/09 20:39:06 by jhalford #+# #+# */
/* Updated: 2017/03/03 15:06:07 by wescande ### ########.fr */
/* Updated: 2017/03/03 17:31:47 by jhalford ### ########.fr */
/* */
/* ************************************************************************** */
@ -35,9 +35,7 @@ t_lexstate get_state_global(t_lexer *lexer)
return (PAREN);
else if (c == '{' || c == '}')
return (CURLY_BRACKETS);
/* else if (c == '=')
return (ASSIGNEMENT_WORD);
*/ else if (c == 0)
else if (c == 0)
return (END);
return (0);
}

2
42sh/src/lexer/lexer_assignement_word.c
View file

@ -6,7 +6,7 @@
/* By: ariard <ariard@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2017/02/24 20:28:13 by ariard #+# #+# */
/* Updated: 2017/02/24 21:00:13 by ariard ### ########.fr */
/* Updated: 2017/03/02 19:11:25 by jhalford ### ########.fr */
/* */
/* ************************************************************************** */

4
42sh/src/lexer/lexer_bquote.c
View file

@ -6,7 +6,7 @@
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2017/02/09 22:03:48 by jhalford #+# #+# */
/* Updated: 2017/02/17 15:36:49 by jhalford ### ########.fr */
/* Updated: 2017/03/03 16:48:07 by jhalford ### ########.fr */
/* */
/* ************************************************************************** */
@ -32,7 +32,7 @@ int lexer_bquote(t_list **alst, t_lexer *lexer)
push(&lexer->stack, lexer->state);
return (lexer_lex(alst, lexer));
}
top_state = *(int*)pop(&lexer->stack)->content;
top_state = pop(&lexer->stack);
lexer->state = top_state == DQUOTE_BQUOTE ? DQUOTE : DEFAULT;
return (lexer_lex(alst, lexer));
}

2
42sh/src/lexer/lexer_word.c
View file

@ -6,7 +6,7 @@
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2016/12/03 12:07:11 by jhalford #+# #+# */
/* Updated: 2017/03/03 16:00:13 by wescande ### ########.fr */
/* Updated: 2017/03/03 17:31:56 by jhalford ### ########.fr */
/* */
/* ************************************************************************** */

2
42sh/src/line-editing/readline.c
View file

@ -6,7 +6,7 @@
/* By: gwojda <gwojda@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2016/12/15 14:19:48 by gwojda #+# #+# */
/* Updated: 2017/03/01 17:19:21 by ariard ### ########.fr */
/* Updated: 2017/03/02 12:36:35 by jhalford ### ########.fr */
/* */
/* ************************************************************************** */

39
42sh/src/main/data_init.c
View file

@ -6,7 +6,7 @@
/* By: jhalford <jhalford@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2016/11/28 19:26:32 by jhalford #+# #+# */
/* Updated: 2017/02/20 20:57:14 by ariard ### ########.fr */
/* Updated: 2017/03/03 16:48:29 by jhalford ### ########.fr */
/* */
/* ************************************************************************** */
@ -23,24 +23,27 @@ int data_init(void)
data->env = ft_sstrdup(environ);
data->comp = NULL;
data->opts = SH_OPTS_JOBC;
data->exec.process.path = NULL;
data->exec.process.av = NULL;
data->exec.process.toclose = STDIN;
data->exec.process.fdin = STDIN;
data->exec.process.fdout = STDOUT;
data->exec.process.pid = 0;
data->exec.process.attributes = PROCESS_PIPESTART | PROCESS_PIPEEND;
data->exec.process.redirs = NULL;
data->exec.fd0save = fcntl(0, F_DUPFD_CLOEXEC);
data->exec.fd1save = fcntl(1, F_DUPFD_CLOEXEC);
data->exec.fd2save = fcntl(2, F_DUPFD_CLOEXEC);
/* data->exec.process.path = NULL; */
/* data->exec.process.av = NULL; */
/* data->exec.process.to_close = 0; */
/* data->exec.process.fdin = STDIN; */
/* data->exec.process.fdout = STDOUT; */
/* data->exec.process.pid = 0; */
/* data->exec.process.attributes = 0; */
/* data->exec.process.redirs = NULL; */
data->exec.fd_save[0] = fcntl(0, F_DUPFD_CLOEXEC);
data->exec.fd_save[1] = fcntl(1, F_DUPFD_CLOEXEC);
data->exec.fd_save[2] = fcntl(2, F_DUPFD_CLOEXEC);
data->exec.op_stack = NULL;
data->exec.fdin = STDIN;
data->exec.attrs = 0;
data->exec.aol_status = NULL;
data->exec.aol_search = 0;
data->exec.job.id = 0;
data->exec.job.pgid = 0;
data->exec.job.attributes = 0;
data->exec.job.first_process = 0;
/* data->exec.aol_status = NULL; */
/* data->exec.aol_search = 0; */
/* data->exec.job.id = 0; */
/* data->exec.job.pgid = 0; */
/* data->exec.job.attributes = 0; */
/* data->exec.job.first_process = 0; */
data->jobc.first_job = NULL;
data->jobc.current_id = 1;

2
42sh/src/main/ft_putast.c
View file

@ -6,7 +6,7 @@
/* By: jhalford <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2016/11/14 18:18:04 by jhalford #+# #+# */
/* Updated: 2017/03/03 14:34:25 by ariard ### ########.fr */
/* Updated: 2017/03/03 17:32:06 by jhalford ### ########.fr */
/* */
/* ************************************************************************** */

19
42sh/src/main/main.c
View file

@ -6,7 +6,7 @@
/* By: jhalford <jhalford@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2016/12/06 18:40:58 by jhalford #+# #+# */
/* Updated: 2017/03/03 17:49:18 by wescande ### ########.fr */
/* Updated: 2017/03/03 18:00:20 by wescande ### ########.fr */
/* */
/* ************************************************************************** */
@ -26,15 +26,12 @@ int handle_instruction(int fd)
parser_init(&parser);
token = NULL;
ast = NULL;
/* str = NULL; */
DG("START: state=%i", parser.state);
while (1)
{
if ((ret = readline(fd, get_lexer_stack(lexer) ||
if ((ret = readline(fd, get_lexer_stack(lexer) ||
parser.state == UNDEFINED, &str)))
{
ft_putnbr(ret);
ft_putstr("bonjour");
{
/* ft_putstr("bonjour"); */
if (ret == -1)
return (-1);
return (parser.state == UNDEFINED ? error_EOF() : 1);
@ -62,13 +59,13 @@ int handle_instruction(int fd)
else if (parser.state == ERROR && !SH_IS_INTERACTIVE(data_singleton()->opts))
return (error_syntax(&token));
else if (parser.state == ERROR)
error_syntax(&token);
error_syntax(&token);
token = NULL;
}
DG("succesful parsing:");
DG("Before execution:");
btree_print(STDBUG, ast, &ft_putast);
/* if (ft_exec(&ast)) */
/* return (1); */
if (ft_exec(&ast))
return (1);
btree_del(&ast, &ast_free);
ft_add_str_in_history(lexer.str);
return (0);

2
42sh/src/main/shell_init.c
View file

@ -6,7 +6,7 @@
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2016/12/12 17:23:59 by jhalford #+# #+# */
/* Updated: 2017/02/21 20:14:44 by jhalford ### ########.fr */
/* Updated: 2017/03/02 20:38:23 by jhalford ### ########.fr */
/* */
/* ************************************************************************** */

13
42sh/src/parser/add_cmd.c
View file

@ -6,7 +6,7 @@
/* By: ariard <ariard@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2017/02/15 20:49:15 by ariard #+# #+# */
/* Updated: 2017/03/03 14:33:19 by ariard ### ########.fr */
/* Updated: 2017/03/03 17:33:28 by jhalford ### ########.fr */
/* */
/* ************************************************************************** */
@ -48,15 +48,18 @@ int add_cmd(t_btree **ast, t_list **lst)
&& node->type != TK_PAREN_CLOSE && node->type != CMD
&& node->type != REDIR)
return (add_cmd(&(*ast)->right, lst));
my_tab = NULL;
node = (*ast)->item;
node->type = CMD;
if (token->type == TK_WORD || token->type == TK_ASSIGNEMENT_WORD)
{
DG("add data");
my_tab = ft_sstradd(my_tab, token->data);
my_tab = ft_sstradd(my_tab, (char *)token->esc);
my_tab = ft_sstradd(my_tab, (char *)token->esc2);
if ((my_tab = (char **)malloc(sizeof(char *) * 4)))
{
my_tab[0] = ft_strdup(token->data);
my_tab[1] = (char *)dup_char_esc(token->esc, token->size >> 3);
my_tab[2] = (char *)dup_char_esc(token->esc2, token->size >> 3);
my_tab[3] = NULL;
}
ft_ld_pushback(&node->data.cmd.token, my_tab);
}
return (0);