mirror of
https://codeberg.org/la-chouette/minishell.git
synced 2025-12-06 07:28:09 +01:00
Compare commits
5 commits
f4e9955f75
...
1b41f49341
| Author | SHA1 | Date | |
|---|---|---|---|
| 1b41f49341 | |||
| 411ceaf367 | |||
| 52e109d0b5 | |||
| 77015ce27e | |||
| 2fc47345f0 |
6 changed files with 113 additions and 23 deletions
2
Makefile
2
Makefile
|
|
@ -36,6 +36,7 @@ srcs = \
|
|||
src/executing/simple_cmd/builtin_pwd.c \
|
||||
src/executing/simple_cmd/builtins.c \
|
||||
src/executing/simple_cmd/simple_cmd_execute.c \
|
||||
src/executing/simple_cmd/subprocess.c \
|
||||
src/ft_errno.c \
|
||||
src/get_command.c \
|
||||
src/parser/cmdgroup/cmdgroup.c \
|
||||
|
|
@ -100,6 +101,7 @@ all: $(NAME)
|
|||
$(NAME): $(minishell_objs) $(LIBFT)
|
||||
$(CC) $(CFLAGS) -o $@ $(minishell_objs) $(LINCLUDE) $(LDLIBS)
|
||||
|
||||
$(LIBFT): CFLAGS+=-DBUFFER_SIZE=1
|
||||
$(LIBFT):
|
||||
+$(MAKE) -C $(LIBFTDIR)
|
||||
|
||||
|
|
|
|||
|
|
@ -6,39 +6,37 @@
|
|||
/* By: khais <marvin@42.fr> +#+ +:+ +#+ */
|
||||
/* +#+#+#+#+#+ +#+ */
|
||||
/* Created: 2025/03/27 16:21:56 by khais #+# #+# */
|
||||
/* Updated: 2025/04/01 16:37:31 by khais ### ########.fr */
|
||||
/* Updated: 2025/04/02 18:45:47 by khais ### ########.fr */
|
||||
/* */
|
||||
/* ************************************************************************** */
|
||||
|
||||
#include "simple_cmd_execute.h"
|
||||
#include "builtins.h"
|
||||
#include "subprocess.h"
|
||||
#include "libft.h"
|
||||
#include "../../subst/subst.h"
|
||||
#include "../../env/env_convert.h"
|
||||
#include <unistd.h>
|
||||
#include <sys/wait.h>
|
||||
|
||||
static char **argv_from_wordlist(t_wordlist *wordlist)
|
||||
{
|
||||
char **out;
|
||||
int i;
|
||||
|
||||
out = ft_calloc(wordlist_size(wordlist) + 1, sizeof(char *));
|
||||
i = 0;
|
||||
while (wordlist != NULL)
|
||||
{
|
||||
out[i++] = ft_strdup(wordlist->word->word);
|
||||
wordlist = wordlist->next;
|
||||
}
|
||||
return (out);
|
||||
}
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
static void command_not_found(t_simple_cmd *cmd)
|
||||
{
|
||||
ft_dprintf(STDERR_FILENO, "minishell: %s: command not found\n",
|
||||
cmd->words->word->word);
|
||||
}
|
||||
|
||||
static void do_waitpid(t_minishell *app, int pid)
|
||||
{
|
||||
int wstatus;
|
||||
|
||||
waitpid(pid, &wstatus, 0);
|
||||
if (WIFEXITED(wstatus))
|
||||
app->last_return_value = WEXITSTATUS(wstatus);
|
||||
if (WIFSIGNALED(wstatus))
|
||||
app->last_return_value = 128 + WTERMSIG(wstatus);
|
||||
}
|
||||
|
||||
void simple_cmd_execute(t_simple_cmd *cmd, t_minishell *app)
|
||||
{
|
||||
char *exe;
|
||||
|
|
@ -56,8 +54,8 @@ void simple_cmd_execute(t_simple_cmd *cmd, t_minishell *app)
|
|||
}
|
||||
pid = fork();
|
||||
if (pid == 0)
|
||||
execve(exe, argv_from_wordlist(cmd->words), envp_from_env(app->env));
|
||||
execute_subprocess(exe, cmd, app);
|
||||
free(exe);
|
||||
waitpid(pid, NULL, 0);
|
||||
do_waitpid(app, pid);
|
||||
return ;
|
||||
}
|
||||
|
|
|
|||
50
src/executing/simple_cmd/subprocess.c
Normal file
50
src/executing/simple_cmd/subprocess.c
Normal file
|
|
@ -0,0 +1,50 @@
|
|||
/* ************************************************************************** */
|
||||
/* */
|
||||
/* ::: :::::::: */
|
||||
/* subprocess.c :+: :+: :+: */
|
||||
/* +:+ +:+ +:+ */
|
||||
/* By: khais <marvin@42.fr> +#+ +:+ +#+ */
|
||||
/* +#+#+#+#+#+ +#+ */
|
||||
/* Created: 2025/04/02 18:19:23 by khais #+# #+# */
|
||||
/* Updated: 2025/04/02 18:20:54 by khais ### ########.fr */
|
||||
/* */
|
||||
/* ************************************************************************** */
|
||||
|
||||
#include "subprocess.h"
|
||||
#include "../../env/env_convert.h"
|
||||
#include "../../parser/simple_cmd/simple_cmd.h"
|
||||
#include "../../subst/path_split.h"
|
||||
#include <stdio.h>
|
||||
|
||||
static char **argv_from_wordlist(t_wordlist *wordlist)
|
||||
{
|
||||
char **out;
|
||||
int i;
|
||||
|
||||
out = ft_calloc(wordlist_size(wordlist) + 1, sizeof(char *));
|
||||
i = 0;
|
||||
while (wordlist != NULL)
|
||||
{
|
||||
out[i++] = ft_strdup(wordlist->word->word);
|
||||
wordlist = wordlist->next;
|
||||
}
|
||||
return (out);
|
||||
}
|
||||
|
||||
static void ft_execve(char *exe, char **argv, char **envp)
|
||||
{
|
||||
execve(exe, argv, envp);
|
||||
ft_dprintf(STDERR_FILENO, "minishell: %s: ", argv[0]);
|
||||
perror(NULL);
|
||||
free(exe);
|
||||
path_split_destroy(argv);
|
||||
path_split_destroy(envp);
|
||||
}
|
||||
|
||||
void execute_subprocess(char *exe, t_simple_cmd *cmd, t_minishell *app)
|
||||
{
|
||||
ft_execve(exe, argv_from_wordlist(cmd->words), envp_from_env(app->env));
|
||||
simple_cmd_destroy(cmd);
|
||||
env_destroy(app->env);
|
||||
exit(127);
|
||||
}
|
||||
20
src/executing/simple_cmd/subprocess.h
Normal file
20
src/executing/simple_cmd/subprocess.h
Normal file
|
|
@ -0,0 +1,20 @@
|
|||
/* ************************************************************************** */
|
||||
/* */
|
||||
/* ::: :::::::: */
|
||||
/* subprocess.h :+: :+: :+: */
|
||||
/* +:+ +:+ +:+ */
|
||||
/* By: khais <marvin@42.fr> +#+ +:+ +#+ */
|
||||
/* +#+#+#+#+#+ +#+ */
|
||||
/* Created: 2025/04/02 18:17:48 by khais #+# #+# */
|
||||
/* Updated: 2025/04/02 18:21:30 by khais ### ########.fr */
|
||||
/* */
|
||||
/* ************************************************************************** */
|
||||
|
||||
#ifndef SUBPROCESS_H
|
||||
# define SUBPROCESS_H
|
||||
|
||||
# include "../../minishell.h"
|
||||
|
||||
void execute_subprocess(char *exe, t_simple_cmd *cmd, t_minishell *app);
|
||||
|
||||
#endif // SUBPROCESS_H
|
||||
|
|
@ -6,7 +6,7 @@
|
|||
/* By: khais <marvin@42.fr> +#+ +:+ +#+ */
|
||||
/* +#+#+#+#+#+ +#+ */
|
||||
/* Created: 2025/03/02 13:40:10 by jguelen #+# #+# */
|
||||
/* Updated: 2025/03/27 18:39:23 by khais ### ########.fr */
|
||||
/* Updated: 2025/04/01 18:38:35 by khais ### ########.fr */
|
||||
/* */
|
||||
/* ************************************************************************** */
|
||||
|
||||
|
|
@ -77,8 +77,6 @@ static char *select_path(char *filepath, char **oldpath, char **path,
|
|||
else
|
||||
return (free(*oldpath), path_split_destroy(path), filepath);
|
||||
}
|
||||
if (*oldpath != filepath)
|
||||
free(filepath);
|
||||
return (NULL);
|
||||
}
|
||||
|
||||
|
|
|
|||
22
test.sh
22
test.sh
|
|
@ -335,6 +335,28 @@ status=1
|
|||
hello=hi
|
||||
EOF
|
||||
|
||||
when_run <<EOF "empty command is not found"
|
||||
""
|
||||
EOF
|
||||
expecting <<EOF
|
||||
minishell: : command not found
|
||||
EOF
|
||||
|
||||
when_run <<EOF "exit status of last command is preserved"
|
||||
echo \$?
|
||||
ls nonexist
|
||||
echo \$?
|
||||
echo hi
|
||||
echo \$?
|
||||
EOF
|
||||
expecting <<EOF
|
||||
0
|
||||
ls: cannot access 'nonexist': No such file or directory
|
||||
2
|
||||
hi
|
||||
0
|
||||
EOF
|
||||
|
||||
when_run <<EOF "quoted parentheses are not operators"
|
||||
echo unclosed '('
|
||||
EOF
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue