merge wallah ct chaud

Makefile

@@ -7,7 +7,7 @@ NAME = minishell
 
 CC = gcc
 
-CFLAGS = -Wall -Werror -Wextra -g
+CFLAGS = -Werror -Wextra -g
 
 LIBS = libftx/libftx.a
 

env.c

@@ -6,7 +6,7 @@
 /*   By: erey-bet <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2023/02/02 14:39:56 by erey-bet          #+#    #+#             */
-/*   Updated: 2023/02/16 15:13:35 by cchauvet         ###   ########.fr       */
+/*   Updated: 2023/02/16 15:18:48 by cchauvet         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 

main.c

@@ -1,25 +1,16 @@
-#include "libftx/libftx.h"
+/* ************************************************************************** */
-#include "minishell.h"
-#include <fcntl.h>
-
-/* int	main(int ac, char **av) */
-/* { */
-/* 	char	*line; */
-/* 	int		fd; */
 /*                                                                            */
-/* 	if (ac != 2) */
+/*                                                        :::      ::::::::   */
-/* 		return (1); */
+/*   main.c                                             :+:      :+:    :+:   */
-/* 	fd = open(av[1], O_RDONLY); */
+/*                                                    +:+ +:+         +:+     */
-/* 	line = get_next_line(fd); */
+/*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
-/* 	while (line != NULL) */
+/*                                                +#+#+#+#+#+   +#+           */
-/* 	{ */
+/*   Created: 2023/02/16 15:16:14 by cchauvet          #+#    #+#             */
-/* 		ft_printf(line); */
+/*   Updated: 2023/02/16 15:16:45 by cchauvet         ###   ########.fr       */
-/* 		line = get_next_line(fd); */
+/*                                                                            */
-/* 		free(line); */
+/* ************************************************************************** */
-/* 	} */
+
-/* 	free(line); */
+#include "minishell.h"
-/* 	return (0); */
-/* } */
 
 int	main(int ac, char **av, char **env)
 {

minishell.h

@@ -6,7 +6,7 @@
 /*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2023/02/14 13:45:30 by cchauvet          #+#    #+#             */
-/*   Updated: 2023/02/16 15:11:53 by cchauvet         ###   ########.fr       */
+/*   Updated: 2023/02/16 15:17:07 by cchauvet         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 

utils/ft_strreplace.c

@@ -5,8 +5,7 @@ char	*ft_strreplace(const char *str, const char *fill, size_t start, size_t stop
 	char	*out;
 	size_t	sum;
 
-	out = malloc((ft_strlen(str) + ft_strlen(fill) - (stop - start) + 1
+	out = malloc((ft_strlen(str) + ft_strlen(fill) - (stop - start) + 1 * sizeof(char)));
-				* sizeof(char)));
 	if (out == NULL)
 		return (NULL);
 	ft_strncpy(out, str, start);

utils/utils.h

@@ -6,7 +6,7 @@
 /*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2023/02/14 14:46:40 by cchauvet          #+#    #+#             */
-/*   Updated: 2023/02/15 18:00:27 by cchauvet         ###   ########.fr       */
+/*   Updated: 2023/02/16 15:15:05 by cchauvet         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */