42/42_INT_02_gnl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

leaks tests verifies et trouves

Browse Source
This commit is contained in:
hugodu69
2019-12-15 03:01:22 +01:00
parent f2e48e7746
commit 3ce1c65b03
8 changed files with 495 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
get_next_line.c
View File

@@ -12,48 +12,49 @@
#include "get_next_line.h" #include "get_next_line.h"
/*
** #include <stdio.h> //for printf #include <stdio.h> //for printf
** #include <fcntl.h> //for open #include <fcntl.h> //for open
**
** int main(int ac, char **av) int main(int ac, char **av)
** { {
** int *fd; int *fd;
** int i; int i;
** int j; int j;
** char *line; char *line;
**
** if (ac < 2) if (ac < 2)
** return (0); return (0);
** line = NULL; line = NULL;
** i = 0; i = 0;
** if (!(fd = (int *)malloc(sizeof(int) * ac))) if (!(fd = (int *)malloc(sizeof(int) * ac)))
** return (0); return (0);
** while (++i <= ac - 1) while (++i <= ac - 1)
** fd[i - 1] = open(av[i], O_RDONLY); fd[i - 1] = open(av[i], O_RDONLY);
** i = 0; i = 0;
** j = 0; j = 0;
** while (j < ac - 1) while (j < ac - 1)
** { {
** if (get_next_line(fd[i], &line) > 0) if (get_next_line(fd[i], &line) > 0)
** { {
** printf("fd%i| %s\n", fd[i], line); printf("fd%i| %s\n", fd[i], line);
** free(line); free(line);
** j = 0; j = 0;
** } }
** else else
** { {
** printf("fd%i|*FINI*\n", fd[i]); printf("fd%i|*FINI*\n", fd[i]);
** j++; j++;
** } }
** i++; i++;
** if (i >= ac - 1) if (i >= ac - 1)
** i = 0; i = 0;
** } }
** while (1); free (fd);
** return (0); // while (1);
** } return (0);
*/ }
int multi_fd(int fd, t_gnlist **lst) int multi_fd(int fd, t_gnlist **lst)
{ {

78
testt/get_next_line_bonus.c Normal file
View File

@@ -0,0 +1,78 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* get_next_line_bonus.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: jamrabhi <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2019/12/05 12:54:26 by jamrabhi #+# #+# */
/* Updated: 2019/12/09 21:53:57 by jamrabhi ### ########.fr */
/* */
/* ************************************************************************** */
#include "get_next_line_bonus.h"
static void free_it(char **str)
{
if (str)
{
free(*str);
*str = NULL;
}
}
static int separate_lines(char **line, char **str, int fd)
{
int i;
char *rest;
i = 0;
while (str[fd][i] && str[fd][i] != '\n')
i++;
if (!(*line = ft_substr(str[fd], 0, i)))
{
free_it(&str[fd]);
return (-1);
}
if (str[fd][i])
{
if (!(rest = ft_substr(str[fd], i + 1, ft_strlen(str[fd]) - (i + 1))))
{
free_it(&str[fd]);
return (-1);
}
free_it(&str[fd]);
str[fd] = rest;
return (1);
}
free_it(&str[fd]);
// free(*line);
return (0);
}
int get_next_line(int fd, char **line)
{
static char *str[FOPEN_MAX];
char buf[BUFFER_SIZE + 1];
int i;
char *tmp;
if (fd < 0 || fd >= FOPEN_MAX || !line || BUFFER_SIZE <= 0
|| read(fd, buf, 0) < 0)
return (-1);
if (!str[fd])
if (!(str[fd] = (char*)ft_memalloc(sizeof(char) * 1)))
return (-1);
while (!ft_strchr(str[fd], '\n') && (i = read(fd, buf, BUFFER_SIZE)) > 0)
{
buf[i] = '\0';
if (!(tmp = ft_strjoin(str[fd], buf)))
{
free_it(&str[fd]);
return (-1);
}
free_it(&str[fd]);
str[fd] = tmp;
}
return (separate_lines(line, str, fd));
}

31
testt/get_next_line_bonus.h Normal file
View File

@@ -0,0 +1,31 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* get_next_line_bonus.h :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: jamrabhi <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2019/12/05 12:55:15 by jamrabhi #+# #+# */
/* Updated: 2019/12/05 12:57:31 by jamrabhi ### ########.fr */
/* */
/* ************************************************************************** */
#ifndef GET_NEXT_LINE_BONUS_H
# define GET_NEXT_LINE_BONUS_H
# include <unistd.h>
# include <stdlib.h>
# include <limits.h>
# include <stdio.h>
# include <sys/types.h>
# include <sys/stat.h>
# include <fcntl.h>
int get_next_line(int fd, char **line);
char *ft_strjoin(char const *s1, char const *s2);
char *ft_substr(char const *s, unsigned int start, size_t len);
char *ft_strchr(const char *s, int c);
size_t ft_strlen(const char *str);
void *ft_memalloc(size_t size);
#endif

104
testt/get_next_line_utils_bonus.c Normal file
View File

@@ -0,0 +1,104 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* get_next_line_utils_bonus.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: jamrabhi <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2019/12/05 12:55:34 by jamrabhi #+# #+# */
/* Updated: 2019/12/05 12:58:26 by jamrabhi ### ########.fr */
/* */
/* ************************************************************************** */
#include "get_next_line_bonus.h"
void *ft_memalloc(size_t size)
{
void *mem;
size_t i;
i = 0;
if (!(mem = malloc(size)))
return (NULL);
while (i < size)
{
((char*)mem)[i] = 0;
i++;
}
return (mem);
}
size_t ft_strlen(const char *str)
{
size_t i;
i = 0;
while (str[i])
i++;
return (i);
}
char *ft_strjoin(char const *s1, char const *s2)
{
size_t i;
size_t j;
char *str;
size_t str_len;
i = 0;
j = 0;
if (!(s1 && s2))
return (NULL);
str_len = (ft_strlen(s1) + ft_strlen(s2));
if (!(str = (char *)malloc(sizeof(*str) * (str_len + 1))))
return (NULL);
while (s1[i])
{
str[i] = s1[i];
i++;
}
while (s2[j])
str[i++] = s2[j++];
str[i] = '\0';
return (str);
}
char *ft_strchr(const char *s, int c)
{
int i;
char ch;
i = 0;
ch = c;
while (s[i])
{
if (s[i] == ch)
return ((char*)s + i);
i++;
}
if (s[i] == '\0' && ch == '\0')
return ((char*)s + i);
return (NULL);
}
char *ft_substr(char const *s, unsigned int start, size_t len)
{
size_t i;
char *rt;
i = 0;
if (!s)
return (NULL);
if (start > ft_strlen(s))
len = 0;
if (!(rt = (char *)malloc(sizeof(*rt) * (len + 1))))
return (NULL);
while (*s + start && i < len)
{
rt[i] = s[start];
i++;
start++;
}
rt[i] = '\0';
return (rt);
}

15
testt/get_next_line.c → testt/get_next_one_line.c
View File

@@ -1,4 +1,10 @@
#include <libc.h> #include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <limits.h>
void *ft_memalloc(size_t size) void *ft_memalloc(size_t size)
{ {
@@ -131,17 +137,18 @@ static int separate_lines(char **line, char **str, int fd)
return (1); return (1);
} }
// free_it(&str[fd]); // free_it(&str[fd]);
// free(*line);
return (0); return (0);
} }
int get_next_line(int fd, char **line) int get_next_line(int fd, char **line)
{ {
static char *str[OPEN_MAX]; static char *str[FOPEN_MAX];
char buf[BUFFER_SIZE + 1]; char buf[BUFFER_SIZE + 1];
int i; int i;
char *tmp; char *tmp;
if (fd < 0 || fd >= OPEN_MAX || !line || BUFFER_SIZE <= 0 if (fd < 0 || fd >= FOPEN_MAX || !line || BUFFER_SIZE <= 0
|| read(fd, buf, 0) < 0) || read(fd, buf, 0) < 0)
return (-1); return (-1);
if (!str[fd]) if (!str[fd])
@@ -181,7 +188,7 @@ int get_next_line(int fd, char **line)
printf("%s\n",line); printf("%s\n",line);
free(line); free(line);
} }
while (1); // while (1);
return (0); return (0);
} }

