0
0
This commit is contained in:
Guy Baconniere
2021-08-25 18:29:24 +02:00
parent dac092452e
commit aaa10155a5
6 changed files with 42 additions and 95 deletions

View File

@@ -1,16 +1,5 @@
/* ************************************************************************** */ #ifndef FT_STOCK__STR_H
/* */ # define FT_STOCK__STR_H
/* ::: :::::::: */
/* ft_stock_str.h :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: gbaconni <gbaconni@42lausanne.ch> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2021/08/25 10:17:09 by gbaconni #+# #+# */
/* Updated: 2021/08/25 12:05:50 by gbaconni ### ########.fr */
/* */
/* ************************************************************************** */
#ifndef FT_STOCK_STR_H
# define FT_STOCK_STR_H
typedef struct s_stock_str typedef struct s_stock_str
{ {
int size; int size;

View File

@@ -1,64 +1,22 @@
/* ************************************************************************** */ /* ************************************************************************** */
/* */ /* */
/* ::: :::::::: */ /* ::: :::::::: */
/* s_stock_str.c :+: :+: :+: */ /* ft_point.h :+: :+: :+: */
/* +:+ +:+ +:+ */ /* +:+ +:+ +:+ */
/* By: gbaconni <gbaconni@42lausanne.ch> +#+ +:+ +#+ */ /* By: gbaconni <gbaconni@42lausanne.ch> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2021/08/25 10:17:09 by gbaconni #+# #+# */ /* Created: 2021/08/20 10:17:09 by gbaconni #+# #+# */
/* Updated: 2021/08/25 12:05:50 by gbaconni ### ########.fr */ /* Updated: 2021/08/20 12:05:50 by gbaconni ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
#include <stdlib.h> #ifndef FT_POINT_H
#include "ft_stock_str.h" # define FT_POINT_H
int ft_strlen(char *str) typedef struct s_point
{ {
int i; int x;
int y;
i = 0; } t_point;
while (str[i] != '\0') void set_point(t_point *point);
i++; #endif
return (i);
}
char *ft_strcopy(char *str)
{
char *result;
int i;
int len;
len = ft_strlen(str);
result = (char *) malloc((len + 1) * sizeof(char));
i = 0;
while (str[i] != '\0')
{
result[i] = str[i];
i++;
}
result[i] = '\0';
return (result);
}
struct s_stock_str *ft_strs_to_tab(int ac, char **av)
{
int i;
t_stock_str *result;
result = (t_stock_str *) malloc((ac + 1) * sizeof(result));
if (result == NULL)
return (NULL);
i = 0;
while (i < ac)
{
result[i].size = ft_strlen(av[i]);
result[i].str = av[i];
result[i].copy = ft_strcopy(av[i]);
i++;
}
result[i].size = 0;
result[i].str = 0;
result[i].copy = 0;
return ((struct s_stock_str*) result);
}

View File

@@ -10,23 +10,16 @@
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
#include <stdio.h>
#include "ft_stock_str.h" #include "ft_stock_str.h"
struct s_stock_str *ft_strs_to_tab(int ac, char **av); struct s_stock_str *ft_strs_to_tab(int ac, char **av);
int main(int argc, char **argv) int main(void)
{ {
t_stock_str *result; t_stock_str *result;
int i; char **av;
int ac;
(void) result; result = ft_strs_to_tab(ac, av)
result = ft_strs_to_tab(argc, argv);
i = 0;
while (result[i].size > 0)
{
printf("result[%d] = { size=%d, str=%s, copy=%s\n}", i, result[i].size, result[i].str, result[i].copy);
i++;
}
return (0); return (0);
} }

View File

@@ -6,13 +6,15 @@
/* By: gbaconni <gbaconni@42lausanne.ch> +#+ +:+ +#+ */ /* By: gbaconni <gbaconni@42lausanne.ch> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2021/08/22 18:14:04 by gbaconni #+# #+# */ /* Created: 2021/08/22 18:14:04 by gbaconni #+# #+# */
/* Updated: 2021/08/24 13:00:34 by gbaconni ### ########.fr */ /* Updated: 2021/08/25 18:26:47 by gbaconni ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
int g_t = 0;
static char *ft_strncpy(char *dest, char *src, unsigned int n) static char *ft_strncpy(char *dest, char *src, unsigned int n)
{ {
unsigned int i; unsigned int i;
@@ -52,6 +54,8 @@ static int ft_split_len(char *str, char *charset)
int size; int size;
size = 2; size = 2;
if (str == NULL || charset == NULL)
return (size);
p_str = str; p_str = str;
while (*p_str != '\0') while (*p_str != '\0')
{ {
@@ -77,24 +81,25 @@ char **ft_split(char *str, char *charset)
{ {
char **strs; char **strs;
char *start; char *start;
int size;
int i; int i;
size = ft_split_len(str, charset); strs = malloc(ft_split_len(str, charset) * sizeof(strs));
strs = malloc((size) * sizeof(strs)); if (strs == NULL || charset == NULL || str == NULL)
return (NULL);
start = str; start = str;
i = 0; i = 0;
while (1) while (1)
{ {
if (ft_is_charset(*str, charset) == 1 || *str == '\0') if (ft_is_charset(*str, charset) == 1 || (*str == '\0' && g_t > 0))
{ {
size = str - start; if (str - start > 0)
if (size > 0) strs[i++] = ft_copy(start, str - start);
strs[i++] = ft_copy(start, size);
start = str + 1; start = str + 1;
}
else
g_t++;
if (*str == '\0') if (*str == '\0')
break ; break ;
}
str++; str++;
} }
strs[i] = ft_copy(str, 0); strs[i] = ft_copy(str, 0);

View File

@@ -6,7 +6,7 @@
/* By: gbaconni <gbaconni@42lausanne.ch> +#+ +:+ +#+ */ /* By: gbaconni <gbaconni@42lausanne.ch> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2021/08/18 10:50:59 by gbaconni #+# #+# */ /* Created: 2021/08/18 10:50:59 by gbaconni #+# #+# */
/* Updated: 2021/08/24 11:56:21 by gbaconni ### ########.fr */ /* Updated: 2021/08/25 14:11:02 by gbaconni ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -31,6 +31,8 @@ int main(int argc, char *argv[])
} }
str = argv[1]; str = argv[1];
charset = argv[2]; charset = argv[2];
if (str[0] == '\0')
str = NULL;
strs = ft_split(str, charset); strs = ft_split(str, charset);
printf("str=%s charset=%s (ft_split)\n", str, charset); printf("str=%s charset=%s (ft_split)\n", str, charset);
i = 0; i = 0;

View File

@@ -3,7 +3,7 @@ set -e
rm -f a.out rm -f a.out
#norminette -R CheckForbiddenSourceHeader ft_*.c #norminette -R CheckForbiddenSourceHeader ft_*.c
norminette -R CheckForbiddenSourceHeader norminette -R CheckForbiddenSourceHeader
gcc -Wall -Wextra -Werror -o a.out *.c gcc -Wall -Wextra -Werror -fsanitize=address -g -o a.out *.c
echo $(basename $PWD): echo $(basename $PWD):
./a.out "$@" ./a.out "$@"
rm -f a.out rm -f a.out