Normed m_prompt

1 files changed, 6 insertions, 65 deletions

diff --git a/src/m_prompt.c b/src/m_prompt.c
index 0dd525e..e0b3ed1 100644
--- a/src/m_prompt.c
+++ b/src/m_prompt.c
@@ -11,89 +11,30 @@
 /* ************************************************************************** */
 
 #include <libft.h>
+#include <stddef.h>
 #include <stdint.h>
 #include <unistd.h>
 #include <limits.h>
 
 #include "d_define.h"
 #include "m_prompt.h"
+#include "m_prompt_seq.h"
 #include "s_struct.h"
 #include "u_vars.h"
 
 static void	m_subst_prompt_rice(char var[], t_msh *msh)
 {
-	char	tmp[PATH_MAX];
 	size_t	i;
-	size_t	j;
 
 	i = 0;
 	while (var[i] != C_NUL)
 	{
 		if (var[i] == C_BACKS)
 		{
-			if (var[i + 1] == '0' && var[i + 2] == '3' && var[i + 3] == '3')
-			{
-				(void)ft_memmove(var + i, var + (i + 3), (ft_strlen(var + (i + 3)) + 1) * sizeof(char));
-				var[i] = C_ESC;
-			}
-			else if (var[i + 1] == 'n')
-			{
-				(void)ft_memmove(var + i, var + (i + 1), (ft_strlen(var + (i + 1)) + 1) * sizeof(char));
-				var[i] = C_LF;
-			}
-			else if (var[i + 1] == 'h' || var[i + 1] == 'H')
-			{
-				gethostname(tmp, 255);
-				(void)ft_memmove(var + i + ft_strlen(tmp), var + (i + 2), (ft_strlen(var + (i + 2)) + 1) * sizeof(char));
-				(void)ft_memcpy(var + i, tmp, ft_strlen(tmp) * sizeof(char));
-			}
-			else if (var[i + 1] == 'w')
-			{
-				u_get_var_value(tmp, "$PWD", PATH_MAX, msh);
-				if (tmp[0] != C_NUL)
-					ft_strsubst_s(var, "\\w", tmp);
-				else
-					ft_strsubst_s(var, "\\w", "?");
-			}
-			else if (var[i + 1] == 'W')
-			{
-				u_get_var_value(tmp, "$PWD", PATH_MAX, msh);
-				if (tmp[0] != C_NUL)
-				{
-					j = ft_strlen(tmp);
-					if (j > 1)
-					{
-						while (tmp[j] != '/' && j != 0)
-							j--;
-						j++;
-						(void)ft_memmove(tmp, tmp + j,
-							((ft_strlen(tmp) - j) + 1) * sizeof(char));
-					}
-					ft_strsubst_s(var, "\\W", tmp);
-				}
-				else
-					ft_strsubst_s(var, "\\w", "?");
-			}
-			else if (var[i + 1] == 'v')
-				ft_strsubst_s(var, "\\v", M_MSH_VERSION);
-			else if (var[i + 1] == 's')
-				ft_strsubst_s(var, "\\s", M_PROGNAME);
-			else if (var[i + 1] == '?')
-			{
-				ft_uitoa_s(tmp, msh->ret);
-				if (var[i + 2] == '!')
-				{
-					if (tmp[0] != '0')
-						ft_strsubst_s(var, "\\?!", tmp);
-					else
-					{
-						(void)ft_memmove(var + i, var + i + 3, (ft_strlen(var + i + 3) + 1) * sizeof(char));
-						i -= 1;
-					}
-				}
-				else
-					ft_strsubst_s(var, "\\?", tmp);
-			}
+			m_prompt_sequences(var, i);
+			m_prompt_sequences_next(var, i, msh);
+			m_prompt_sequences_more(var, i, msh);
+			i = m_prompt_sequences_again(var, i, msh);
 		}
 		i++;
 	}