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

env ./42sh still making problems

Browse source
This commit is contained in:
Jack Halford 2017-03-22 00:38:04 +01:00
parent b1f730a833
commit 9e8855a9ef
3 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
42sh/includes/exec.h
View file

@ -140,7 +140,7 @@ struct s_exec
}; };
int exec_reset(void); 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); int process_setgroup(t_process *p, pid_t pid);
void process_setsig(void); void process_setsig(void);
void process_reset(t_process *p); void process_reset(t_process *p);

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

@ -51,7 +51,7 @@ int process_launch(t_process *p)
process_free(p, 0); process_free(p, 0);
return (1); return (1);
} }
p->pid = process_fork(p): p->pid = process_fork(p);
process_setgroup(p, p->pid); process_setgroup(p, p->pid);
if (p->fdin != STDIN) if (p->fdin != STDIN)
close(p->fdin); close(p->fdin);

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

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