42/42_INT_03_ft_printf
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

flag espace ok

Browse Source
This commit is contained in:
Hugo LAMY
2020-03-12 20:56:44 +01:00
parent 01aab8912c
commit 02bd116005
6 changed files with 102 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
srcs/ft_flag_transform.c
View File

@@ -65,10 +65,10 @@ char *ft_precision(char *s, char *print, char *type)
if ((tmp = ft_strchr(s, '.')))
{
precision = ft_atoi(tmp + 1);
*tmp = '\0';
// *tmp = '\0';
while (*s && ft_strchr("#- +'0", *(++s)))
if (*s == '0')
*s = '.';
*s = '/';
i = 0;
if (precision == 0 && !ft_strcmp(print, "0"))
print[0] = '\0';
@@ -146,9 +146,9 @@ char *ft_width(char *s, char *print, int *size, char *type)
zero = 0;
if (print[0] == '\0' && ft_strchr(type, 'c'))
zero = 1;
while (*tmp != '\0' && ft_strchr("%#- +'0.", *tmp))
while (*tmp != '\0' && ft_strchr("%#- +'0/", *tmp))
tmp++;
if (*tmp == '\0')
if (*tmp == '\0' || *tmp == '.')
{
*size = ft_strlen(print) + zero;
return (print);
@@ -159,6 +159,7 @@ char *ft_width(char *s, char *print, int *size, char *type)
print = width_flags(print, s, *size, zero);
else
*size = ft_strlen(print) + zero;
tmp[0] = '1';
return (print);
}
@@ -179,6 +180,7 @@ char *ft_flag_transform(char *s, char *print, char *type, int *size)
print = ft_sharp(s, print, type);
print = ft_width(s, print, size, type);
print = ft_sharp_again(s, print, type);
print = ft_space(s, print, type, size);
if (ft_strchr(type, 'p'))
{
print = ft_concat_free(ft_strdup("0x"), print);

24
srcs/ft_flag_transform_bonus.c
View File

@@ -37,3 +37,27 @@ char *ft_sharp_again(char *s, char *print, char *type)
return (print);
}
char *ft_space(char *s, char *print, char *type, int *size)
{
int i = 0;
if (print[0] == ' ' || !ft_strchr(s, ' ') || !ft_strchrset(type, "diuxX"))
return (print);
while (print[i] == ' ')
i++;
if (print[i] == '-' || print[i] == '+')
return (print);
if (ft_strchr(s, '.') || (i == 0 && print[i] != '0'))
{
print = ft_concat_free(ft_strdup(" "), print);
*size += 1;
}
else
print[i] = ' ';
if (ft_strchr(s, '-') && print[*size - 1] == ' ')
{
print[*size] = '\0';
*size -= 1;
}
return (print);
}