srcs files moved

srcs/generic/ft_split_MODIF.c

@@ -0,0 +1,106 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   ft_split_MODIF.c                                   :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: lperrey <lperrey@student.42.fr>            +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2021/11/13 07:08:40 by lperrey           #+#    #+#             */
+/*   Updated: 2021/11/13 20:24:33 by lperrey          ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+// FT_SPLIT LEGEREMENT REMANIER.
+// A REMPLACER DANS LA LIBFT
+#include "libft.h"
+
+static size_t	count_word(char const *s, char c);
+static char		**alloc_words(char const *s, char c, char **str_arr,
+					size_t words_count);
+static void		fill_arr(char const *s, char c, char **str_arr);
+
+char	**ft_split(char const *s, char c)
+{
+	char	**str_arr;
+	size_t	words_count;
+
+	if (s == NULL)
+		return (NULL);
+	words_count = count_word(s, c);
+	str_arr = ft_calloc(words_count + 1, sizeof(char *));
+	if (!str_arr)
+		return (NULL);
+	if (!(alloc_words(s, c, str_arr, words_count)))
+	{
+		ft_free_2d_arr(str_arr);
+		return (NULL);
+	}
+	fill_arr(s, c, str_arr);
+	return (str_arr);
+}
+
+static size_t	count_word(char const *s, char c)
+{
+	unsigned int	i;
+	size_t			count;
+
+	count = 0;
+	i = 0;
+	while (s[i])
+	{
+		while (s[i] == c)
+			i++;
+		if (s[i])
+			count++;
+		while (s[i] && s[i] != c)
+			i++;
+	}
+	return (count);
+}
+
+static char	**alloc_words(char const *s, char c, char **str_arr,
+				size_t words_count)
+{
+	unsigned int	i;
+	size_t			len;
+	unsigned int	arr_i;
+
+	i = 0;
+	arr_i = 0;
+	while (arr_i < words_count)
+	{
+		len = 0;
+		while (s[i] == c)
+			i++;
+		while (s[i] && s[i] != c)
+		{
+			len++;
+			i++;
+		}
+		str_arr[arr_i] = malloc(len + 1);
+		if (!str_arr[arr_i])
+			return (NULL);
+		arr_i++;
+	}
+	return (str_arr);
+}
+
+static void	fill_arr(char const *s, char c, char **str_arr)
+{
+	unsigned int	i;
+	unsigned int	arr_i;
+	unsigned int	char_i;
+
+	i = 0;
+	arr_i = 0;
+	while (str_arr[arr_i])
+	{
+		while (s[i] == c)
+			i++;
+		char_i = 0;
+		while (s[i] && s[i] != c)
+			str_arr[arr_i][char_i++] = s[i++];
+		str_arr[arr_i][char_i] = '\0';
+		arr_i++;
+	}
+}

srcs/generic/ft_split_quotes.c

@@ -0,0 +1,179 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   ft_split_quotes.c                                  :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: lperrey <lperrey@student.42.fr>            +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2021/11/13 07:08:40 by lperrey           #+#    #+#             */
+/*   Updated: 2021/11/26 21:27:10 by lperrey          ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "minishell.h"
+
+static size_t	count_word(char const *s, char c);
+static char		**alloc_words(char const *s, char c, char **str_arr,
+					size_t words_count);
+static void		fill_arr(char const *s, char c, char **str_arr);
+static int		quote_state_change(int *quote_state, const char *s);
+
+char	**ft_split_quotes(char const *s, char c)
+{
+	char	**str_arr;
+	size_t	words_count;
+
+	if (s == NULL)
+		return (NULL);
+	words_count = count_word(s, c);
+	str_arr = ft_calloc(words_count + 1, sizeof(char *));
+	if (!str_arr)
+		return (NULL);
+	if (!(alloc_words(s, c, str_arr, words_count)))
+	{
+		ft_free_2d_arr(str_arr);
+		return (NULL);
+	}
+	fill_arr(s, c, str_arr);
+	return (str_arr);
+}
+
+static size_t	count_word(char const *s, char c)
+{
+	unsigned int	i;
+	size_t			count;
+	int				quote_state;
+
+	i = 0;
+	count = 0;
+	quote_state = 0;
+	while (s[i])
+	{
+		while (s[i] == c)
+			i++;
+		if (s[i])
+			count++;
+		while (s[i] && (s[i] != c || quote_state))
+		{
+			while (quote_state_change(&quote_state, &s[i]))
+				i++;
+			if (s[i] && (s[i] != c || quote_state))
+				i++;
+		}
+	}
+	return (count);
+}
+
+static char	**alloc_words(char const *s, char c, char **str_arr,
+				size_t words_count)
+{
+	unsigned int	i;
+	size_t			len;
+	unsigned int	arr_i;
+	int				quote_state;
+
+	i = 0;
+	arr_i = 0;
+	quote_state = 0;
+	while (arr_i < words_count)
+	{
+		len = 0;
+		while (s[i] == c)
+			i++;
+		while (s[i + len]
+			&& (quote_state_change(&quote_state, &s[i + len])
+				|| (s[i + len] != c || quote_state)))
+			len++;
+		i = i + len;
+		str_arr[arr_i] = ft_calloc(len + 1, 1);
+		if (!str_arr[arr_i])
+			return (NULL);
+		arr_i++;
+	}
+	return (str_arr);
+}
+
+// Plus clair, plus de 25 lignes :( 
+/* static char	**alloc_words(char const *s, char c, char **str_arr,
+				size_t words_count)
+{
+	unsigned int	i;
+	size_t			len;
+	unsigned int	arr_i;
+	int				quote_state;
+
+	i = 0;
+	arr_i = 0;
+	quote_state = 0;
+	while (arr_i < words_count)
+	{
+		len = 0;
+		while (s[i] == c)
+			i++;
+		while (s[i + len] && (s[i + len] != c || quote_state))
+		{
+			while (quote_state_change(&quote_state, &s[i + len]))
+				len++;
+			if (s[i + len] != c || quote_state)
+				len++;
+		}
+		i = i + len;
+		str_arr[arr_i] = ft_calloc(len + 1, 1);
+		if (!str_arr[arr_i])
+			return (NULL);
+		arr_i++;
+	}
+	return (str_arr);
+} */
+
+static void	fill_arr(char const *s, char c, char **str_arr)
+{
+	unsigned int	i;
+	unsigned int	arr_i;
+	unsigned int	char_i;
+	int				quote_state;
+
+	i = 0;
+	arr_i = 0;
+	quote_state = 0;
+	while (str_arr[arr_i])
+	{
+		while (s[i] == c)
+			i++;
+		char_i = 0;
+		while (s[i] && (s[i] != c || quote_state))
+		{
+			while (quote_state_change(&quote_state, &s[i]))
+				str_arr[arr_i][char_i++] = s[i++];
+			if (s[i] && (s[i] != c || quote_state))
+				str_arr[arr_i][char_i++] = s[i++];
+		}
+		str_arr[arr_i][char_i] = '\0'; //superflu si ft_calloc
+		arr_i++;
+	}
+}
+
+static int	quote_state_change(int *quote_state, const char *s)
+{
+	if (s[0] == '\'' && *quote_state != IN_DQUOTES)
+	{
+		if (*quote_state == IN_QUOTES)
+			*quote_state = 0;
+		else if (ft_strchr(&s[1], '\'')) // if closed quotes
+			*quote_state = IN_QUOTES;
+		else
+			return (0);
+		return (1);
+	}
+	else if (s[0] == '\"' && *quote_state != IN_QUOTES)
+	{
+		if (*quote_state == IN_DQUOTES)
+			*quote_state = 0;
+		else if (ft_strchr(&s[1], '\"')) // if closed quotes
+			*quote_state = IN_DQUOTES;
+		else
+			return (0);
+		return (1);
+	}
+	return (0);
+}

