「✨」 feat: working '$'?

include/parsing.h

@@ -6,7 +6,7 @@
 /*   By: adjoly <adjoly@student.42angouleme.fr>     +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/04/25 12:20:26 by adjoly            #+#    #+#             */
-/*   Updated: 2024/07/10 14:13:41 by adjoly           ###   ########.fr       */
+/*   Updated: 2024/07/13 16:35:57 by adjoly           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -126,6 +126,7 @@ char	*search_for_next_quote(char *s, t_quote quote_type);
  */
 char	*env_var_replace(char *readline, t_env *env);
 size_t	get_size_with_env(char *readline, t_env *env);
+size_t	strlen_till_notalnum(char *s);
 
 /*
  *						ONLY FOR DEBUG TO BE REMOVED 

src/main.c

@@ -6,7 +6,7 @@
 /*   By: mmoussou <mmoussou@student.42angouleme.fr  +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/04/24 11:18:04 by adjoly            #+#    #+#             */
-/*   Updated: 2024/07/13 13:35:37 by adjoly           ###   ########.fr       */
+/*   Updated: 2024/07/13 16:55:57 by adjoly           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -50,6 +50,7 @@ int	main(int ac, char **av, char **env)
 	get_env(&env_l);
 	if (!env_l)
 		return (EXIT_FAILURE);
+	get_exit_code(12);
 	while (1)
 	{
 		signal(SIGINT, &sig_c);

src/parsing/env_var/env_var_replace.c

@@ -6,13 +6,14 @@
 /*   By: adjoly <adjoly@student.42angouleme.fr>     +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/06/05 21:14:04 by adjoly            #+#    #+#             */
-/*   Updated: 2024/07/13 14:14:20 by adjoly           ###   ########.fr       */
+/*   Updated: 2024/07/13 17:21:59 by adjoly           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #include <stdlib.h>
 #include <stdio.h>
 #include "parsing.h"
+#include "minishell.h"
 #include "env.h"
 
 void	__cpy_dollar(char *tmp, size_t dollar_size, t_env *env, char **rl_dlrd)
@@ -39,11 +40,27 @@ size_t	strlen_till_notalnum(char *s)
 	return (tmp - s);
 }
 
+size_t __add_dollar(t_env *env, char **rl_dollared, char *tmp)
+{
+	size_t	dollar_size;
+
+	tmp++;
+	if ((*tmp) == '?')
+	{
+		ft_strlcat(*rl_dollared, ft_itoa(get_exit_code(-1)), \
+			 ft_strlen(ft_itoa(get_exit_code(-1))) \
+			 + ft_strlen(*rl_dollared) + 1);
+		return (1);
+	}
+	dollar_size = strlen_till_notalnum(tmp);
+	__cpy_dollar(tmp, dollar_size, env, rl_dollared);
+	return (dollar_size);
+}
+
 char	*env_var_replace(char *readline, t_env *env)
 {
 	char	*tmp;
 	char	*rl_dollared;
-	size_t	dollar_size;
 
 	rl_dollared = ft_calloc(get_size_with_env(readline, env) + 1, sizeof(char));
 	if (rl_dollared == NULL)
@@ -52,17 +69,7 @@ char	*env_var_replace(char *readline, t_env *env)
 	while (*tmp)
 	{
 		if (*tmp == '$' && is_inquote(readline, tmp - readline) != SINGLE)
-		{
+			tmp += __add_dollar(env, &rl_dollared, tmp) + 1;
-			tmp++;
-			if ((*tmp) == '?')
-			{
-				tmp++;
-				continue ;
-			}
-			dollar_size = strlen_till_notalnum(tmp);
-			__cpy_dollar(tmp, dollar_size, env, &rl_dollared);
-			tmp += dollar_size;
-		}
 		else
 		{
 			ft_strlcat(rl_dollared, tmp, ft_strlen(rl_dollared) + 2);

src/parsing/env_var/get_size_with_env.c

@@ -6,7 +6,7 @@
 /*   By: adjoly <adjoly@student.42angouleme.fr>     +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/06/06 15:01:19 by adjoly            #+#    #+#             */
-/*   Updated: 2024/07/09 15:09:44 by adjoly           ###   ########.fr       */
+/*   Updated: 2024/07/13 17:03:06 by adjoly           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -15,26 +15,43 @@
 #include "parsing.h"
 #include "libft.h"
 
+#include <stdio.h>
+
+size_t	__add_sizeof_dollar(size_t size, char **tmp, t_env *env, char *readline)
+{
+	char	*dollar;
+
+	if (**tmp == '$' && **tmp == '?' && \
+		is_inquote(*tmp, *tmp - readline) != SINGLE && \
+		is_inquote(*tmp, *tmp - readline) != NOT_CLOSED)
+	{
+		*tmp += 2;
+		size++;
+	}
+	else if (**tmp == '$' && is_inquote(*tmp, *tmp - readline) != SINGLE && \
+		is_inquote(*tmp, *tmp - readline) != NOT_CLOSED)
+	{
+		(*tmp)++;
+		size -= strlen_till_notalnum(*tmp);
+		dollar = env_getn_value(*tmp, env, strlen_till_notalnum(*tmp));
+		if (!dollar)
+			return (size);
+		size += ft_strlen(dollar);
+		free(dollar);
+	}
+	return (size);
+}
+
 size_t	get_size_with_env(char *readline, t_env *env)
 {
 	size_t	size;
 	char	*tmp;
-	char	*dollar;
 
 	tmp = readline;
 	size = ft_strlen(readline);
 	while (*tmp)
 	{
-		if (*tmp == '$' && is_inquote(tmp, tmp - readline) != SINGLE && \
+		size = __add_sizeof_dollar(size, &tmp, env, readline);
-				is_inquote(tmp, tmp - readline) != NOT_CLOSED)
-		{
-			tmp++;
-			size -= strlen_till_char(tmp, ' ');
-			dollar = env_getn_value(tmp, env, strlen_till_char(tmp, ' '));
-			if (!dollar)
-				continue ;
-			size += ft_strlen(dollar);
-		}
 		tmp++;
 	}
 	return (size + 1);