104
testt/leaks.txt Normal file
View File

@@ -0,0 +1,104 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* get_next_line_utils_bonus.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: jamrabhi <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2019/12/05 12:55:34 by jamrabhi #+# #+# */
/* Updated: 2019/12/05 12:58:26 by jamrabhi ### ########.fr */
/* */
/* ************************************************************************** */
#include "get_next_line_bonus.h"
void *ft_memalloc(size_t size)
{
void *mem;
size_t i;
i = 0;
if (!(mem = malloc(size)))
return (NULL);
while (i < size)
{
((char*)mem)[i] = 0;
i++;
}
return (mem);
}
size_t ft_strlen(const char *str)
{
size_t i;
i = 0;
while (str[i])
i++;
return (i);
}
char *ft_strjoin(char const *s1, char const *s2)
{
size_t i;
size_t j;
char *str;
size_t str_len;
i = 0;
j = 0;
if (!(s1 && s2))
return (NULL);
str_len = (ft_strlen(s1) + ft_strlen(s2));
if (!(str = (char *)malloc(sizeof(*str) * (str_len + 1))))
return (NULL);
while (s1[i])
{
str[i] = s1[i];
i++;
}
while (s2[j])
str[i++] = s2[j++];
str[i] = '\0';
return (str);
}
char *ft_strchr(const char *s, int c)
{
int i;
char ch;
i = 0;
ch = c;
while (s[i])
{
if (s[i] == ch)
return ((char*)s + i);
i++;
}
if (s[i] == '\0' && ch == '\0')
return ((char*)s + i);
return (NULL);
}
char *ft_substr(char const *s, unsigned int start, size_t len)
{
size_t i;
char *rt;
i = 0;
if (!s)
return (NULL);
if (start > ft_strlen(s))
len = 0;
if (!(rt = (char *)malloc(sizeof(*rt) * (len + 1))))
return (NULL);
while (*s + start && i < len)
{
rt[i] = s[start];
i++;
start++;
}
rt[i] = '\0';
return (rt);
}

