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

merge

Browse source
This commit is contained in:
wescande 2017-03-24 17:02:05 +01:00
commit 8c5cf94616
8 changed files with 20 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
42sh/includes/job_control.h
View file

@ -6,7 +6,7 @@
/* By: jhalford <jhalford@student.42.fr> +#+ +:+ +#+ */ /* By: jhalford <jhalford@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2016/12/10 16:55:09 by jhalford #+# #+# */ /* Created: 2016/12/10 16:55:09 by jhalford #+# #+# */
/* Updated: 2017/03/24 15:07:50 by gwojda ### ########.fr */ /* Updated: 2017/03/24 16:17:40 by gwojda ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -81,7 +81,7 @@ void process_format(t_list **p, int firstp, int opts);
*/ */
void pprint(t_process *p); void pprint(t_process *p);
int pprint_subshell(t_process *p);; int pprint_subshell(t_process *p);
int pprint_brace(t_process *p); int pprint_brace(t_process *p);
int pprint_while(t_process *p); int pprint_while(t_process *p);
int pprint_if(t_process *p); int pprint_if(t_process *p);

4
42sh/includes/types.h
View file

@ -3,10 +3,10 @@
/* ::: :::::::: */ /* ::: :::::::: */
/* types.h :+: :+: :+: */ /* types.h :+: :+: :+: */
/* +:+ +:+ +:+ */ /* +:+ +:+ +:+ */
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */ /* By: jhalford <jhalford@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2016/12/13 17:11:48 by jhalford #+# #+# */ /* Created: 2016/12/13 17:11:48 by jhalford #+# #+# */
/* Updated: 2017/03/24 16:58:22 by wescande ### ########.fr */ /* Updated: 2017/03/24 17:00:06 by gwojda ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */

4
42sh/libft/src/btree/btree_map.c
View file

@ -3,10 +3,10 @@
/* ::: :::::::: */ /* ::: :::::::: */
/* btree_map.c :+: :+: :+: */ /* btree_map.c :+: :+: :+: */
/* +:+ +:+ +:+ */ /* +:+ +:+ +:+ */
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */ /* By: jhalford <jhalford@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2017/03/08 11:50:46 by jhalford #+# #+# */ /* Created: 2017/03/08 11:50:46 by jhalford #+# #+# */
/* Updated: 2017/03/21 15:42:18 by jhalford ### ########.fr */ /* Updated: 2017/03/24 15:49:42 by gwojda ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */

7
42sh/libft/src/error/error.c
View file

@ -3,10 +3,10 @@
/* ::: :::::::: */ /* ::: :::::::: */
/* error.c :+: :+: :+: */ /* error.c :+: :+: :+: */
/* +:+ +:+ +:+ */ /* +:+ +:+ +:+ */
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */ /* By: jhalford <jhalford@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2017/03/14 16:47:00 by jhalford #+# #+# */ /* Created: 2017/03/14 16:47:00 by jhalford #+# #+# */
/* Updated: 2017/03/24 15:36:34 by jhalford ### ########.fr */ /* Updated: 2017/03/24 16:22:55 by gwojda ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -39,6 +39,7 @@ int error_set(int n, ...)
int ft_perror(char *utility) int ft_perror(char *utility)
{ {
ft_dprintf(2, "{red}%s: %s{eoc}\n", utility ? utility : g_argv[0], g_errmsg); ft_dprintf(2, "{red}%s: %s{eoc}\n", utility ? utility : g_argv[0],
g_errmsg);
return (g_errnum); return (g_errnum);
} }

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

@ -6,7 +6,7 @@
/* By: wescande <wescande@student.42.fr> +#+ +:+ +#+ */ /* By: wescande <wescande@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2017/03/24 15:03:02 by wescande #+# #+# */ /* Created: 2017/03/24 15:03:02 by wescande #+# #+# */
/* Updated: 2017/03/24 17:00:56 by wescande ### ########.fr */ /* Updated: 2017/03/24 17:01:44 by wescande ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */

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

@ -6,7 +6,7 @@
/* By: jhalford <jhalford@student.42.fr> +#+ +:+ +#+ */ /* By: jhalford <jhalford@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2017/01/20 15:01:45 by jhalford #+# #+# */ /* Created: 2017/01/20 15:01:45 by jhalford #+# #+# */
/* Updated: 2017/03/24 15:10:57 by jhalford ### ########.fr */ /* Updated: 2017/03/24 16:23:51 by gwojda ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -39,7 +39,7 @@ int bt_read_init(t_read *data, char **av)
if (isatty(STDIN)) if (isatty(STDIN))
data->opts |= BT_READ_INTER; data->opts |= BT_READ_INTER;
if (bt_read_terminit(data) < 0) if (bt_read_terminit(data) < 0)
exit (1); exit(1);
if ((cliopts_get(av, g_read_opts, data))) if ((cliopts_get(av, g_read_opts, data)))
return (ft_perror("read")); return (ft_perror("read"));
return (0); return (0);

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

@ -6,7 +6,7 @@
/* By: jhalford <jhalford@student.42.fr> +#+ +:+ +#+ */ /* By: jhalford <jhalford@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2016/11/28 19:26:32 by jhalford #+# #+# */ /* Created: 2016/11/28 19:26:32 by jhalford #+# #+# */
/* Updated: 2017/03/24 13:51:24 by wescande ### ########.fr */ /* Updated: 2017/03/24 16:27:51 by gwojda ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -92,12 +92,12 @@ int data_init(int ac, char **av)
term_name = "dumb"; term_name = "dumb";
if (tgetent(NULL, term_name) != 1) if (tgetent(NULL, term_name) != 1)
{ {
ft_dprintf(2, "{red}TERM name is not a tty\n{eoc}"); SH_ERR("TERM name is not a tty");
return (-1); return (-1);
} }
if (path_binary_save(av[0])) if (path_binary_save(av[0]))
{ {
ft_dprintf(2, "{red}Failed to resolve binary name\n{eoc}"); SH_ERR("Failed to resolve binary name");
return (-1); return (-1);
} }
return (0); return (0);

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

@ -1,12 +1,12 @@
/* ************************************************************************** */ /* ************************************************************************** */
/* */ /* */
/* ::: :::::::: */ /* ::: :::::::: */
/* tree_type.c :+: :+: :+: */ /* ft_putast.c :+: :+: :+: */
/* +:+ +:+ +:+ */ /* +:+ +:+ +:+ */
/* By: jhalford <marvin@42.fr> +#+ +:+ +#+ */ /* By: jhalford <jhalford@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2016/11/14 18:18:04 by jhalford #+# #+# */ /* Created: 2016/11/14 18:18:04 by jhalford #+# #+# */
/* Updated: 2017/03/14 22:11:26 by ariard ### ########.fr */ /* Updated: 2017/03/24 16:28:14 by gwojda ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */