da7e/42-ft_printf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Error management on write for bonus part

Browse Source
This commit is contained in:
David Gailleton
2025-11-21 15:57:06 +01:00
parent 620054c92e
commit 3b9f024c3c
9 changed files with 81 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
bonus/ft_printf_bonus.c
View File

@@ -6,7 +6,7 @@
/* By: dgaillet <dgaillet@student.42.fr> +#+ +:+ +#+ */ /* By: dgaillet <dgaillet@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/11/17 10:54:03 by dgaillet #+# #+# */ /* Created: 2025/11/17 10:54:03 by dgaillet #+# #+# */
/* Updated: 2025/11/20 14:47:12 by dgaillet ### ########lyon.fr */ /* Updated: 2025/11/21 14:59:50 by dgaillet ### ########lyon.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -32,7 +32,11 @@ static int ft_print_arg_flags(t_arg *arg, va_list args)
count += print_unsigned(arg, va_arg(args, unsigned int)); count += print_unsigned(arg, va_arg(args, unsigned int));
else if (arg->arg == 'x' || arg->arg == 'X') else if (arg->arg == 'x' || arg->arg == 'X')
count += print_hex(arg, va_arg(args, unsigned int)); count += print_hex(arg, va_arg(args, unsigned int));
if (count < 0)
return (-1);
count += print_chars(arg->minus - count, ' '); count += print_chars(arg->minus - count, ' ');
if (count < 0)
return (-1);
return (count); return (count);
} }
@@ -43,7 +47,7 @@ static int ft_print_arg(char *str, va_list args)
arg = ft_parsing(str); arg = ft_parsing(str);
if (!arg) if (!arg)
return (0); return (-1);
if (arg->arg == '%') if (arg->arg == '%')
count = write(1, "%", 1); count = write(1, "%", 1);
else else
@@ -72,12 +76,14 @@ int ft_printf(const char *first_arg, ...)
va_list args; va_list args;
int nb_print; int nb_print;
int i; int i;
int temp;
nb_print = 0; nb_print = 0;
va_start(args, first_arg); va_start(args, first_arg);
i = 0; i = 0;
while (first_arg[i]) while (first_arg[i])
{ {
temp = nb_print;
if (first_arg[i] == '%') if (first_arg[i] == '%')
{ {
i++; i++;
@@ -86,6 +92,8 @@ int ft_printf(const char *first_arg, ...)
} }
else else
nb_print += write(1, &first_arg[i], 1); nb_print += write(1, &first_arg[i], 1);
if (temp > nb_print)
return (-1);
i++; i++;
} }
va_end(args); va_end(args);

24
bonus/ft_putnbr_base_bonus.c
View File

@@ -6,7 +6,7 @@
/* By: dgaillet <dgaillet@student.42.fr> +#+ +:+ +#+ */ /* By: dgaillet <dgaillet@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/11/17 12:16:44 by dgaillet #+# #+# */ /* Created: 2025/11/17 12:16:44 by dgaillet #+# #+# */
/* Updated: 2025/11/21 14:25:19 by dgaillet ### ########lyon.fr */ /* Updated: 2025/11/21 15:04:59 by dgaillet ### ########lyon.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -15,19 +15,26 @@
static int ft_putnbr_base_extra(unsigned int nbr, char *base, int base_size) static int ft_putnbr_base_extra(unsigned int nbr, char *base, int base_size)
{ {
int i; int i;
char temp;
if (nbr == 0) if (nbr == 0)
return (0); return (0);
i = 1 + ft_putnbr_base_extra(nbr / base_size, base, base_size); i = 1 + ft_putnbr_base_extra(nbr / base_size, base, base_size);
ft_putchar_fd(base[nbr % base_size], 1); temp = base[nbr % base_size];
if (write(1, &temp, 1) < 0)
return (-10000);
return (i); return (i);
} }
int ft_putnbr_base(unsigned int nbr, char *base, int base_size, int limit) int ft_putnbr_base(unsigned int nbr, char *base, int base_size, int limit)
{ {
char temp;
if (nbr == 0 && limit != 0) if (nbr == 0 && limit != 0)
{ {
ft_putchar_fd(base[0], 1); temp = base[0];
if (write(1, &temp, 1) < 0)
return (-10000);
return (1); return (1);
} }
return (ft_putnbr_base_extra(nbr, base, base_size)); return (ft_putnbr_base_extra(nbr, base, base_size));
@@ -37,19 +44,26 @@ static int ft_putnbr_base_ll_extra(unsigned long long nbr
, char *base, int base_size) , char *base, int base_size)
{ {
int i; int i;
char temp;
if (nbr == 0) if (nbr == 0)
return (0); return (0);
i = 1 + ft_putnbr_base_ll_extra(nbr / base_size, base, base_size); i = 1 + ft_putnbr_base_ll_extra(nbr / base_size, base, base_size);
ft_putchar_fd(base[nbr % base_size], 1); temp = base[nbr % base_size];
if (write(1, &temp, 1) < 0)
return (-10000);
return (i); return (i);
} }
int ft_putnbr_base_ll(unsigned long long nbr, char *base, int base_size) int ft_putnbr_base_ll(unsigned long long nbr, char *base, int base_size)
{ {
char temp;
if (nbr == 0) if (nbr == 0)
{ {
ft_putchar_fd(base[0], 1); temp = base[0];
if (write(1, &temp, 1) < 0)
return (-10000);
return (1); return (1);
} }
return (ft_putnbr_base_ll_extra(nbr, base, base_size)); return (ft_putnbr_base_ll_extra(nbr, base, base_size));

7
bonus/print_char_bonus.c
View File

@@ -6,13 +6,12 @@
/* By: dgaillet <dgaillet@student.42.fr> +#+ +:+ +#+ */ /* By: dgaillet <dgaillet@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/11/17 11:56:36 by dgaillet #+# #+# */ /* Created: 2025/11/17 11:56:36 by dgaillet #+# #+# */
/* Updated: 2025/11/20 14:40:30 by dgaillet ### ########lyon.fr */ /* Updated: 2025/11/21 15:31:35 by dgaillet ### ########lyon.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
#include "ft_printf_bonus.h" #include "ft_printf_bonus.h"
#include <unistd.h> #include <unistd.h>
#include <stdlib.h>
int print_char(t_arg *arg, char c) int print_char(t_arg *arg, char c)
{ {
@@ -22,6 +21,8 @@ int print_char(t_arg *arg, char c)
count += print_chars(arg->padding - 1, ' '); count += print_chars(arg->padding - 1, ' ');
if (!arg->minus && arg->zero) if (!arg->minus && arg->zero)
count += print_chars(arg->zero - 1, ' '); count += print_chars(arg->zero - 1, ' ');
count += write(1, &c, 1); if (write(1, &c, 1) < 0)
return (-10000);
count++;
return (count); return (count);
} }

25
bonus/print_hex_bonus.c
View File

@@ -6,7 +6,7 @@
/* By: dgaillet <dgaillet@student.42.fr> +#+ +:+ +#+ */ /* By: dgaillet <dgaillet@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/11/17 12:06:35 by dgaillet #+# #+# */ /* Created: 2025/11/17 12:06:35 by dgaillet #+# #+# */
/* Updated: 2025/11/21 14:24:18 by dgaillet ### ########lyon.fr */ /* Updated: 2025/11/21 15:39:21 by dgaillet ### ########lyon.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -42,24 +42,37 @@ static int print_nb_flags(t_arg *arg, unsigned int nbr)
return (count); return (count);
} }
int print_hex(t_arg *arg, unsigned int nbr) static int print_hex_zero(t_arg *arg)
{ {
int count; int count;
count = 0; count = 0;
count += print_nb_flags(arg, nbr); if (write(1, "0", 1) < 0)
if (nbr == 0 && arg->dot) return (-10000);
{ count++;
count += write(1, "0", 1);
count += print_chars(arg->zero - 1, '0'); count += print_chars(arg->zero - 1, '0');
count += print_chars(arg->dot - 1, '0'); count += print_chars(arg->dot - 1, '0');
return (count);
} }
int print_hex(t_arg *arg, unsigned int nbr)
{
int count;
int temp;
count = 0;
count += print_nb_flags(arg, nbr);
if (nbr == 0 && arg->dot)
count += print_hex_zero(arg);
else else
{ {
temp = count;
if (arg->hash > 0 && arg->arg == 'X') if (arg->hash > 0 && arg->arg == 'X')
count += write(1, "0X", 2); count += write(1, "0X", 2);
else if (arg->hash > 0) else if (arg->hash > 0)
count += write(1, "0x", 2); count += write(1, "0x", 2);
if (temp > count)
return (-10000);
count += print_chars(arg->zero - count - nbr_size_base(nbr, 16), '0'); count += print_chars(arg->zero - count - nbr_size_base(nbr, 16), '0');
count += print_chars(arg->dot - nbr_size_base(nbr, 16), '0'); count += print_chars(arg->dot - nbr_size_base(nbr, 16), '0');
if (arg->arg == 'X') if (arg->arg == 'X')

8
bonus/print_number_bonus.c
View File

@@ -6,7 +6,7 @@
/* By: dgaillet <dgaillet@student.42.fr> +#+ +:+ +#+ */ /* By: dgaillet <dgaillet@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/11/17 12:26:23 by dgaillet #+# #+# */ /* Created: 2025/11/17 12:26:23 by dgaillet #+# #+# */
/* Updated: 2025/11/21 14:32:24 by dgaillet ### ########lyon.fr */ /* Updated: 2025/11/21 15:48:29 by dgaillet ### ########lyon.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -40,7 +40,7 @@ static int print_nb_flags(t_arg *arg, int nbr)
int padding; int padding;
int plus; int plus;
if (arg->plus >= 0 && nbr > 0) if (arg->plus >= 0 && nbr >= 0)
plus = 1; plus = 1;
else else
plus = 0; plus = 0;
@@ -68,7 +68,9 @@ int print_number(t_arg *arg, int nbr)
count += print_nb_flags(arg, nbr); count += print_nb_flags(arg, nbr);
if (nbr < 0) if (nbr < 0)
{ {
count += write(1, "-", 1); if (write(1, "-", 1) < 0)
return (-10000);
count++;
p_nbr = nbr * -1; p_nbr = nbr * -1;
if (arg->dot < 0) if (arg->dot < 0)
count += print_chars(arg->zero - nbr_size_base(p_nbr, 10) - 1, '0'); count += print_chars(arg->zero - nbr_size_base(p_nbr, 10) - 1, '0');

12
bonus/print_pointer_bonus.c
View File

@@ -6,7 +6,7 @@
/* By: dgaillet <dgaillet@student.42.fr> +#+ +:+ +#+ */ /* By: dgaillet <dgaillet@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/11/17 12:19:16 by dgaillet #+# #+# */ /* Created: 2025/11/17 12:19:16 by dgaillet #+# #+# */
/* Updated: 2025/11/21 14:18:06 by dgaillet ### ########lyon.fr */ /* Updated: 2025/11/21 15:46:51 by dgaillet ### ########lyon.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -22,10 +22,12 @@ int print_pointer(t_arg *arg, unsigned long long p)
if (!p) if (!p)
{ {
count += print_chars(arg->padding - 5, ' '); count += print_chars(arg->padding - 5, ' ');
ft_putstr_fd("(nil)", 1); if (write(1, "(nil)", 5) < 0)
return (5); return (-10000);
return (5 + count);
} }
count += print_chars(arg->padding - nbr_size_base(p, 16) - 2, ' '); count += print_chars(arg->padding - nbr_size_base(p, 16) - 2, ' ');
count += write(1, "0x", 2); if (write(1, "0x", 2) < 0)
return (count + ft_putnbr_base_ll(p, "0123456789abcdef", 16)); return (-10000);
return (count + 2 + ft_putnbr_base_ll(p, "0123456789abcdef", 16));
} }

10
bonus/print_str_bonus.c
View File

@@ -6,7 +6,7 @@
/* By: dgaillet <dgaillet@student.42.fr> +#+ +:+ +#+ */ /* By: dgaillet <dgaillet@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/11/17 12:02:03 by dgaillet #+# #+# */ /* Created: 2025/11/17 12:02:03 by dgaillet #+# #+# */
/* Updated: 2025/11/20 15:34:58 by dgaillet ### ########lyon.fr */ /* Updated: 2025/11/21 15:32:08 by dgaillet ### ########lyon.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -24,7 +24,9 @@ int print_str(t_arg *arg, char *str)
return (print_chars(arg->padding, ' ')); return (print_chars(arg->padding, ' '));
if (arg->padding > 6) if (arg->padding > 6)
count += print_chars(arg->padding - 6, ' '); count += print_chars(arg->padding - 6, ' ');
return (count + write(1, "(null)", 6)); if (write(1, "(null)", 6) < 0)
return (-10000);
return (count + 6);
} }
if (arg->dot > (int) ft_strlen(str) || arg->dot < 0) if (arg->dot > (int) ft_strlen(str) || arg->dot < 0)
arg->dot = ft_strlen(str); arg->dot = ft_strlen(str);
@@ -32,5 +34,7 @@ int print_str(t_arg *arg, char *str)
count += print_chars(arg->padding - arg->dot, ' '); count += print_chars(arg->padding - arg->dot, ' ');
else if (!str[0] && arg->space > 0) else if (!str[0] && arg->space > 0)
return (write(1, " ", 1)); return (write(1, " ", 1));
return (count + write(1, str, arg->dot)); if (write(1, str, arg->dot) < 0)
return (-10000);
return (count + arg->dot);
} }

6
bonus/utils_flag_bonus.c
View File

@@ -6,7 +6,7 @@
/* By: dgaillet <dgaillet@student.42.fr> +#+ +:+ +#+ */ /* By: dgaillet <dgaillet@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/11/19 17:07:22 by dgaillet #+# #+# */ /* Created: 2025/11/19 17:07:22 by dgaillet #+# #+# */
/* Updated: 2025/11/19 19:53:38 by dgaillet ### ########lyon.fr */ /* Updated: 2025/11/21 15:00:35 by dgaillet ### ########lyon.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -35,7 +35,9 @@ int print_chars(int nb, char c)
count = 0; count = 0;
while (nb > 0) while (nb > 0)
{ {
count += write(1, &c, 1); if (write(1, &c, 1) < 0)
return (-100000);
count++;
nb--; nb--;
} }
return (count); return (count);

6
test.c
View File

@@ -6,7 +6,7 @@
/* By: dgaillet <dgaillet@student.42.fr> +#+ +:+ +#+ */ /* By: dgaillet <dgaillet@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/11/20 16:11:53 by dgaillet #+# #+# */ /* Created: 2025/11/20 16:11:53 by dgaillet #+# #+# */
/* Updated: 2025/11/21 14:31:36 by dgaillet ### ########lyon.fr */ /* Updated: 2025/11/21 15:54:15 by dgaillet ### ########lyon.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -17,6 +17,6 @@
int main(void) int main(void)
{ {
printf("===\t-\t===\n\n"); printf("===\t-\t===\n\n");
printf("%d - ", printf("...% d...\n", -1)); printf("%d - ", printf("...%p...%p...\n", 0, 0));
printf("%d\n\n", ft_printf("...% d...\n", -1)); printf("%d\n\n", ft_printf("...%p...%p...\n", 0, 0));
} }