srcs/generic/ft_strdup_quotes.c

@@ -0,0 +1,64 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   ft_strdup_quotes.c                                 :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: lperrey <lperrey@student.42.fr>            +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2021/11/13 04:35:06 by lperrey           #+#    #+#             */
+/*   Updated: 2021/11/26 21:27:05 by lperrey          ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "minishell.h"
+
+static int	quote_state_change(int *quote_state, const char *s);
+
+/* Duplicate a string minus the quoting characters ['] and ["]*/
+char	*ft_strdup_quotes(const char *s)
+{
+	unsigned int	i;
+	unsigned int	i_dup;
+	char			*dup;
+	int				quote_state;
+
+	dup = ft_calloc(ft_strlen(s) + 1, 1);
+	if (!dup)
+		return (NULL);
+	i = 0;
+	i_dup = 0;
+	quote_state = 0;
+	while (s[i])
+	{
+		while (quote_state_change(&quote_state, &s[i]))
+			i++;
+		if (s[i])
+			dup[i_dup++] = s[i++];
+	}
+	return (dup);
+}
+
+static int	quote_state_change(int *quote_state, const char *s)
+{
+	if (s[0] == '\'' && *quote_state != IN_DQUOTES)
+	{
+		if (*quote_state == IN_QUOTES)
+			*quote_state = 0;
+		else if (ft_strchr(&s[1], '\'')) // if closed quotes
+			*quote_state = IN_QUOTES;
+		else
+			return (0);
+		return (1);
+	}
+	else if (s[0] == '\"' && *quote_state != IN_QUOTES)
+	{
+		if (*quote_state == IN_DQUOTES)
+			*quote_state = 0;
+		else if (ft_strchr(&s[1], '\"')) // if closed quotes
+			*quote_state = IN_DQUOTES;
+		else
+			return (0);
+		return (1);
+	}
+	return (0);
+}

