all flags setup, some fixes is needed

This commit is contained in:
David Gailleton
2025-11-20 16:54:00 +01:00
parent bd1c66d86f
commit 24887c810c
12 changed files with 181 additions and 63 deletions

View File

@@ -6,13 +6,57 @@
/* By: dgaillet <dgaillet@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/11/17 12:26:23 by dgaillet #+# #+# */
/* Updated: 2025/11/19 19:56:04 by dgaillet ### ########lyon.fr */
/* Updated: 2025/11/20 16:52:30 by dgaillet ### ########lyon.fr */
/* */
/* ************************************************************************** */
#include "ft_printf_bonus.h"
#include <unistd.h>
static int padding_size(int space, int plus, t_arg *arg, int nbr)
{
int padding;
int dot;
int nbr_size;
if (arg->padding < 0)
return (0);
padding = arg->padding - space - plus;
if (nbr < 0)
nbr_size = nbr_size_base(nbr * -1, 10);
else
nbr_size = nbr_size_base(nbr, 10);
if (arg->dot > nbr_size)
nbr_size = dot;
padding = padding - nbr_size;
if (arg->zero >= 0)
padding = padding - arg->zero;
if (nbr < 0)
padding--;
return (padding);
}
static int print_nb_flags(t_arg *arg, int nbr)
{
int count;
int space;
int padding;
int plus;
if (arg->plus >= 0 && nbr > 0)
plus = 1;
if (arg->plus >= 0 || arg->space < 0)
space = 0;
else
space = 1;
padding = padding_size(space, plus, arg, nbr);
count = 0;
count += print_chars(padding, ' ');
count += print_chars(space, ' ');
count += print_chars(plus, '+');
return (count);
}
int print_number(t_arg *arg, int nbr)
{
unsigned int p_nbr;
@@ -20,8 +64,7 @@ int print_number(t_arg *arg, int nbr)
count = 0;
p_nbr = nbr;
if (nbr == 0)
count += write(1, "0", 1);
count += print_nb_flags(arg, nbr);
if (nbr < 0)
{
count += write(1, "-", 1);
@@ -30,5 +73,6 @@ int print_number(t_arg *arg, int nbr)
}
else
count += print_chars(arg->zero - nbr_size_base(p_nbr, 10), '0');
count += print_chars(arg->dot - nbr_size_base(p_nbr, 10), '0');
return (count + ft_putnbr_base(p_nbr, "0123456789", 10));
}