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

Norminette OK, Bonus OK

Browse Source
This commit is contained in:
David Gailleton
2025-11-21 14:33:45 +01:00
parent 92e03e0caf
commit 56c3d8ba94
6 changed files with 54 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
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 12:16:33 by dgaillet ### ########lyon.fr */ /* Updated: 2025/11/21 14:25:19 by dgaillet ### ########lyon.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -21,8 +21,8 @@ static int ft_putnbr_base_extra(unsigned int nbr, char *base, int base_size)
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); ft_putchar_fd(base[nbr % base_size], 1);
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)
{ {
if (nbr == 0 && limit != 0) if (nbr == 0 && limit != 0)

43
bonus/print_hex_bonus.c
View File

@@ -6,24 +6,53 @@
/* 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 12:13:16 by dgaillet ### ########lyon.fr */ /* Updated: 2025/11/21 14:24:18 by dgaillet ### ########lyon.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
#include "ft_printf_bonus.h" #include "ft_printf_bonus.h"
#include <unistd.h> #include <unistd.h>
static int padding_size(t_arg *arg, unsigned int nbr)
{
int padding;
int nbr_size;
if (arg->padding < 0)
return (0);
padding = arg->padding;
nbr_size = nbr_size_base(nbr, 16);
if (arg->dot > nbr_size || (arg->dot == 0 && !nbr))
nbr_size = arg->dot;
padding = padding - nbr_size;
return (padding);
}
static int print_nb_flags(t_arg *arg, unsigned int nbr)
{
int count;
int padding;
padding = padding_size(arg, nbr);
count = 0;
if (arg->dot >= 0 || arg->zero < 0)
count += print_chars(padding, ' ');
if (arg->dot >= 0)
arg->zero = -1;
return (count);
}
int print_hex(t_arg *arg, unsigned int nbr) int print_hex(t_arg *arg, unsigned int nbr)
{ {
int count; int count;
count = 0; count = 0;
count += print_chars(arg->padding - nbr_size_base(nbr, 16), ' '); count += print_nb_flags(arg, nbr);
if (nbr == 0) if (nbr == 0 && arg->dot)
{ {
count += write(1, "0", 1); count += write(1, "0", 1);
count += print_chars(arg->zero - count, '0'); count += print_chars(arg->zero - 1, '0');
count += print_chars(arg->dot - count, '0'); count += print_chars(arg->dot - 1, '0');
} }
else else
{ {
@@ -34,9 +63,9 @@ int print_hex(t_arg *arg, unsigned int nbr)
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')
count += ft_putnbr_base(nbr, "0123456789ABCDEF", 16, 2147483647); count += ft_putnbr_base(nbr, "0123456789ABCDEF", 16, arg->dot);
else else
count += ft_putnbr_base(nbr, "0123456789abcdef", 16, 2147483647); count += ft_putnbr_base(nbr, "0123456789abcdef", 16, arg->dot);
} }
return (count); return (count);
} }

5
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 12:18:58 by dgaillet ### ########lyon.fr */ /* Updated: 2025/11/21 14:32:24 by dgaillet ### ########lyon.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -25,7 +25,7 @@ static int padding_size(int space, int plus, t_arg *arg, int nbr)
nbr_size = nbr_size_base(nbr * -1, 10); nbr_size = nbr_size_base(nbr * -1, 10);
else else
nbr_size = nbr_size_base(nbr, 10); nbr_size = nbr_size_base(nbr, 10);
if (arg->dot > nbr_size || arg->dot == 0) if (arg->dot > nbr_size || (arg->dot == 0 && !nbr))
nbr_size = arg->dot; nbr_size = arg->dot;
padding = padding - nbr_size; padding = padding - nbr_size;
if (nbr < 0) if (nbr < 0)
@@ -52,6 +52,7 @@ static int print_nb_flags(t_arg *arg, int nbr)
count = 0; count = 0;
if (arg->dot >= 0 || arg->zero < 0) if (arg->dot >= 0 || arg->zero < 0)
count += print_chars(padding, ' '); count += print_chars(padding, ' ');
if (nbr >= 0)
count += print_chars(space, ' '); count += print_chars(space, ' ');
count += print_chars(plus, '+'); count += print_chars(plus, '+');
return (count); return (count);

4
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/20 15:03:57 by dgaillet ### ########lyon.fr */ /* Updated: 2025/11/21 14:18:06 by dgaillet ### ########lyon.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -25,7 +25,7 @@ int print_pointer(t_arg *arg, unsigned long long p)
ft_putstr_fd("(nil)", 1); ft_putstr_fd("(nil)", 1);
return (5); return (5);
} }
count += print_chars(arg->padding - nbr_size_base(p, 16), ' '); count += print_chars(arg->padding - nbr_size_base(p, 16) - 2, ' ');
count += write(1, "0x", 2); count += write(1, "0x", 2);
return (count + ft_putnbr_base_ll(p, "0123456789abcdef", 16)); return (count + ft_putnbr_base_ll(p, "0123456789abcdef", 16));
} }

29
bonus/print_unsigned_bonus.c
View File

@@ -6,54 +6,37 @@
/* 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 12:29:02 by dgaillet ### ########lyon.fr */ /* Updated: 2025/11/21 14:22:44 by dgaillet ### ########lyon.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
#include "ft_printf_bonus.h" #include "ft_printf_bonus.h"
#include <unistd.h> #include <unistd.h>
static int padding_size(int space, int plus, t_arg *arg, int nbr) static int padding_size(t_arg *arg, unsigned int nbr)
{ {
int padding; int padding;
int nbr_size; int nbr_size;
if (arg->padding < 0) if (arg->padding < 0)
return (0); return (0);
padding = arg->padding - space - plus; padding = arg->padding;
if (nbr < 0)
nbr_size = nbr_size_base(nbr * -1, 10);
else
nbr_size = nbr_size_base(nbr, 10); nbr_size = nbr_size_base(nbr, 10);
if (arg->dot > nbr_size || arg->dot == 0) if (arg->dot > nbr_size || (arg->dot == 0 && !nbr))
nbr_size = arg->dot; nbr_size = arg->dot;
padding = padding - nbr_size; padding = padding - nbr_size;
if (nbr < 0)
padding--;
return (padding); return (padding);
} }
static int print_nb_flags(t_arg *arg, int nbr) static int print_nb_flags(t_arg *arg, unsigned int nbr)
{ {
int count; int count;
int space;
int padding; int padding;
int plus;
if (arg->plus >= 0 && nbr > 0) padding = padding_size(arg, nbr);
plus = 1;
else
plus = 0;
if (arg->plus >= 0 || arg->space < 0)
space = 0;
else
space = 1;
padding = padding_size(space, plus, arg, nbr);
count = 0; count = 0;
if (arg->dot >= 0 || arg->zero < 0) if (arg->dot >= 0 || arg->zero < 0)
count += print_chars(padding, ' '); count += print_chars(padding, ' ');
count += print_chars(space, ' ');
count += print_chars(plus, '+');
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 12:25:53 by dgaillet ### ########lyon.fr */ /* Updated: 2025/11/21 14:31:36 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("...%.0u...\n", 0)); printf("%d - ", printf("...% d...\n", -1));
printf("%d\n\n", ft_printf("...%.0u...\n", 0)); printf("%d\n\n", ft_printf("...% d...\n", -1));
} }