104
testt/leaksfree.txt Normal file
View File

@@ -0,0 +1,104 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* get_next_line_utils_bonus.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: jamrabhi <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2019/12/05 12:55:34 by jamrabhi #+# #+# */
/* Updated: 2019/12/05 12:58:26 by jamrabhi ### ########.fr */
/* */
/* ************************************************************************** */
#include "get_next_line_bonus.h"
void *ft_memalloc(size_t size)
{
void *mem;
size_t i;
i = 0;
if (!(mem = malloc(size)))
return (NULL);
while (i < size)
{
((char*)mem)[i] = 0;
i++;
}
return (mem);
}
size_t ft_strlen(const char *str)
{
size_t i;
i = 0;
while (str[i])
i++;
return (i);
}
char *ft_strjoin(char const *s1, char const *s2)
{
size_t i;
size_t j;
char *str;
size_t str_len;
i = 0;
j = 0;
if (!(s1 && s2))
return (NULL);
str_len = (ft_strlen(s1) + ft_strlen(s2));
if (!(str = (char *)malloc(sizeof(*str) * (str_len + 1))))
return (NULL);
while (s1[i])
{
str[i] = s1[i];
i++;
}
while (s2[j])
str[i++] = s2[j++];
str[i] = '\0';
return (str);
}
char *ft_strchr(const char *s, int c)
{
int i;
char ch;
i = 0;
ch = c;
while (s[i])
{
if (s[i] == ch)
return ((char*)s + i);
i++;
}
if (s[i] == '\0' && ch == '\0')
return ((char*)s + i);
return (NULL);
}
char *ft_substr(char const *s, unsigned int start, size_t len)
{
size_t i;
char *rt;
i = 0;
if (!s)
return (NULL);
if (start > ft_strlen(s))
len = 0;
if (!(rt = (char *)malloc(sizeof(*rt) * (len + 1))))
return (NULL);
while (*s + start && i < len)
{
rt[i] = s[start];
i++;
start++;
}
rt[i] = '\0';
return (rt);
}

20
testt/main.c Normal file
View File

@@ -0,0 +1,20 @@
#include "get_next_line_bonus.h"
int main(int ac, char **av)
{
int fd1;
int i;
char *line;
line = NULL;
fd1 = open(av[1], O_RDONLY);
if (ac < 2)
return (0);
while ((i = get_next_line(fd1, &line)) > 0)
{
printf("%s\n",line);
free(line);
}
// while (1);
return (0);
}