Testing in progress

Author: YD-S

lib/libft/src/ft_printcharpp.c

@@ -19,7 +19,7 @@ void	print_charpp(char **cmd)
 	i = 0;
 	while (cmd[i])
 	{
-		ft_printf("%s\n", cmd[i]);
+		ft_printf("-%s-\n", cmd[i]);
 		i++;
 	}
 }

src/ft_parser.c

@@ -46,7 +46,7 @@ char	**ft_parser(char *prompt)
 	char	**cmd;
 
 	cmd = ft_cmdtrim(prompt);
-	if (prompt[0] && prompt[ft_strlen(prompt) - 1] == ' ')
+	if (prompt[ft_strlen(prompt) - 1] == ' ')
 		cmd = ft_charpp_del_back(cmd);
 	cmd = ft_expand_vars(cmd);
 	return (cmd);
@@ -69,7 +69,7 @@ char	**ft_cmdtrim(char *prompt)
 
 	i = 0;
 	ret = NULL;
-	while (i < (int)ft_strlen(prompt))
+	while (prompt[i] != '\0')
 	{
 		while (prompt[0] && prompt[i] == ' ')
 			i++;

src/main.c

@@ -16,6 +16,7 @@ int	main(int argc, char **argv __attribute__((unused)), char **envp)
 {
 	char	*line;
 	char	**cmds;
+	int		check;
 
 	if (argc != 1)
 		exit(0);
@@ -25,18 +26,16 @@ int	main(int argc, char **argv __attribute__((unused)), char **envp)
 	while (1)
 	{
 		line = ft_readline();
-		if (ft_check_cmd(line))
+		check = ft_check_cmd(line);
+		if (check == 1)
 		{
 			cmds = ft_parser(line);
 			ft_executer(cmds, g_global.path);
 			ft_charppfree(cmds);
 			free(line);
 		}
-		else
-		{
+		else if (check == 0)
 			ft_error("minishell syntax error\n", line);
-			g_global.exit_status = 258;
-		}
 	}
 }
 

src/parser_utils.c

@@ -86,7 +86,7 @@ int	ft_check_cmd(char *prompt)
 	if (state != NO && state != SQC && state != DQC)
 	{
 		ft_printf("Quote Error\n");
-		return (0);
+		return (-1);
 	}
 	__qs('\0', 1);
 	if (!ft_locate_firstpipe(prompt))

src/prints.c

@@ -16,6 +16,7 @@ void	ft_error(char *str, char *line)
 {
 	free(line);
 	ft_putstr_fd(str, 2);
+	g_global.exit_status = 258;
 }
 
 char	*ft_readline(void)

src/quote.c

@@ -34,50 +34,48 @@ char	*ft_add_quote(char *str)
 
 char	*ft_dq(char *prompt, int i)
 {
+	char	*aux;
+	int		j;
 	int		len;
-	char	*ret;
 
 	len = ft_strclen(prompt, DQ, i + 1);
-	if (prompt[i + len] != ' ')
+	aux = ft_calloc(len + 2, sizeof(char));
+	j = 1;
+	i++;
+	aux[0] = DQ;
+	while (prompt[i] != DQ)
 	{
-		if (prompt[len + 1])
-		{
-			if (prompt[i + len] == DQ)
-				len += ft_strclen(prompt, DQ, len + 2);
-			else if (prompt[i + len] == SQ)
-				len += ft_strclen(prompt, SQ, len + 2);
-			else
-				len += wordlen_perso(prompt, len + i);
-			ret = ft_substr(prompt, i, len + 2);
-			return (ret);
-		}
+		aux[j] = prompt[i];
+		if (prompt[i] == '\0')
+			return (aux);
+		i++;
+		j++;
 	}
-	ret = ft_substr(prompt, i, len + 1);
-	return (ret);
+	aux[j] = DQ;
+	return (aux);
 }
 
 char	*ft_sq(char *prompt, int i)
 {
+	char	*aux;
+	int		j;
 	int		len;
-	char	*ret;
 
 	len = ft_strclen(prompt, SQ, i + 1);
-	if (prompt[i + len + 1] != ' ')
+	aux = ft_calloc(len + 2, sizeof(char));
+	j = 1;
+	i++;
+	aux[0] = SQ;
+	while (prompt[i] != SQ)
 	{
-		if (prompt[len + 1])
-		{
-			if (prompt[i + len + 1] == DQ)
-				len += ft_strclen(prompt, DQ, len + 2);
-			else if (prompt[i + len + 1] == SQ)
-				len += ft_strclen(prompt, SQ, len + 2);
-			else
-				len += wordlen_perso(prompt, len + i);
-			ret = ft_substr(prompt, i, len + 2);
-			return (ret);
-		}
+		aux[j] = prompt[i];
+		if (prompt[i] == '\0')
+			return (aux);
+		i++;
+		j++;
 	}
-	ret = ft_substr(prompt, i, len + 1);
-	return (ret);
+	aux[j] = SQ;
+	return (aux);
 }
 
 int	wordlen_perso(char *prompt, int i)
@@ -96,10 +94,19 @@ int	wordlen_perso(char *prompt, int i)
 
 char	*ft_noq(char *prompt, int i)
 {
+	char	*aux;
+	int		j;
 	int		len;
-	char	*ret;
 
 	len = wordlen_perso(prompt, i);
-	ret = ft_substr(prompt, i, len);
-	return (ret);
+	aux = ft_calloc(len + 2, sizeof(char));
+	j = 0;
+	while (prompt[i] != ' ' && prompt[i] != '"'
+		&& prompt[i] != '\'' && prompt[i] != '\0')
+	{
+		aux[j] = prompt[i];
+		i++;
+		j++;
+	}
+	return (aux);
 }