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

redirection printing on job control

Browse source
This commit is contained in:
Jack Halford 2017-03-16 16:39:33 +01:00
parent 1c8148af3f
commit 8ea584a42c
8 changed files with 121 additions and 101 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
42sh/includes/ft_input.h
View file

@ -6,7 +6,7 @@
/* By: sbenning <sbenning@student.42.fr> +#+ +:+ +#+ */ /* By: sbenning <sbenning@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2016/12/09 02:05:22 by sbenning #+# #+# */ /* Created: 2016/12/09 02:05:22 by sbenning #+# #+# */
/* Updated: 2017/03/15 18:51:31 by jhalford ### ########.fr */ /* Updated: 2017/03/16 15:58:25 by jhalford ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -18,7 +18,7 @@
* TODO Same for MACOSX * TODO Same for MACOSX
*/ */
# ifdef LINUX # ifdef __linux__
# define RL_INSERT_CODE 0x7e325b1b # define RL_INSERT_CODE 0x7e325b1b
# define RL_CLEAR_CODE 0xc # define RL_CLEAR_CODE 0xc
# define RL_NL_CODE 0xa # define RL_NL_CODE 0xa
@ -49,7 +49,7 @@
# define RL_PASTE_CODE 0x761b # define RL_PASTE_CODE 0x761b
# endif # endif
# ifdef MACOSX # ifdef __APPLE__
# define RL_INSERT_CODE 0x53323b315b1b # define RL_INSERT_CODE 0x53323b315b1b
# define RL_CLEAR_CODE 0xc # define RL_CLEAR_CODE 0xc
# define RL_NL_CODE 0xa # define RL_NL_CODE 0xa

2
42sh/includes/ft_readline.h
View file

@ -6,7 +6,7 @@
/* By: gwojda <gwojda@student.42.fr> +#+ +:+ +#+ */ /* By: gwojda <gwojda@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2017/01/23 10:35:44 by gwojda #+# #+# */ /* Created: 2017/01/23 10:35:44 by gwojda #+# #+# */
/* Updated: 2017/03/16 12:10:24 by gwojda ### ########.fr */ /* Updated: 2017/03/16 16:02:32 by jhalford ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */

2
42sh/libft

@ -1 +1 @@
Subproject commit 0c1dbf5b89c99612c49d6fd63dd25d0310bad3d9 Subproject commit 04b8d5cd090e86b0f9d8160b01e49d43666deddf

178
42sh/src/builtin/builtin_math.c
View file

