Changing the parsing to be traited in string and not in char
This commit is contained in:
Raphaël
parent
8941f67cf1
commit
70c9c5aac1
8 changed files with 161 additions and 299 deletions
93
libft/ft_split.c
Normal file
93
libft/ft_split.c
Normal file
|
|
@ -0,0 +1,93 @@
|
|||
/* ************************************************************************** */
|
||||
/* */
|
||||
/* ::: :::::::: */
|
||||
/* ft_split.c :+: :+: :+: */
|
||||
/* +:+ +:+ +:+ */
|
||||
/* By: rparodi <marvin@42.fr> +#+ +:+ +#+ */
|
||||
/* +#+#+#+#+#+ +#+ */
|
||||
/* Created: 2023/11/09 13:56:02 by rparodi #+# #+# */
|
||||
/* Updated: 2024/03/31 19:35:26 by rparodi ### ########.fr */
|
||||
/* */
|
||||
/* ************************************************************************** */
|
||||
|
||||
#include "../includes/minishell.h"
|
||||
|
||||
static int count_words(const char *str, char sep)
|
||||
{
|
||||
int i;
|
||||
int count;
|
||||
|
||||
i = 0;
|
||||
count = 0;
|
||||
while (str[i])
|
||||
{
|
||||
while (str[i] == sep && str[i])
|
||||
i++;
|
||||
if (str[i] != sep && str[i])
|
||||
{
|
||||
while (str[i] != sep && str[i])
|
||||
i++;
|
||||
count++;
|
||||
}
|
||||
}
|
||||
return (count);
|
||||
}
|
||||
|
||||
static char *ft_strndup(const char *s, int j)
|
||||
{
|
||||
int i;
|
||||
char *str;
|
||||
|
||||
i = 0;
|
||||
str = (char *)malloc((j + 1));
|
||||
if (!str)
|
||||
return (NULL);
|
||||
while (s[i] && i < j)
|
||||
{
|
||||
str[i] = s[i];
|
||||
i++;
|
||||
}
|
||||
str[i] = '\0';
|
||||
return (str);
|
||||
}
|
||||
|
||||
static char **ext_w(char **words_array, const char *str, char sep, int size)
|
||||
{
|
||||
int i;
|
||||
int j;
|
||||
|
||||
i = 0;
|
||||
j = 0;
|
||||
while (j < size)
|
||||
{
|
||||
while (str[i] == sep && str[i])
|
||||
i++;
|
||||
str = str + i;
|
||||
i = 0;
|
||||
while (str[i] != sep && str[i])
|
||||
i++;
|
||||
words_array[j++] = ft_strndup(str, i);
|
||||
str = str + i;
|
||||
i = 0;
|
||||
}
|
||||
words_array[j] = 0;
|
||||
return (words_array);
|
||||
}
|
||||
|
||||
char **ft_split(char const *s, char c)
|
||||
{
|
||||
int size;
|
||||
char **words_array;
|
||||
|
||||
size = count_words(s, c);
|
||||
words_array = (char **)malloc(sizeof(char *) * (size + 1));
|
||||
if (!words_array)
|
||||
return (NULL);
|
||||
if (size == 0)
|
||||
{
|
||||
words_array[0] = NULL;
|
||||
return (words_array);
|
||||
}
|
||||
words_array = ext_w(words_array, s, c, size);
|
||||
return (words_array);
|
||||
}
|
||||
|
|
@ -1,33 +1,31 @@
|
|||
/* ************************************************************************** */
|
||||
/* */
|
||||
/* ::: :::::::: */
|
||||
/* get_next_line.h :+: :+: :+: */
|
||||
/* ft_strncmp.c :+: :+: :+: */
|
||||
/* +:+ +:+ +:+ */
|
||||
/* By: rparodi <marvin@42.fr> +#+ +:+ +#+ */
|
||||
/* +#+#+#+#+#+ +#+ */
|
||||
/* Created: 2023/11/18 17:12:04 by rparodi #+# #+# */
|
||||
/* Updated: 2023/11/23 18:15:34 by rparodi ### ########.fr */
|
||||
/* Created: 2023/11/07 16:56:56 by rparodi #+# #+# */
|
||||
/* Updated: 2024/03/31 19:51:17 by rparodi ### ########.fr */
|
||||
/* */
|
||||
/* ************************************************************************** */
|
||||
|
||||
#ifndef GET_NEXT_LINE_H
|
||||
# define GET_NEXT_LINE_H
|
||||
# ifndef BUFFER_SIZE
|
||||
# define BUFFER_SIZE 420
|
||||
# endif
|
||||
#include "../includes/minishell.h"
|
||||
|
||||
# include <unistd.h>
|
||||
# include <stdlib.h>
|
||||
int ft_strcmp(const char *s1, const char *s2)
|
||||
{
|
||||
size_t i;
|
||||
int diff;
|
||||
|
||||
char *ft_get_line(char *str);
|
||||
char *get_next_line(int fd);
|
||||
int ft_strchr(char *str, char c);
|
||||
char *ft_get_next(char *str);
|
||||
char *ft_get_line(char *str);
|
||||
char *ft_strjoin(char *s1, char *s2, int i, int j);
|
||||
size_t ft_strlen(char const *str);
|
||||
char *file_converted(int fd);
|
||||
char *ft_free(char *str);
|
||||
char *ft_check(char *memory, int fd);
|
||||
|
||||
#endif
|
||||
i = 0;
|
||||
while ((s1[i] || s2[i]))
|
||||
{
|
||||
if (s1[i] != s2[i])
|
||||
{
|
||||
diff = (unsigned char)s1[i] - (unsigned char)s2[i];
|
||||
return (diff);
|
||||
}
|
||||
i++;
|
||||
}
|
||||
return (0);
|
||||
}
|
||||
|
|
@ -1,78 +0,0 @@
|
|||
/* ************************************************************************** */
|
||||
/* */
|
||||
/* ::: :::::::: */
|
||||
/* get_next_line.c :+: :+: :+: */
|
||||
/* +:+ +:+ +:+ */
|
||||
/* By: rparodi <marvin@42.fr> +#+ +:+ +#+ */
|
||||
/* +#+#+#+#+#+ +#+ */
|
||||
/* Created: 2023/11/18 17:12:02 by rparodi #+# #+# */
|
||||
/* Updated: 2023/11/22 13:31:13 by rparodi ### ########.fr */
|
||||
/* */
|
||||
/* ************************************************************************** */
|
||||
|
||||
#include "get_next_line.h"
|
||||
|
||||
char *ft_check(char *memory, int fd)
|
||||
{
|
||||
char *buffer;
|
||||
int bytescopy;
|
||||
|
||||
bytescopy = 1;
|
||||
buffer = (char *)malloc(sizeof(char) * (BUFFER_SIZE + 1));
|
||||
if (!buffer)
|
||||
return (NULL);
|
||||
while (ft_strchr(memory, '\n') <= 0 && bytescopy)
|
||||
{
|
||||
bytescopy = read(fd, buffer, BUFFER_SIZE);
|
||||
if (bytescopy == -1)
|
||||
return (ft_free(buffer));
|
||||
buffer[bytescopy] = '\0';
|
||||
memory = ft_strjoin(memory, buffer, 0, -1);
|
||||
}
|
||||
free(buffer);
|
||||
return (memory);
|
||||
}
|
||||
|
||||
char *file_converted(int fd)
|
||||
{
|
||||
size_t i;
|
||||
int read_bits;
|
||||
char *str;
|
||||
char c;
|
||||
|
||||
i = 0;
|
||||
c = 1;
|
||||
read_bits = 1;
|
||||
str = (char *)malloc(sizeof(char) * BUFFER_SIZE);
|
||||
if (!str)
|
||||
return (NULL);
|
||||
while (read_bits != 0 && i < BUFFER_SIZE)
|
||||
{
|
||||
read_bits = read(fd, &c, 1);
|
||||
str[i] = c;
|
||||
i++;
|
||||
}
|
||||
str[i] = '\0';
|
||||
return (str);
|
||||
}
|
||||
|
||||
char *ft_free(char *str)
|
||||
{
|
||||
free(str);
|
||||
return (NULL);
|
||||
}
|
||||
|
||||
char *get_next_line(int fd)
|
||||
{
|
||||
static char *memory = NULL;
|
||||
char *line;
|
||||
|
||||
if (fd < 0 || BUFFER_SIZE <= 0)
|
||||
return (NULL);
|
||||
memory = ft_check(memory, fd);
|
||||
if (!memory)
|
||||
return (ft_free(memory));
|
||||
line = ft_get_line(memory);
|
||||
memory = ft_get_next(memory);
|
||||
return (line);
|
||||
}
|
||||
|
|
@ -1,119 +0,0 @@
|
|||
/* ************************************************************************** */
|
||||
/* */
|
||||
/* ::: :::::::: */
|
||||
/* get_next_line_utils.c :+: :+: :+: */
|
||||
/* +:+ +:+ +:+ */
|
||||
/* By: rparodi <marvin@42.fr> +#+ +:+ +#+ */
|
||||
/* +#+#+#+#+#+ +#+ */
|
||||
/* Created: 2023/11/18 17:14:47 by rparodi #+# #+# */
|
||||
/* Updated: 2023/11/22 13:35:03 by rparodi ### ########.fr */
|
||||
/* */
|
||||
/* ************************************************************************** */
|
||||
|
||||
#include "get_next_line.h"
|
||||
|
||||
size_t ft_strlen(char const *str)
|
||||
{
|
||||
size_t i;
|
||||
|
||||
i = 0;
|
||||
if (str)
|
||||
{
|
||||
while (str[i])
|
||||
i++;
|
||||
}
|
||||
return (i);
|
||||
}
|
||||
|
||||
char *ft_strjoin(char *s1, char *s2, int i, int j)
|
||||
{
|
||||
char *temp;
|
||||
|
||||
if (!s1)
|
||||
{
|
||||
s1 = (char *)malloc(1);
|
||||
s1[i] = '\0';
|
||||
}
|
||||
if (!s2 || !s1)
|
||||
return (NULL);
|
||||
temp = (char *)malloc((ft_strlen(s1) + ft_strlen(s2) + 1));
|
||||
if (!temp)
|
||||
return (NULL);
|
||||
while (s1[i])
|
||||
{
|
||||
temp[i] = s1[i];
|
||||
i++;
|
||||
}
|
||||
while (s2[++j])
|
||||
temp[i + j] = s2[j];
|
||||
temp[i + j] = '\0';
|
||||
free(s1);
|
||||
return (temp);
|
||||
}
|
||||
|
||||
char *ft_get_line(char *str)
|
||||
{
|
||||
char *temp;
|
||||
int i;
|
||||
|
||||
i = 0;
|
||||
if (!str[i])
|
||||
return (NULL);
|
||||
while (str[i] && str[i] != '\n')
|
||||
i++;
|
||||
temp = (char *)malloc((i + 2));
|
||||
if (!temp)
|
||||
return (NULL);
|
||||
i = 0;
|
||||
while (str[i] && str[i] != '\n')
|
||||
{
|
||||
temp[i] = str[i];
|
||||
i++;
|
||||
}
|
||||
if (str[i] == '\n')
|
||||
{
|
||||
temp[i] = str[i];
|
||||
i++;
|
||||
}
|
||||
temp[i] = '\0';
|
||||
return (temp);
|
||||
}
|
||||
|
||||
char *ft_get_next(char *str)
|
||||
{
|
||||
char *temp;
|
||||
int i;
|
||||
int j;
|
||||
|
||||
i = 0;
|
||||
while (str[i] && str[i] != '\n')
|
||||
i++;
|
||||
if (!str[i])
|
||||
return (ft_free(str));
|
||||
temp = (char *)malloc((ft_strlen(str) - i));
|
||||
if (!temp)
|
||||
return (NULL);
|
||||
j = i + 1;
|
||||
while (str[++i])
|
||||
temp[i - j] = str[i];
|
||||
temp[i - j] = '\0';
|
||||
free(str);
|
||||
return (temp);
|
||||
}
|
||||
|
||||
int ft_strchr(char *str, char c)
|
||||
{
|
||||
int i;
|
||||
|
||||
i = 0;
|
||||
if (str)
|
||||
{
|
||||
while (str[i])
|
||||
{
|
||||
if (str[i] == c)
|
||||
return (i);
|
||||
i++;
|
||||
}
|
||||
}
|
||||
return (-1);
|
||||
}
|
||||
20
libft/main.c
20
libft/main.c
|
|
@ -1,20 +0,0 @@
|
|||
#include "get_next_line.h"
|
||||
#include <stdio.h>
|
||||
#include <fcntl.h>
|
||||
|
||||
int main(void)
|
||||
{
|
||||
int fd = open("get_next_line.c", O_RDONLY);
|
||||
int i = 0;
|
||||
char *next_line = NULL;
|
||||
while (i < 10000000)
|
||||
{
|
||||
next_line = get_next_line(fd);
|
||||
if (!next_line)
|
||||
return (printf("next_line[%d] = %s\n", i, next_line));
|
||||
printf("next_line[%d] = %s", i, next_line);
|
||||
free(next_line);
|
||||
i++;
|
||||
}
|
||||
return (0);
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue