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

getoutput temporary fix

Browse source
This commit is contained in:
Jack Halford 2017-03-05 18:15:09 +01:00
parent 510a0c303a
commit 25a8e2f65e
4 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -6,7 +6,7 @@
/* By: jhalford <jhalford@student.42.fr> +#+ +:+ +#+ */ /* By: jhalford <jhalford@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2016/12/13 14:20:45 by jhalford #+# #+# */ /* Created: 2016/12/13 14:20:45 by jhalford #+# #+# */
/* Updated: 2017/03/05 16:32:22 by jhalford ### ########.fr */ /* Updated: 2017/03/05 18:08:57 by jhalford ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -45,11 +45,12 @@ int launch_process(t_process *p)
} }
process_setgroup(p, 0); process_setgroup(p, 0);
process_setsig(); process_setsig();
DG("gonna redirect");
if (process_redirect(p)) if (process_redirect(p))
exit (1); exit (1);
if (p->attributes & PROCESS_BUILTIN)
exit((*p->execf)(p->path, p->av, data_singleton()->env));
(*p->execf)(p->path, p->av, data_singleton()->env); (*p->execf)(p->path, p->av, data_singleton()->env);
ft_dprintf(2, "{red}%s: internal excve error{eoc}\n", SHELL_NAME); ft_dprintf(2, "{red}%s: internal execve error on %s{eoc}\n", SHELL_NAME, p->av[0]);
} }
else if (pid > 0) else if (pid > 0)
{ {

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

@ -6,7 +6,7 @@
/* By: jhalford <jhalford@student.42.fr> +#+ +:+ +#+ */ /* By: jhalford <jhalford@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2016/12/13 17:07:10 by jhalford #+# #+# */ /* Created: 2016/12/13 17:07:10 by jhalford #+# #+# */
/* Updated: 2017/03/03 16:32:15 by jhalford ### ########.fr */ /* Updated: 2017/03/05 18:09:31 by jhalford ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */

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

@ -6,7 +6,7 @@
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */ /* By: jhalford <jack@crans.org> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2017/01/12 14:01:59 by jhalford #+# #+# */ /* Created: 2017/01/12 14:01:59 by jhalford #+# #+# */
/* Updated: 2017/03/03 16:45:40 by jhalford ### ########.fr */ /* Updated: 2017/03/05 18:07:24 by jhalford ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -15,7 +15,7 @@
char *command_getoutput(char *command) char *command_getoutput(char *command)
{ {
return (command); return (ft_strdup(command));
/* int fds[2]; */ /* int fds[2]; */
/* t_btree *ast; */ /* t_btree *ast; */
/* t_astnode item; */ /* t_astnode item; */

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

@ -6,7 +6,7 @@
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */ /* By: jhalford <jack@crans.org> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2017/01/11 14:04:48 by jhalford #+# #+# */ /* Created: 2017/01/11 14:04:48 by jhalford #+# #+# */
/* Updated: 2017/03/05 17:09:22 by jhalford ### ########.fr */ /* Updated: 2017/03/05 17:45:37 by jhalford ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */