renaming header files, .libftignore file for simpler features selection

2 files changed, 101 insertions, 113 deletions

diff --git a/src/io/ft_get_next_line.c b/src/io/ft_get_next_line.c
deleted file mode 100644
index 4aecf3c..0000000
--- a/src/io/ft_get_next_line.c
+++ /dev/null
@@ -1,113 +0,0 @@
-/* ************************************************************************** */
-/*                                                                            */
-/*                                                        :::      ::::::::   */
-/*   get_next_line.c                                    :+:      :+:    :+:   */
-/*                                                    +:+ +:+         +:+     */
-/*   By: cacharle <marvin@42.fr>                    +#+  +:+       +#+        */
-/*                                                +#+#+#+#+#+   +#+           */
-/*   Created: 2019/10/19 09:08:36 by cacharle          #+#    #+#             */
-/*   Updated: 2020/01/17 10:53:23 by cacharle         ###   ########.fr       */
-/*                                                                            */
-/* ************************************************************************** */
-
-#include "libft.h"
-
-static int		gnl_find_newline(char *str)
-{
-	int i;
-
-	i = -1;
-	while (str[++i])
-		if (str[i] == '\n')
-			return (i);
-	return (-1);
-}
-
-static int		gnl_free_return(char **ptr, char **ptr2, int ret)
-{
-	if (ptr != NULL)
-	{
-		free(*ptr);
-		*ptr = NULL;
-	}
-	if (ptr2 != NULL)
-	{
-		free(*ptr2);
-		*ptr2 = NULL;
-	}
-	return (ret);
-}
-
-static int		gnl_read_line(int fd, char **line, char *rest)
-{
-	int		ret;
-	int		split_at;
-	char	*buf;
-
-	if ((buf = malloc(sizeof(char) * (GNL_BUFFER_SIZE + 1))) == NULL)
-		return (gnl_free_return(line, NULL, GNL_STATUS_ERROR));
-	while ((ret = read(fd, buf, GNL_BUFFER_SIZE)) > 0)
-	{
-		buf[ret] = '\0';
-		if ((split_at = gnl_find_newline(buf)) != -1)
-		{
-			ft_strcpy(rest, buf + split_at + 1);
-			buf[split_at] = '\0';
-			if ((*line = ft_strjoin_free(*line, buf, 1)) == NULL)
-				return (gnl_free_return(&buf, NULL, GNL_STATUS_ERROR));
-			return (gnl_free_return(&buf, NULL, GNL_STATUS_LINE));
-		}
-		if ((*line = ft_strjoin_free(*line, buf, 1)) == NULL)
-			return (gnl_free_return(&buf, NULL, GNL_STATUS_ERROR));
-	}
-	if (ret == -1)
-		return (gnl_free_return(&buf, line, GNL_STATUS_ERROR));
-	return (gnl_free_return(&buf, NULL, ret));
-}
-
-/*
-** if has rest:
-**     if rest has newline:
-**         push rest until newline in line, shift rest
-**         return LINE_READ
-**     else:
-**         push rest in line
-**
-** while can read fd in buf
-**     if buf has newline:
-**         push buf until newline in line
-**         push buf after newline in rest
-**         return LINE_READ
-**     push buf in line
-**
-** return GNL_EOF
-*/
-
-int				get_next_line(int fd, char **line)
-{
-	int			split_at;
-	static char	rest[OPEN_MAX][GNL_BUFFER_SIZE + 1] = {{0}};
-
-	if (fd < 0 || fd > OPEN_MAX || line == NULL || GNL_BUFFER_SIZE <= 0)
-		return (GNL_STATUS_ERROR);
-	if ((*line = ft_strdup("")) == NULL)
-		return (GNL_STATUS_ERROR);
-	if (rest[fd][0] == '\0')
-		return (gnl_read_line(fd, line, rest[fd]));
-	if ((split_at = gnl_find_newline(rest[fd])) != -1)
-	{
-		free(*line);
-		if ((*line = (char*)malloc(sizeof(char) * (split_at + 1))) == NULL)
-			return (GNL_STATUS_ERROR);
-		ft_strncpy(*line, rest[fd], split_at);
-		(*line)[split_at] = '\0';
-		ft_strcpy(rest[fd], rest[fd] + split_at + 1);
-		return (GNL_STATUS_LINE);
-	}
-	free(*line);
-	if (!(*line = (char*)malloc(sizeof(char) * (ft_strlen(rest[fd]) + 1))))
-		return (GNL_STATUS_ERROR);
-	ft_strcpy(*line, rest[fd]);
-	rest[fd][0] = '\0';
-	return (gnl_read_line(fd, line, rest[fd]));
-}
diff --git a/src/io/ft_next_line.c b/src/io/ft_next_line.c
new file mode 100644
index 0000000..59e245b
--- /dev/null
+++ b/src/io/ft_next_line.c
@@ -0,0 +1,101 @@
+#include "libft.h"
+
+static int		st_find_newline(char *str)
+{
+	int i;
+
+	i = -1;
+	while (str[++i])
+		if (str[i] == '\n')
+			return (i);
+	return (-1);
+}
+
+static int		st_free_return(char **ptr, char **ptr2, int ret)
+{
+	if (ptr != NULL)
+	{
+		free(*ptr);
+		*ptr = NULL;
+	}
+	if (ptr2 != NULL)
+	{
+		free(*ptr2);
+		*ptr2 = NULL;
+	}
+	return (ret);
+}
+
+static int		st_read_line(int fd, char **line, char *rest)
+{
+	int		ret;
+	int		split_at;
+	char	*buf;
+
+	if ((buf = malloc(sizeof(char) * (FTNL_BUFFER_SIZE + 1))) == NULL)
+		return (st_free_return(line, NULL, FTNL_STATUS_ERROR));
+	while ((ret = read(fd, buf, FTNL_BUFFER_SIZE)) > 0)
+	{
+		buf[ret] = '\0';
+		if ((split_at = st_find_newline(buf)) != -1)
+		{
+			ft_strcpy(rest, buf + split_at + 1);
+			buf[split_at] = '\0';
+			if ((*line = ft_strjoin_free(*line, buf, 1)) == NULL)
+				return (st_free_return(&buf, NULL, FTNL_STATUS_ERROR));
+			return (st_free_return(&buf, NULL, FTNL_STATUS_LINE));
+		}
+		if ((*line = ft_strjoin_free(*line, buf, 1)) == NULL)
+			return (st_free_return(&buf, NULL, FTNL_STATUS_ERROR));
+	}
+	if (ret == -1)
+		return (st_free_return(&buf, line, FTNL_STATUS_ERROR));
+	return (st_free_return(&buf, NULL, ret));
+}
+
+/*
+** if has rest:
+**     if rest has newline:
+**         push rest until newline in line, shift rest
+**         return LINE_READ
+**     else:
+**         push rest in line
+**
+** while can read fd in buf
+**     if buf has newline:
+**         push buf until newline in line
+**         push buf after newline in rest
+**         return LINE_READ
+**     push buf in line
+**
+** return FTNL_EOF
+*/
+
+int				ft_next_line(int fd, char **line)
+{
+	int			split_at;
+	static char	rest[OPEN_MAX][FTNL_BUFFER_SIZE + 1] = {{0}};
+
+	if (fd < 0 || fd > OPEN_MAX || line == NULL || FTNL_BUFFER_SIZE <= 0)
+		return (FTNL_STATUS_ERROR);
+	if ((*line = ft_strdup("")) == NULL)
+		return (FTNL_STATUS_ERROR);
+	if (rest[fd][0] == '\0')
+		return (st_read_line(fd, line, rest[fd]));
+	if ((split_at = st_find_newline(rest[fd])) != -1)
+	{
+		free(*line);
+		if ((*line = (char*)malloc(sizeof(char) * (split_at + 1))) == NULL)
+			return (FTNL_STATUS_ERROR);
+		ft_strncpy(*line, rest[fd], split_at);
+		(*line)[split_at] = '\0';
+		ft_strcpy(rest[fd], rest[fd] + split_at + 1);
+		return (FTNL_STATUS_LINE);
+	}
+	free(*line);
+	if (!(*line = (char*)malloc(sizeof(char) * (ft_strlen(rest[fd]) + 1))))
+		return (FTNL_STATUS_ERROR);
+	ft_strcpy(*line, rest[fd]);
+	rest[fd][0] = '\0';
+	return (st_read_line(fd, line, rest[fd]));
+}