diff options
Diffstat (limited to 'src/io')
| -rw-r--r-- | src/io/ft_getfile.c | 33 | ||||
| -rw-r--r-- | src/io/ft_getfile_fd.c | 40 | ||||
| -rw-r--r-- | src/io/ft_putnbr_base.c | 18 | ||||
| -rw-r--r-- | src/io/ft_putnbr_base_fd.c | 33 |
4 files changed, 101 insertions, 23 deletions
diff --git a/src/io/ft_getfile.c b/src/io/ft_getfile.c index d3f697c..6ae4833 100644 --- a/src/io/ft_getfile.c +++ b/src/io/ft_getfile.c @@ -3,38 +3,25 @@ /* ::: :::::::: */ /* ft_getfile.c :+: :+: :+: */ /* +:+ +:+ +:+ */ -/* By: charles <charles.cabergs@gmail.com> +#+ +:+ +#+ */ +/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ -/* Created: 2020/05/11 09:52:32 by charles #+# #+# */ -/* Updated: 2020/05/11 16:09:31 by charles ### ########.fr */ +/* Created: 2020/02/22 10:32:47 by cacharle #+# #+# */ +/* Updated: 2020/08/02 11:01:06 by charles ### ########.fr */ /* */ /* ************************************************************************** */ #include "libft_io.h" -/* -** \brief Read a file in a memory buffer -** \param fd File descriptor to read from -** \param mem Pointer to mem struct (buffer and buffer size) -** \return -1 on error, 0 otherwise -*/ - -int ft_getfile(int fd, t_ftmem *mem) +int ft_getfile(char *filename, t_ftmem *mem) { - char buf[FT_GETFILE_BUFFER_SIZE]; - int ret; + int fd; - if (fd < 0 || fd > OPEN_MAX || mem == NULL - || (mem->data = malloc(1)) == NULL) + if ((fd = open(filename, O_RDONLY)) < 0) return (-1); - mem->size = 0; - while ((ret = read(fd, buf, FT_GETFILE_BUFFER_SIZE)) > 0) + if (ft_getfile_fd(fd, mem) < 0) { - if ((mem->data = ft_memjoinf1(mem->data, mem->size, buf, ret)) == NULL) - return (-1); - mem->size += ret; + close(fd); + return (-1); } - if (ret == -1) - free(mem->data); - return (ret); + return (close(fd)); } diff --git a/src/io/ft_getfile_fd.c b/src/io/ft_getfile_fd.c new file mode 100644 index 0000000..91ebf7f --- /dev/null +++ b/src/io/ft_getfile_fd.c @@ -0,0 +1,40 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_getfile_fd.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: charles <charles.cabergs@gmail.com> +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2020/05/11 09:52:32 by charles #+# #+# */ +/* Updated: 2020/08/02 10:55:46 by charles ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include "libft_io.h" + +/* +** \brief Read a file in a memory buffer +** \param fd File descriptor to read from +** \param mem Pointer to mem struct (buffer and buffer size) +** \return -1 on error, 0 otherwise +*/ + +int ft_getfile_fd(int fd, t_ftmem *mem) +{ + char buf[FT_GETFILE_BUFFER_SIZE]; + int ret; + + if (fd < 0 || fd > OPEN_MAX || mem == NULL + || (mem->data = malloc(1)) == NULL) + return (-1); + mem->size = 0; + while ((ret = read(fd, buf, FT_GETFILE_BUFFER_SIZE)) > 0) + { + if ((mem->data = ft_memjoinf1(mem->data, mem->size, buf, ret)) == NULL) + return (-1); + mem->size += ret; + } + if (ret == -1) + free(mem->data); + return (ret); +} diff --git a/src/io/ft_putnbr_base.c b/src/io/ft_putnbr_base.c new file mode 100644 index 0000000..878c538 --- /dev/null +++ b/src/io/ft_putnbr_base.c @@ -0,0 +1,18 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_putnbr_base.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2020/02/22 09:52:45 by cacharle #+# #+# */ +/* Updated: 2020/02/22 09:53:31 by cacharle ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include "libft_io.h" + +void ft_putnbr_base(int n, char *base) +{ + ft_putnbr_base_fd(n, base, STDOUT_FILENO); +} diff --git a/src/io/ft_putnbr_base_fd.c b/src/io/ft_putnbr_base_fd.c new file mode 100644 index 0000000..ea8516e --- /dev/null +++ b/src/io/ft_putnbr_base_fd.c @@ -0,0 +1,33 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_putnbr_base_fd.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2020/02/22 09:48:23 by cacharle #+# #+# */ +/* Updated: 2020/02/22 09:53:41 by cacharle ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include "libft.h" +#include "libft_io.h" + +void ft_putnbr_base_fd(int n, char *base, int fd) +{ + unsigned int p_n; + int radix; + + if (fd < 0 || fd > OPEN_MAX) + return ; + p_n = n; + if (n < 0) + { + ft_putchar_fd('-', fd); + p_n = -n; + } + radix = ft_strlen(base); + if (p_n > 9) + ft_putnbr_base_fd(p_n / radix, base, fd); + ft_putchar_fd(base[p_n % radix], fd); +} |