fix number and unsigned flags behavior
This commit is contained in:
@@ -6,21 +6,66 @@
|
||||
/* By: dgaillet <dgaillet@student.42.fr> +#+ +:+ +#+ */
|
||||
/* +#+#+#+#+#+ +#+ */
|
||||
/* Created: 2025/11/17 12:26:23 by dgaillet #+# #+# */
|
||||
/* Updated: 2025/11/20 16:17:12 by dgaillet ### ########lyon.fr */
|
||||
/* Updated: 2025/11/21 12:29:02 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 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 || arg->dot == 0)
|
||||
nbr_size = arg->dot;
|
||||
padding = padding - nbr_size;
|
||||
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;
|
||||
else
|
||||
plus = 0;
|
||||
if (arg->plus >= 0 || arg->space < 0)
|
||||
space = 0;
|
||||
else
|
||||
space = 1;
|
||||
padding = padding_size(space, plus, arg, nbr);
|
||||
count = 0;
|
||||
if (arg->dot >= 0 || arg->zero < 0)
|
||||
count += print_chars(padding, ' ');
|
||||
count += print_chars(space, ' ');
|
||||
count += print_chars(plus, '+');
|
||||
return (count);
|
||||
}
|
||||
|
||||
int print_unsigned(t_arg *arg, unsigned int nbr)
|
||||
{
|
||||
int count;
|
||||
|
||||
count = 0;
|
||||
count += print_chars(arg->padding - nbr_size_base(nbr, 10), ' ');
|
||||
count += print_chars(arg->zero - nbr_size_base(nbr, 10), '0');
|
||||
count += print_nb_flags(arg, nbr);
|
||||
if (arg->dot < 0)
|
||||
count += print_chars(arg->zero - nbr_size_base(nbr, 10), '0');
|
||||
count += print_chars(arg->dot - nbr_size_base(nbr, 10), '0');
|
||||
count += ft_putnbr_base(nbr, "0123456789", 10);
|
||||
count += ft_putnbr_base(nbr, "0123456789", 10, arg->dot);
|
||||
return (count);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user