@ -1,97 +1,97 @@
/* ************************************************************************** */ /* /1* ************************************************************************** *1/ */
/* */ /* /1* *1/ */
/* ::: :::::::: */ /* /1* ::: :::::::: *1/ */
/* exec_math.c :+: :+: :+: */ /* /1* exec_math.c :+: :+: :+: *1/ */
/* +:+ +:+ +:+ */ /* /1* +:+ +:+ +:+ *1/ */
/* By: ariard <ariard@student.42.fr> +#+ +:+ +#+ */ /* /1* By: ariard <ariard@student.42.fr> +#+ +:+ +#+ *1/ */
/* +#+#+#+#+#+ +#+ */ /* /1* +#+#+#+#+#+ +#+ *1/ */
/* Created: 2017/03/07 10:58:49 by ariard #+# #+# */ /* /1* Created: 2017/03/07 10:58:49 by ariard #+# #+# *1/ */
/* Updated: 2017/03/15 21:02:59 by ariard ### ########.fr */ /* Updated: 2017/03/16 15:53:01 by jhalford ### ########.fr */
/* */ /* /1* *1/ */
/* ************************************************************************** */ /* /1* ************************************************************************** *1/ */
#include "minishell.h" /* #include "minishell.h" */
static int init_math(char **var, char **value, char **operator, char **operand) /* static int init_math(char **var, char **value, char **operator, char **operand) */
{ /* { */
*var = NULL; /* *var = NULL; */
*value = NULL; /* *value = NULL; */
*operator = NULL; /* *operator = NULL; */
*operand = NULL; /* *operand = NULL; */
return (0); /* return (0); */
} /* } */
static int get_value(char **var, char **value) /* static int get_value(char **var, char **value) */
{ /* { */
char *temp; /* char *temp; */
if (!word_is_assignment(var)) /* if (!word_is_assignment(var)) */
return (ft_error_message(MATHERR_1)); /* return (error_msg(MATHERR_1)); */
temp = ft_sstrstr(data_singleton()->local_var, *var); /* temp = ft_sstrstr(data_singleton()->local_var, *var); */
if (temp) /* if (temp) */
{ /* { */
temp += ft_strlenchr(temp, '=') + 1; /* temp += ft_strlenchr(temp, '=') + 1; */
*value = ft_strdup(temp); /* *value = ft_strdup(temp); */
if (!(ft_stris(*value, &ft_isdigit))) /* if (!(ft_stris(*value, &ft_isdigit))) */
{ /* { */
ft_strdel(value); /* ft_strdel(value); */
*value = ft_itoa(0); /* *value = ft_itoa(0); */
} /* } */
} /* } */
else /* else */
*value = ft_itoa(0); /* *value = ft_itoa(0); */
return (0); /* return (0); */
} /* } */
static int do_math(char **value, char *operator, char *operand) /* static int do_math(char **value, char *operator, char *operand) */
{ /* { */
long ope1; /* long ope1; */
long ope2; /* long ope2; */
ope1 = ft_atoi(*value); /* ope1 = ft_atoi(*value); */
if (operand) /* if (operand) */
ope2 = ft_atoi(operand); /* ope2 = ft_atoi(operand); */
else /* else */
ope2 = 0; /* ope2 = 0; */
if ((operator[0] == '/' || operator[0] == '%') && ope2 == 0) /* if ((operator[0] == '/' || operator[0] == '%') && ope2 == 0) */
return (ft_error_message(MATHERR_4)); /* return (error_msg(MATHERR_4)); */
else /* else */
{ /* { */
ope1 = (operator[0] == '+') ? ope1 + ope2 : ope1; /* ope1 = (operator[0] == '+') ? ope1 + ope2 : ope1; */
ope1 = (operator[0] == '-') ? ope1 - ope2 : ope1; /* ope1 = (operator[0] == '-') ? ope1 - ope2 : ope1; */
ope1 = (operator[0] == '/') ? ope1 / ope2 : ope1; /* ope1 = (operator[0] == '/') ? ope1 / ope2 : ope1; */
ope1 = (operator[0] == '*') ? ope1 * ope2 : ope1; /* ope1 = (operator[0] == '*') ? ope1 * ope2 : ope1; */
ope1 = (operator[0] == '%') ? ope1 % ope2 : ope1; /* ope1 = (operator[0] == '%') ? ope1 % ope2 : ope1; */
} /* } */
ft_strdel(value); /* ft_strdel(value); */
*value = ft_itoa(ope1); /* *value = ft_itoa(ope1); */
return (0); /* return (0); */
} /* } */
int builtin_math(const char *path, char *const av[], char *const envp[]) /* int builtin_math(const char *path, char *const av[], char *const envp[]) */
{ /* { */
char *var; /* char *var; */
char *value; /* char *value; */
char *operator; /* char *operator; */
char *operand; /* char *operand; */
(void)path; /* (void)path; */
(void)envp; /* (void)envp; */
if (!av || !av[1] || !av[2] || !av[3] || av[4]) /* if (!av || !av[1] || !av[2] || !av[3] || av[4]) */
return (ft_error_message(MATHERR_0)); /* return (error_msg(MATHERR_0)); */
init_math(&var, &value, &operator, &operand); /* init_math(&var, &value, &operator, &operand); */
var = av[1]; /* var = av[1]; */
if (get_value(&var, &value) == -1) /* if (get_value(&var, &value) == -1) */
return (-1); /* return (-1); */
operator = av[2]; /* operator = av[2]; */
if (!(ft_strlen(operator) == 1 && (operator[0] == '+' || operator[0] == '-' /* if (!(ft_strlen(operator) == 1 && (operator[0] == '+' || operator[0] == '-' */
|| operator[0] == '/' || operator[0] == '*' || operator[0] == '%'))) /* || operator[0] == '/' || operator[0] == '*' || operator[0] == '%'))) */
return (ft_error_message(MATHERR_2)); /* return (error_msg(MATHERR_2)); */
operand = av[3]; /* operand = av[3]; */
if (!ft_stris(operand, &ft_isdigit)) /* if (!ft_stris(operand, &ft_isdigit)) */
return (ft_error_message(MATHERR_3)); /* return (error_msg(MATHERR_3)); */
if (do_math(&value, operator, operand) == -1) /* if (do_math(&value, operator, operand) == -1) */
return (-1); /* return (-1); */
builtin_setenv("setenv", (char *[]){"local", var, value, 0}, data_singleton()->local_var); /* builtin_setenv("setenv", (char *[]){"local", var, value, 0}, data_singleton()->local_var); */
return (0); /* return (0); */
} /* } */

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

