bonus fix

get_next_line_bonus.c

@@ -0,0 +1,104 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   get_next_line_bonus.c                              :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2022/10/26 00:52:47 by cchauvet          #+#    #+#             */
+/*   Updated: 2022/11/14 15:49:34 by cchauvet         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "get_next_line_bonus.h"
+
+char	*ft_getstash(int fd)
+{
+	char	*str;
+	int		readed;
+
+	str = ft_calloc(BUFFER_SIZE + 1, sizeof(char));
+	if (str == NULL)
+		return (NULL);
+	readed = read(fd, str, BUFFER_SIZE);
+	if (readed < 1)
+	{
+		free(str);
+		return (NULL);
+	}
+	return (str);
+}
+
+char	*ft_getline(int fd)
+{
+	char		*stash;
+	char		*buf;
+
+	stash = NULL;
+	buf = NULL;
+	while (ft_strchr(stash, '\n') == -1)
+	{
+		buf = ft_getstash(fd);
+		if (buf == NULL)
+			return (stash);
+		stash = ft_strfjoin(stash, buf);
+		if (stash == NULL)
+			return (NULL);
+	}
+	return (stash);
+}
+
+char	*ft_getreturn(char *str)
+{
+	int	i;
+
+	if (str == NULL)
+		return (NULL);
+	i = ft_strchr(str, '\n') + 1;
+	if (i == 0)
+		i = ft_strlen(str);
+	return (ft_strndup(str, i));
+}
+
+char	*ft_getextra(char *str)
+{
+	int	i;
+	int	j;
+
+	if (str == NULL)
+		return (NULL);
+	i = ft_strchr(str, '\n') + 1;
+	if (i == 0)
+		return (NULL);
+	j = ft_strlen(str + i);
+	return (ft_strndup(str + i, j));
+}
+
+char	*get_next_line(int fd)
+{
+	static char	*stash[1024] = {};
+	char		*buf1;
+	char		*buf2;
+
+	buf2 = stash[fd];
+	if (ft_strchr(stash[fd], '\n') == -1)
+	{
+		buf1 = ft_getline(fd);
+		buf2 = ft_strfjoin(stash[fd], buf1);
+		if (buf2 == NULL)
+		{
+			free(buf1);
+			return (NULL);
+		}
+	}
+	buf1 = ft_getreturn(buf2);
+	stash[fd] = ft_getextra(buf2);
+	free(buf2);
+	if (buf1 == NULL)
+	{
+		free(stash[fd]);
+		free(buf1);
+		return (NULL);
+	}
+	return (buf1);
+}

get_next_line_bonus.h

@@ -3,102 +3,24 @@
 /*                                                        :::      ::::::::   */
 /*   get_next_line_bonus.h                              :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
-/*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
+/*   By: cchauvet <cchauvet@student.42angouleme.fr  +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
-/*   Created: 2022/10/26 00:52:47 by cchauvet          #+#    #+#             */
+/*   Created: 2022/11/14 15:38:06 by cchauvet          #+#    #+#             */
-/*   Updated: 2022/11/14 15:45:00 by cchauvet         ###   ########.fr       */
+/*   Updated: 2022/11/14 15:50:57 by cchauvet         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
-#include "get_next_line.h"
+#ifndef GET_NEXT_LINE_H
+# define GET_NEXT_LINE_H
+# include <stdlib.h>
+# include <unistd.h>
+//# define BUFFER_SIZE 42
 
-char	*ft_getstash(int fd)
+void	*ft_calloc(size_t nmemb, size_t size);
-{
+void	*ft_realloc(void *ptr, size_t size);
-	char	*str;
+char	*ft_strfjoin(char *dst, char *src);
-	int		readed;
+char	*ft_strndup(char *src, size_t n);
-
+size_t	ft_strlen(char *str);
-	str = ft_calloc(BUFFER_SIZE + 1, sizeof(char));
+ssize_t	ft_strchr(char *str, char c);
-	if (str == NULL)
+char	*get_next_line(int fd);
-		return (NULL);
+#endif
-	readed = read(fd, str, BUFFER_SIZE);
-	if (readed < 1)
-	{
-		free(str);
-		return (NULL);
-	}
-	return (str);
-}
-
-char	*ft_getline(int fd)
-{
-	char		*stash;
-	char		*buf;
-
-	stash = NULL;
-	buf = NULL;
-	while (ft_strchr(stash, '\n') == -1)
-	{
-		buf = ft_getstash(fd);
-		if (buf == NULL)
-			return (stash);
-		stash = ft_strfjoin(stash, buf);
-		if (stash == NULL)
-			return (NULL);
-	}
-	return (stash);
-}
-
-char	*ft_getreturn(char *str)
-{
-	int	i;
-
-	if (str == NULL)
-		return (NULL);
-	i = ft_strchr(str, '\n') + 1;
-	if (i == 0)
-		i = ft_strlen(str);
-	return (ft_strndup(str, i));
-}
-
-char	*ft_getextra(char *str)
-{
-	int	i;
-	int	j;
-
-	if (str == NULL)
-		return (NULL);
-	i = ft_strchr(str, '\n') + 1;
-	if (i == 0)
-		return (NULL);
-	j = ft_strlen(str + i);
-	return (ft_strndup(str + i, j));
-}
-
-char	*get_next_line(int fd)
-{
-	static char	*stash[1024] = NULL;
-	char		*buf1;
-	char		*buf2;
-
-	buf2 = stash[fd];
-	if (ft_strchr(stash[fd], '\n') == -1)
-	{
-		buf1 = ft_getline(fd);
-		buf2 = ft_strfjoin(stash[fd], buf1);
-		if (buf2 == NULL)
-		{
-			free(buf1);
-			return (NULL);
-		}
-	}
-	buf1 = ft_getreturn(buf2);
-	stash[fd] = ft_getextra(buf2);
-	free(buf2);
-	if (buf1 == NULL)
-	{
-		free(stash[fd]);
-		free(buf1);
-		return (NULL);
-	}
-	return (buf1);
-}

get_next_line_utils_bonus.c

@@ -0,0 +1,106 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   get_next_line_utils_bonus.c                        :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2022/10/26 00:55:44 by cchauvet          #+#    #+#             */
+/*   Updated: 2022/11/14 15:50:27 by cchauvet         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "get_next_line_bonus.h"
+
+void	*ft_calloc(size_t nmemb, size_t size)
+{
+	char	*tab;
+	size_t	i;
+
+	if (nmemb == 0 || size * nmemb / nmemb != size)
+		return (NULL);
+	tab = malloc(nmemb * size);
+	if (tab == NULL)
+		return (NULL);
+	i = 0;
+	while (i < size * nmemb)
+	{
+		tab[i] = 0;
+		i++;
+	}
+	return ((void *) tab);
+}
+
+size_t	ft_strlen(char *str)
+{
+	size_t	i;
+
+	if (str == NULL)
+		return (0);
+	i = 0;
+	while (str[i] != '\0')
+		i++;
+	return (i);
+}
+
+char	*ft_strfjoin(char *s1, char *s2)
+{
+	ssize_t	i;
+	ssize_t	j;
+	char	*out;
+
+	out = ft_calloc((ft_strlen(s1) + ft_strlen(s2) + 1), sizeof(char));
+	if (out == NULL)
+		return (NULL);
+	i = 0;
+	if (s1 != NULL)
+	{
+		while (s1[i] != '\0')
+		{
+			out[i] = s1[i];
+			i++;
+		}
+	}
+	free(s1);
+	j = -1;
+	if (s2 != NULL)
+	{
+		while (s2[++j] != '\0')
+			out[i + j] = s2[j];
+	}
+	free(s2);
+	return (out);
+}
+
+char	*ft_strndup(char *src, size_t n)
+{
+	char	*out;
+	size_t	i;
+
+	if (src[0] == '\0')
+		return (NULL);
+	out = ft_calloc(n + 1, sizeof(char));
+	if (out == NULL)
+		return (NULL);
+	i = 0;
+	while (src[i] != '\0' && i < n)
+	{
+		out[i] = src[i];
+		i++;
+	}
+	return (out);
+}
+
+ssize_t	ft_strchr(char *str, char c)
+{
+	size_t	i;
+
+	if (str == NULL)
+		return (-1);
+	i = 0;
+	while (str[i] != c && str[i] != '\0')
+		i++;
+	if (str[i] == '\0')
+		return (-1);
+	return (i);
+}