Merge pull request #25 from Hugothms/hugo

Hugo
Hugothms · Dec 8, 2020 · 26e516a · 26e516a
2 parents 0c80a01 + c5a881a
commit 26e516a
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 21 deletions.
diff --git a/srcs/parse/parse.c b/srcs/parse/parse.c
@@ -6,7 +6,7 @@
 /*   By: hthomas <[email protected]>            +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/09/17 15:52:09 by hthomas           #+#    #+#             */
-/*   Updated: 2020/12/07 18:58:31 by hthomas          ###   ########.fr       */
+/*   Updated: 2020/12/08 10:19:30 by hthomas          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -111,7 +111,10 @@ int			parse_input(char *input, t_list_line **lst_line, t_list *env)
 
 	cmd = NULL;
 	if (input_to_command(input, &cmd))
+	{
+		c_lst_clear(cmd);
 		return (FAILURE);
+	}
 	flag_dollar_and_replace_tild(cmd, env);
 	delete_empty_elements(&cmd);
 	if (cmd)

diff --git a/srcs/utils/utils2.c b/srcs/utils/utils2.c
@@ -6,7 +6,7 @@
 /*   By: hthomas <[email protected]>            +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/12/07 15:13:24 by vmoreau           #+#    #+#             */
-/*   Updated: 2020/12/07 19:18:58 by hthomas          ###   ########.fr       */
+/*   Updated: 2020/12/07 20:01:37 by hthomas          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -79,23 +79,23 @@ void	remove_double_char(char *str, char *charset)
 
 void	print_welcome_msg(void)
 {
-	ft_putstr("            ▄███████████████▄           \n");
-	ft_putstr("         ██████▀   ██   ▀███████        \n");
-	ft_putstr("      ███   ▀███   ██   ███▀   ███      \n");
-	ft_putstr("     ██████   ██   ██   ██   ██████     \n");
-	ft_putstr("     ██   ██   ██  ██  ██   ██   ██     \n");
-	ft_putstr("    ███    ██  ██  ██  ██  ██    ███    \n");
-	ft_putstr("    ██ ██   ██  █  ██  █  ██   ██ ██    \n");
-	ft_putstr("    ██  ███  ██ ██ ██ ██ ██  ███  ██    \n");
-	ft_putstr("    ██    ██  ██ █ ██ █ ██  ██    ██    \n");
-	ft_putstr("    ████▄   ██ █  █  █  █ ██   ▄████    \n");
-	ft_putstr("       ████   █          █   ████       \n");
-	ft_putstr("          ██                ██          \n");
-	ft_putstr("          ████████▄  ▄████████          \n");
-	ft_putstr("                  ▀██▀                  \n");
-	ft_putstr("           _       _     _          _ _\n");
-	ft_putstr(" _ __ ___ (_)_ __ (_)___| |__   ___| | |\n");
-	ft_putstr("| '_ ` _ \\| | '_ \\| / __| '_ \\ / _ \\ | |\n");
-	ft_putstr("| | | | | | | | | | \\__ \\ | | |  __/ | |\n");
-	ft_putstr("|_| |_| |_|_|_| |_|_|___/_| |_|\\___|_|_|\n\n");
+	ft_putstr_fd("            ▄███████████████▄           \n", STDERR);
+	ft_putstr_fd("         ██████▀   ██   ▀███████        \n", STDERR);
+	ft_putstr_fd("      ███   ▀███   ██   ███▀   ███      \n", STDERR);
+	ft_putstr_fd("     ██████   ██   ██   ██   ██████     \n", STDERR);
+	ft_putstr_fd("     ██   ██   ██  ██  ██   ██   ██     \n", STDERR);
+	ft_putstr_fd("    ███    ██  ██  ██  ██  ██    ███    \n", STDERR);
+	ft_putstr_fd("    ██ ██   ██  █  ██  █  ██   ██ ██    \n", STDERR);
+	ft_putstr_fd("    ██  ███  ██ ██ ██ ██ ██  ███  ██    \n", STDERR);
+	ft_putstr_fd("    ██    ██  ██ █ ██ █ ██  ██    ██    \n", STDERR);
+	ft_putstr_fd("    ████▄   ██ █  █  █  █ ██   ▄████    \n", STDERR);
+	ft_putstr_fd("       ████   █          █   ████       \n", STDERR);
+	ft_putstr_fd("          ██                ██          \n", STDERR);
+	ft_putstr_fd("          ████████▄  ▄████████          \n", STDERR);
+	ft_putstr_fd("                  ▀██▀                  \n", STDERR);
+	ft_putstr_fd("           _       _     _          _ _\n", STDERR);
+	ft_putstr_fd(" _ __ ___ (_)_ __ (_)___| |__   ___| | |\n", STDERR);
+	ft_putstr_fd("| '_ ` _ \\| | '_ \\| / __| '_ \\ / _ \\ | |\n", STDERR);
+	ft_putstr_fd("| | | | | | | | | | \\__ \\ | | |  __/ | |\n", STDERR);
+	ft_putstr_fd("|_| |_| |_|_|_| |_|_|___/_| |_|\\___|_|_|\n\n", STDERR);
 }