From 8ba13c02d59eda84cbba276ffe175f18b0545e90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kha=C3=AFs=20COLIN?= Date: Mon, 21 Apr 2025 13:07:02 +0200 Subject: [PATCH] refactor(redirect): ambiguous redirect message to own file --- Makefile | 1 + src/postprocess/ambiguous_redirect.c | 19 +++++++++++++++++++ src/postprocess/ambiguous_redirect.h | 18 ++++++++++++++++++ .../fieldsplit/redirect_fieldsplit.c | 6 +++--- 4 files changed, 41 insertions(+), 3 deletions(-) create mode 100644 src/postprocess/ambiguous_redirect.c create mode 100644 src/postprocess/ambiguous_redirect.h diff --git a/Makefile b/Makefile index 276cdf6..285ec08 100644 --- a/Makefile +++ b/Makefile @@ -93,6 +93,7 @@ srcs = \ src/parser/wordsplit/tokenizing_6_10.c \ src/parser/wordsplit/wordsplit.c \ src/parser/wordsplit/wordsplit_utils.c \ + src/postprocess/ambiguous_redirect.c \ src/postprocess/expansion/expand_vars.c \ src/postprocess/expansion/expand_wildcard.c \ src/postprocess/fieldsplit/fieldsplit.c \ diff --git a/src/postprocess/ambiguous_redirect.c b/src/postprocess/ambiguous_redirect.c new file mode 100644 index 0000000..dd61ac0 --- /dev/null +++ b/src/postprocess/ambiguous_redirect.c @@ -0,0 +1,19 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ambiguous_redirect.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: khais +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2025/04/21 14:24:00 by khais #+# #+# */ +/* Updated: 2025/04/21 14:25:27 by khais ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include "ambiguous_redirect.h" +#include "libft.h" + +void ambiguous_redirect(char *original) +{ + ft_dprintf(STDERR_FILENO, "minishell: %s: ambiguous redirect\n", original); +} diff --git a/src/postprocess/ambiguous_redirect.h b/src/postprocess/ambiguous_redirect.h new file mode 100644 index 0000000..c47852f --- /dev/null +++ b/src/postprocess/ambiguous_redirect.h @@ -0,0 +1,18 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ambiguous_redirect.h :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: khais +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2025/04/21 14:23:49 by khais #+# #+# */ +/* Updated: 2025/04/21 14:25:25 by khais ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#ifndef AMBIGUOUS_REDIRECT_H +# define AMBIGUOUS_REDIRECT_H + +void ambiguous_redirect(char *original); + +#endif // AMBIGUOUS_REDIRECT_H diff --git a/src/postprocess/fieldsplit/redirect_fieldsplit.c b/src/postprocess/fieldsplit/redirect_fieldsplit.c index 9665a8e..97b6e75 100644 --- a/src/postprocess/fieldsplit/redirect_fieldsplit.c +++ b/src/postprocess/fieldsplit/redirect_fieldsplit.c @@ -6,7 +6,7 @@ /* By: khais +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/04/21 11:54:16 by khais #+# #+# */ -/* Updated: 2025/04/21 11:57:50 by khais ### ########.fr */ +/* Updated: 2025/04/21 14:25:13 by khais ### ########.fr */ /* */ /* ************************************************************************** */ @@ -14,6 +14,7 @@ #include "fieldsplit.h" #include "../../parser/redirect/redirect.h" #include "../../parser/cmd/cmd_destroy.h" +#include "../ambiguous_redirect.h" #include static void redirect_fieldsplit_cleanup(t_redirect *in_list, @@ -39,8 +40,7 @@ static t_simple_cmd *redirect_fieldsplit_single(t_redirect *in_list, current->redirectee.filename = wordlist_pop(&out); if (out != NULL) { - ft_dprintf(STDERR_FILENO, "minishell: %s: ambiguous redirect\n", - current->unexpanded_filename); + ambiguous_redirect(current->unexpanded_filename); redirect_fieldsplit_cleanup(in_list, out_list, current, cmd); return (wordlist_destroy(out), NULL); }