logistic-bot/minishell
1
0
Fork 0
mirror of https://codeberg.org/la-chouette/minishell.git synced 2025-12-05 23:18:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(wildcard): error handling for wildcard expansion in redirections

Browse source
This commit is contained in:
Khaïs COLIN 2025-04-30 15:03:30 +02:00
parent 04eabf096d
commit 826abdf623
3 changed files with 17 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/executing/simple_cmd/simple_cmd_execute.c
View file

@ -6,7 +6,7 @@
/* By: kcolin <kcolin@42.fr> +#+ +:+ +#+ */ /* By: kcolin <kcolin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/03/27 16:21:56 by kcolin #+# #+# */ /* Created: 2025/03/27 16:21:56 by kcolin #+# #+# */
/* Updated: 2025/04/30 14:05:26 by kcolin ### ########.fr */ /* Updated: 2025/04/30 15:08:01 by kcolin ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -114,7 +114,7 @@ t_subprocess simple_cmd_execute(t_simple_cmd *cmd, t_minishell *app)
ft_errno(FT_ESUCCESS); ft_errno(FT_ESUCCESS);
if (post_process_command(cmd, app) == NULL) if (post_process_command(cmd, app) == NULL)
{ {
if (ft_errno_get() != FT_ESUCCESS) if (ft_errno_get() != FT_ESUCCESS && errno != 0)
ft_dprintf(STDERR_FILENO, "minishell: post-processing error\n"); ft_dprintf(STDERR_FILENO, "minishell: post-processing error\n");
return (PARENTPROCESS); return (PARENTPROCESS);
} }

9
src/postprocess/expansion/expand_wildcard.c
View file

@ -6,7 +6,7 @@
/* By: kcolin <kcolin@42.fr> +#+ +:+ +#+ */ /* By: kcolin <kcolin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/04/03 19:28:28 by kcolin #+# #+# */ /* Created: 2025/04/03 19:28:28 by kcolin #+# #+# */
/* Updated: 2025/04/30 14:51:12 by kcolin ### ########.fr */ /* Updated: 2025/04/30 15:09:59 by kcolin ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -21,6 +21,7 @@ static t_redirect *redirect_expand_wildcard_one(t_redirect *current)
{ {
t_wordlist *expansion_result; t_wordlist *expansion_result;
ft_errno(FT_ESUCCESS);
expansion_result = expand_star(current->redirectee.filename); expansion_result = expand_star(current->redirectee.filename);
if (expansion_result != NULL) if (expansion_result != NULL)
{ {
@ -34,6 +35,8 @@ static t_redirect *redirect_expand_wildcard_one(t_redirect *current)
return (ft_errno(FT_EERRNO), NULL); return (ft_errno(FT_EERRNO), NULL);
} }
} }
else if (expansion_result == NULL && ft_errno_get() != FT_ESUCCESS)
return (redirect_destroy(current), NULL);
return (current); return (current);
} }
@ -48,7 +51,9 @@ static t_redirect *redirect_expand_wildcards(t_redirect *in_list)
current = redirect_pop(&in_list); current = redirect_pop(&in_list);
if (current->type != FT_HEREDOC) if (current->type != FT_HEREDOC)
{ {
if (redirect_expand_wildcard_one(current) == NULL) ft_errno(FT_ESUCCESS);
if (redirect_expand_wildcard_one(current) == NULL
&& ft_errno_get() != FT_ESUCCESS)
{ {
redirect_destroy(in_list); redirect_destroy(in_list);
redirect_destroy(out_list); redirect_destroy(out_list);

8
test.sh
View file

@ -1602,4 +1602,12 @@ expecting <<EOF
hi hi
EOF EOF
when_run <<EOF "wildcard redirect ambiguous"
touch a.txt b.txt
echo hello > *.txt
EOF
expecting <<EOF
minishell: *.txt: ambiguous redirect
EOF
finalize finalize