nicolas-arnaud
/
Minishell
1
0
Fork 1
Code Issues Pull Requests Projects 1 Releases Wiki Activity
Browse Source

fix: pipe on built-ins

master
narnaud 3 years ago
parent
c4edead900
commit
0ec79cf679
2 changed files with 7 additions and 9 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      Makefile
  2. 4
      minishell.c

4
Makefile
View File

@ -3,8 +3,8 @@ LIBFT = libft.a
SRCS = minishell.c lexer.c parser.c utils.c caller.c built-in.c env.c SRCS = minishell.c lexer.c parser.c utils.c caller.c built-in.c env.c
OBJS = ${SRCS:.c=.o} OBJS = ${SRCS:.c=.o}
//READLINE_INC = ~/.brew/opt/readline/include #READLINE_INC = ~/.brew/opt/readline/include
//LIB = -L ~/.brew/lib -lreadline -L ~/.brew/lib -lhistory -L. -lft #LIB = -L ~/.brew/lib -lreadline -L ~/.brew/lib -lhistory -L. -lft
LIB = -lreadline -lhistory -L. -lft LIB = -lreadline -lhistory -L. -lft

4
minishell.c
View File

@ -28,15 +28,13 @@ int caller(t_command *cmd)
} }
pid = fork(); pid = fork();
if (!pid) if (!pid)
{
if (command_call(cmd->argv) == -1)
{ {
if (cmd->fd[0]) if (cmd->fd[0])
dup2(cmd->fd[0], STDIN_FILENO); dup2(cmd->fd[0], STDIN_FILENO);
if (cmd->fd[1]) if (cmd->fd[1])
dup2(cmd->fd[1], STDOUT_FILENO); dup2(cmd->fd[1], STDOUT_FILENO);
if (command_call(cmd->argv) == -1)
exe(cmd->argv, cmd->envp); exe(cmd->argv, cmd->envp);
}
exit(1); exit(1);
} }
if (cmd->fd[1]) if (cmd->fd[1])

Write Preview
Loading…
Cancel
Save