@ -6,7 +6,7 @@
/* By: jhalford <jhalford@student.42.fr> +#+ +:+ +#+ */ /* By: jhalford <jhalford@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2016/12/13 13:09:57 by jhalford #+# #+# */ /* Created: 2016/12/13 13:09:57 by jhalford #+# #+# */
/* Updated: 2017/03/15 20:01:03 by ariard ### ########.fr */ /* Updated: 2017/03/16 15:54:15 by jhalford ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -29,7 +29,7 @@ t_stof g_builtin[] =
{"read", &builtin_read}, {"read", &builtin_read},
{"hash", &builtin_hash}, {"hash", &builtin_hash},
{"history", &builtin_history}, {"history", &builtin_history},
{"math", &builtin_math}, /* {"math", &builtin_math}, */
{NULL, NULL}, {NULL, NULL},
}; };

26
42sh/src/job-control/process_format.c
View file

@ -6,12 +6,32 @@
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */ /* By: jhalford <jack@crans.org> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2017/01/09 13:05:55 by jhalford #+# #+# */ /* Created: 2017/01/09 13:05:55 by jhalford #+# #+# */
/* Updated: 2017/03/14 20:21:46 by wescande ### ########.fr */ /* Updated: 2017/03/16 16:39:03 by jhalford ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
#include "minishell.h" #include "minishell.h"
static int redirection_print(t_redir *redir)
{
char symbol[3];
if (redir->type == TK_LESS)
ft_strcpy(symbol, "<");
else if (redir->type == TK_GREAT)
ft_strcpy(symbol, ">");
else if (redir->type == TK_DLESS)
ft_strcpy(symbol, "<<");
else if (redir->type == TK_DGREAT)
ft_strcpy(symbol, ">>");
else if (redir->type == TK_LESSAND)
ft_strcpy(symbol, "<&");
else if (redir->type == TK_GREATAND)
ft_strcpy(symbol, ">&");
ft_printf(" %i%s%s", redir->n, symbol, redir->word);
return (0);
}
static void process_format_state(t_process *p) static void process_format_state(t_process *p)
{ {
int state; int state;
@ -44,7 +64,7 @@ static void process_format_com_long(t_list **plist)
p = (*plist)->content; p = (*plist)->content;
if (p->map.print) if (p->map.print)
(p->map.print)(p); (p->map.print)(p);
// faudrait printer les redirections (p->redir) ici genre avec ft_lstiter je pense ft_lstiter(p->redirs, redirection_print);
if ((*plist)->next) if ((*plist)->next)
ft_putstr(" |"); ft_putstr(" |");
(*plist) = (*plist)->next; (*plist) = (*plist)->next;
@ -67,7 +87,7 @@ static void process_format_com_short(t_list **plist, t_flag state)
} }
if (p->map.print) if (p->map.print)
(p->map.print)(p); (p->map.print)(p);
// faudrait printer les redirections (p->redir) ici genre avec ft_lstiter je pense ft_lstiter(p->redirs, redirection_print);
if ((*plist)->next) if ((*plist)->next)
ft_putstr(" | "); ft_putstr(" | ");
(*plist) = (*plist)->next; (*plist) = (*plist)->next;

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

@ -6,7 +6,7 @@
/* By: jhalford <jhalford@student.42.fr> +#+ +:+ +#+ */ /* By: jhalford <jhalford@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2016/12/06 18:40:58 by jhalford #+# #+# */ /* Created: 2016/12/06 18:40:58 by jhalford #+# #+# */
/* Updated: 2017/03/15 17:55:12 by jhalford ### ########.fr */ /* Updated: 2017/03/16 16:36:34 by jhalford ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */

2
42sh/src/parser/error_syntax.c
View file

@ -6,7 +6,7 @@
/* By: ariard <ariard@student.42.fr> +#+ +:+ +#+ */ /* By: ariard <ariard@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2017/02/09 20:15:35 by ariard #+# #+# */ /* Created: 2017/02/09 20:15:35 by ariard #+# #+# */
/* Updated: 2017/03/15 04:12:31 by wescande ### ########.fr */ /* Updated: 2017/03/16 15:52:35 by jhalford ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */