Norming p_lblock_next

1 files changed, 16 insertions, 42 deletions

diff --git a/src/p_lblock_next.c b/src/p_lblock_next.c
index 49bedd6..03d7f80 100644
--- a/src/p_lblock_next.c
+++ b/src/p_lblock_next.c
@@ -18,6 +18,7 @@
 #include "d_define.h"
 #include "s_destroy.h"
 #include "f_fail.h"
+#include "p_lblock_more.h"
 #include "s_struct.h"
 #include "u_alias.h"
 #include "u_parse.h"
@@ -210,61 +211,34 @@ char			**p_subst_home(char *words[], t_msh *msh)
 	return (words);
 }
 
-static void		p_register_word(char word[], t_msh *msh)
+static char		**p_alloc_rewords(char *words[], int64_t j, t_msh *msh)
 {
-	char	name[255];
-	char	val[ARG_MAX];
-	char	*ptr;
-	size_t	i;
+	char	**rewords;
 
-	name[0] = '$';
-	ptr = word;
-	i = 1;
-	while (*ptr != '=' && *ptr != '\0')
-	{
-		name[i] = *ptr;
-		i++;
-		ptr++;
-	}
-	name[i] = '\0';
-	ptr++;
-	i = 0;
-	while (*ptr != '\0')
+	if ((rewords = (char**)malloc((j + 1) * sizeof(char*))) == NULL)
 	{
-		val[i] = *ptr;
-		i++;
-		ptr++;
+		ft_delwords(words);
+		f_alloc_and_destroy_msh(msh);
 	}
-	val[i] = '\0';
-	u_subst_var_value(name, val, msh);
+	return (rewords);
 }
 
 static char		**p_add_to_variables_and_delete(char *words[],
-									t_bool reg,
-									int64_t i,
-									t_msh *msh)
+												t_bool reg,
+												int64_t i,
+												t_msh *msh)
 {
 	char	**rewords;
 	int64_t	j;
 	int64_t	k;
 
-	j = 0;
-	if (reg == TRUE)
-	{
-		while (words[j] && j < i)
-		{
-			p_register_word(words[j], msh);
-			j++;
-		}
-	}
+	j = -1;
+	while (reg == TRUE && words[++j] != NULL && j < i)
+		p_register_word(words[j], msh);
 	j = 0;
 	while (words[i + j] != NULL)
 		j++;
-	if ((rewords = (char**)malloc((j + 1) * sizeof(char*))) == NULL)
-	{
-		ft_delwords(words);
-		f_alloc_and_destroy_msh(msh);
-	}
+	rewords = p_alloc_rewords(words, j, msh);
 	k = i;
 	while (i - k < j)
 	{
@@ -319,14 +293,14 @@ char			**p_check_args_equals(char *words[], t_msh *msh)
 	while (words[++i] != NULL)
 	{
 		ptr = p_set_ptr(words, i, &reg, &isvar);
-		if (*ptr == '\0' || words[i][0] == '=' || ft_isdigit(words[i][0]))
+		if (*ptr == C_NUL || words[i][0] == '=' || ft_isdigit(words[i][0]))
 		{
 			reg = FALSE;
 			isvar = (i == 0) ? (FALSE) : (isvar);
 			if (isvar == TRUE)
 				p_add_to_env_fork(i, words, msh);
 			else
-				msh->env_fork_tmp[0][0] = '\0';
+				msh->env_fork_tmp[0][0] = C_NUL;
 			break ;
 		}
 	}