srcs/generic/generic.c

@@ -0,0 +1,287 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   generic.c                                          :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: lperrey <lperrey@student.42.fr>            +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2021/10/08 09:25:35 by lperrey           #+#    #+#             */
+/*   Updated: 2021/12/11 20:59:40 by lperrey          ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "minishell.h"
+
+char	*ft_strjoinfree(char *s1, char *s2)
+{
+	char	*str;
+
+	str = ft_strjoin(s1, s2);
+	free(s1);
+	free(s2);
+	return (str);
+}
+
+char	*ft_strjoinfree_s1(char *s1, const char *s2)
+{
+	char	*str;
+
+	str = ft_strjoin(s1, s2);
+	free(s1);
+	return (str);
+}
+
+char	*ft_strjoinfree_s2(const char *s1, char *s2)
+{
+	char	*str;
+
+	str = ft_strjoin(s1, s2);
+	free(s2);
+	return (str);
+}
+
+void	ft_lstprint(t_list *lst, int fd)
+{
+	while (lst)
+	{
+		ft_putendl_fd(lst->content, fd);
+		lst = lst->next;
+	}
+}
+
+int	ft_isinset_str(char *str, char *set)
+{
+	size_t	i;
+	size_t	i_set;
+	int		valid;
+
+	i = 0;
+	while (str[i])
+	{
+		valid = 0;
+		i_set = 0;
+		while (set[i_set] && !valid)
+		{
+			if (str[i] == set[i_set])
+				valid = 1;
+			i_set++;
+		}
+		if (!valid)
+			return (0);
+		i++;
+	}
+	return (i);
+}
+
+size_t	ft_2d_arrlen(void *ptr) // Replace ft_arrlen()
+{
+	size_t	len;
+	char	**arr;
+
+	arr = (char **)ptr;
+	len = 0;
+	while (arr[len] != NULL)
+		len++;
+	return (len);
+}
+/* 
+char	**ft_dup_2d_char_arr(char **ptr) // Superflu si ft_dup_2d_arr() fonctionne
+{
+	unsigned int	i;
+	char			**arr;
+	char			**new_arr;
+
+	new_arr = malloc((ft_2d_arrlen(ptr) + 1) * sizeof (void *));
+	if (!new_arr)
+		return (NULL);
+	arr = (char **)ptr;
+	i = 0;
+	while (arr[i])
+	{
+		new_arr[i] = ft_strdup(arr[i]);
+		if (!new_arr[i])
+			return (ft_retp_free(NULL, new_arr, ft_free_2d_arr));
+		i++;
+	}
+	new_arr[i] = NULL;
+	return (new_arr);
+} */
+
+// Test generic. Pas certain que ça fonctionne bien avec le pointeur sur fonction
+void	*ft_dup_2d_arr(void	*ptr, void *(*dup_func)(void *))
+{
+	unsigned int	i;
+	char			**arr;
+	char			**new_arr;
+
+	new_arr = ft_calloc(ft_2d_arrlen(ptr) + 1, sizeof (void *));
+	if (!new_arr)
+		return (NULL);
+	arr = (char **)ptr;
+	i = 0;
+	while (arr[i])
+	{
+		new_arr[i] = dup_func(arr[i]);
+		if (!new_arr[i])
+			return (ft_retp_free(NULL, new_arr, ft_free_2d_arr));
+		i++;
+	}
+	return (new_arr);
+}
+
+void	*ft_resize_2d_arr(void *ptr, size_t add_nbr)
+{
+	unsigned int	i;
+	char			**arr;
+	char			**new_arr;
+
+	new_arr = ft_calloc(ft_2d_arrlen(ptr) + add_nbr + 1, sizeof (void *));
+	if (!new_arr)
+		return (NULL);
+	arr = (char **)ptr;
+	i = 0;
+	while (arr[i])
+	{
+		new_arr[i] = arr[i];
+		i++;
+	}
+	free(arr);
+	return (new_arr);
+}
+
+// pour imprimer une char ** en precisant comment separer les char *
+void	print_matrix(char **matrix, char *sep)
+{
+	int	i;
+
+	i = 0;
+	while (matrix[i])
+	{
+		printf("%s", matrix[i]);
+		if (matrix[i + 1])
+			printf("%s", sep);
+		fflush(stdout);
+		i++;
+	}
+	write(1, "\n", 1);
+}
+
+t_list	*ft_lstbeforelast(t_list *lst)
+{
+	if (!lst || !lst->next)
+		return (NULL);
+	while (lst->next->next)
+		lst = lst->next;
+	return (lst);
+}
+
+/* if "content_size == 0", return lst with "lst->content == NULL" */
+void	*ft_lstnew_generic(size_t lst_size, size_t content_size)
+{
+	t_list	*elem;
+	void	*content;
+
+	if (content_size == 0)
+		content = NULL;
+	else
+	{
+		content = ft_calloc(content_size, 1);
+		if (!content)
+			return (NULL);
+	}
+	elem = ft_calloc(1, lst_size);
+	if (!elem)
+	{
+		free(content);
+		return (NULL);
+	}
+	elem->content = content;
+	elem->next = NULL;
+	return (elem);
+}
+
+int	ft_reti_perror_io(int ret, char *err_str, char *io_file)
+{
+	ft_putstr_fd(err_str, STDERR_FILENO);
+	perror(io_file);
+	return (ret);
+}
+
+void	ft_free_null(void *ptr)
+{
+	free(*(char**)ptr);
+	*(char**)ptr = NULL;
+}
+
+/*
+** Search for an environement variable,
+** and return a pointer to the first character after "env_var=" .
+** Return NULL if env_var not found.
+*/
+char	*ft_getenv(char *env_var)
+{
+	int		i;
+	char	*tmp;
+	size_t	env_var_len;
+
+	env_var_len = ft_strlen(env_var);
+	i = 0;
+	tmp = NULL;
+	while (!tmp && environ[i])
+	{
+		if (environ[i][env_var_len] == '=')
+		{
+			if (ft_strncmp(environ[i], env_var, env_var_len) == 0)
+				tmp = &environ[i][env_var_len + 1];
+			else
+				i++;
+		}
+		else
+			i++;
+	}
+	return (tmp);
+}
+
+/*
+** Like ft_getenv(), but return position of env_var instead of value.
+** If env_var not found, return last position of **environ (== NULL)
+*/
+size_t	ft_getenv_position(char *env_var)
+{
+	int		i;
+	int		found;
+	size_t	env_var_len;
+
+	env_var_len = ft_strlen(env_var);
+	i = 0;
+	found = 0;
+	while (!found && environ[i])
+	{
+		if (environ[i][env_var_len] == '=')
+		{
+			if (ft_strncmp(environ[i], env_var, env_var_len) == 0)
+				found = 1;
+			else
+				i++;
+		}
+		else
+			i++;
+	}
+	return (i);
+}
+
+int	ft_is_posix_name(char *str)
+{
+	unsigned int	i;
+
+	if (str[0] != '_' && !ft_isalpha(str[0]))
+		return (0);
+	i = 1;
+	while (str[i])
+	{
+		if (str[i] != '_' && !ft_isalnum(str[i]))
+			return (0);
+		i++;
+	}
+	return (i);
+}