it works
This commit is contained in:
parent
607a121ced
commit
80f0b560ce
3 changed files with 22 additions and 22 deletions
|
|
@ -6,7 +6,7 @@
|
|||
/* By: kcolin <marvin@42.fr> +#+ +:+ +#+ */
|
||||
/* +#+#+#+#+#+ +#+ */
|
||||
/* Created: 2024/10/23 20:32:46 by kcolin #+# #+# */
|
||||
/* Updated: 2024/11/06 17:33:37 by kcolin ### ########.fr */
|
||||
/* Updated: 2024/11/08 15:05:50 by kcolin ### ########.fr */
|
||||
/* */
|
||||
/* ************************************************************************** */
|
||||
|
||||
|
|
@ -33,11 +33,11 @@ char *read_at_least_one_line(char *buffer, int fd)
|
|||
char *read_buffer;
|
||||
int bytes_read;
|
||||
|
||||
read_buffer = malloc((BUFFER_SIZE + 1 ) * sizeof(char));
|
||||
read_buffer = malloc((BUFFER_SIZE + 1) * sizeof(char));
|
||||
if (read_buffer == NULL)
|
||||
return (NULL);
|
||||
bytes_read = 1;
|
||||
while (!ft_strchr(buffer, '\n') && bytes_read > 0)
|
||||
while (ft_strchr(buffer, '\n') == NULL && bytes_read > 0)
|
||||
{
|
||||
bytes_read = read(fd, read_buffer, BUFFER_SIZE);
|
||||
if (bytes_read < 0)
|
||||
|
|
@ -48,18 +48,19 @@ char *read_at_least_one_line(char *buffer, int fd)
|
|||
}
|
||||
read_buffer[bytes_read] = '\0';
|
||||
buffer = ft_strjoin(buffer, read_buffer);
|
||||
if (buffer == NULL)
|
||||
break ;
|
||||
}
|
||||
free(read_buffer);
|
||||
return (buffer);
|
||||
}
|
||||
|
||||
#include <stdio.h>
|
||||
|
||||
char *get_next_line(int fd)
|
||||
{
|
||||
static char *buffer = NULL;
|
||||
char *out;
|
||||
size_t line_length;
|
||||
char *buf;
|
||||
|
||||
if (fd < 0)
|
||||
return (NULL);
|
||||
|
|
@ -67,9 +68,11 @@ char *get_next_line(int fd)
|
|||
if (buffer == NULL)
|
||||
return (NULL);
|
||||
line_length = 0;
|
||||
while (buffer[line_length] != '\0' || buffer[line_length] != '\n')
|
||||
while (buffer[line_length] != '\0' && buffer[line_length] != '\n')
|
||||
line_length++;
|
||||
out = ft_substr(buffer, 0, line_length + 1);
|
||||
buffer = ft_substr(buffer, line_length, ft_strlen(buffer) - line_length);
|
||||
buf = buffer;
|
||||
buffer = ft_substr(buf, line_length + 1, ft_strlen(buffer) - line_length);
|
||||
free(buf);
|
||||
return (out);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue