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

gere le cas du char null, mais pas son retour ni son affichage

Browse Source
This commit is contained in:
Hugo LAMY
2020-02-28 18:58:13 +01:00
parent fd6a2696a6
commit 73631636ff
6 changed files with 51 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ft_printf.c
View File

@@ -1,14 +1,3 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* ft_printf.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: hulamy <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2020/02/27 12:01:26 by hulamy #+# #+# */
/* Updated: 2020/02/27 12:01:30 by hulamy ### ########.fr */
/* */
/* ************************************************************************** */
#include "ft_printf.h" #include "ft_printf.h"

78
main.c
View File

@@ -158,40 +158,41 @@ int main(int ac, char **av)
{ {
printf("USAGE:\n"); printf("USAGE:\n");
printf("call ./ft_printf with arguments to launch tests :\n"); printf("call ./ft_printf with arguments to launch tests :\n");
printf("./ft_printf 'man' \n"); printf("./ft_printf 'man' \n");
printf("........... 'test' \n"); printf("........... 'test' \n");
printf("........... 'all' \n"); printf("........... 'special' \n");
printf("........... ... 'noflag' \n"); printf("........... 'all' \n");
printf("........... ... '0' \n"); printf("........... ... 'noflag' \n");
printf("........... ... '-' \n"); printf("........... ... '0' \n");
printf("........... ... 'width' \n"); printf("........... ... '-' \n");
printf("........... ... 'precision' \n"); printf("........... ... 'width' \n");
printf("........... ... '*' \n"); printf("........... ... 'precision' \n");
printf("........... ... 'd' \n"); printf("........... ... '*' \n");
printf("........... ... 'i' \n"); printf("........... ... 'd' \n");
printf("........... ... 'u' \n"); printf("........... ... 'i' \n");
printf("........... ... 'x' \n"); printf("........... ... 'u' \n");
printf("........... ... 'X' \n"); printf("........... ... 'x' \n");
printf("........... ... 'c' \n"); printf("........... ... 'X' \n");
printf("........... ... 's' \n"); printf("........... ... 'c' \n");
printf("........... ... 'p' \n"); printf("........... ... 's' \n");
printf("........... ... '%%' \n"); printf("........... ... 'p' \n");
printf("........... ... 'repetition'\n"); printf("........... ... '%%' \n");
printf("........... 'bonus' \n"); printf("........... ... 'repetition'\n");
printf("........... ..... '#' \n"); printf("........... 'bonus' \n");
printf("........... ..... ''' \n"); printf("........... ..... '#' \n");
printf("........... ..... ' ' \n"); printf("........... ..... ''' \n");
printf("........... ..... '+' \n"); printf("........... ..... ' ' \n");
printf("........... ..... 'e' \n"); printf("........... ..... '+' \n");
printf("........... ..... 'f' \n"); printf("........... ..... 'e' \n");
printf("........... ..... 'g' \n"); printf("........... ..... 'f' \n");
printf("........... ..... 'n' \n"); printf("........... ..... 'g' \n");
printf("........... ..... 'h' \n"); printf("........... ..... 'n' \n");
printf("........... ..... 'hh' \n"); printf("........... ..... 'h' \n");
printf("........... ..... 'l' \n"); printf("........... ..... 'hh' \n");
printf("........... ..... 'll' \n"); printf("........... ..... 'l' \n");
printf("........... ..... 'repetition'\n"); printf("........... ..... 'll' \n");
printf("........... 'error' \n"); printf("........... ..... 'repetition'\n");
printf("........... 'error' \n");
} }
if (ac == 2 && !strcmp(av[1], "man")) if (ac == 2 && !strcmp(av[1], "man"))
@@ -275,7 +276,12 @@ int main(int ac, char **av)
if (ac == 2 && !strcmp(av[1], "special")) if (ac == 2 && !strcmp(av[1], "special"))
{ {
PRINT("\\!/%16c\\!/", (char)0) PRINT("%16c", (char)0)
PRINT("%-16c", (char)0)
PRINT("%16c", 'a')
PRINT("%-16c", 'a')
PRINT("%16c", (char)7)
PRINT("!%37c!", (char)0)
} }
/* ////////////////////////////////////////////////////////////////// */ /* ////////////////////////////////////////////////////////////////// */
@@ -356,6 +362,8 @@ int main(int ac, char **av)
PRINT("%0i", 0); PRINT("%0i", 0);
PRINT("%6i", -456); PRINT("%6i", -456);
PRINT("%6%"); PRINT("%6%");
PRINT("%16c", 'a');
PRINT("%16c", (char)97);
} }
if (ac == 2 || !strcmp(av[2], "precision")) if (ac == 2 || !strcmp(av[2], "precision"))

BIN
outf.txt Normal file
View File

Binary file not shown.

1
outft.txt Normal file
View File

@@ -0,0 +1 @@
! !

11
srcs/ft_convert.c
View File

@@ -1,14 +1,3 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* ft_convert.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: hulamy <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2020/02/27 12:03:28 by hulamy #+# #+# */
/* Updated: 2020/02/27 17:34:06 by hulamy ### ########.fr */
/* */
/* ************************************************************************** */
#include "ft_printf.h" #include "ft_printf.h"

20
srcs/ft_flag_transform.c
View File

@@ -1,14 +1,3 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* ft_flag_transform.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: hulamy <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2020/02/27 11:55:43 by hulamy #+# #+# */
/* Updated: 2020/02/27 18:17:34 by hulamy ### ########.fr */
/* */
/* ************************************************************************** */
#include "ft_printf.h" #include "ft_printf.h"
@@ -112,7 +101,7 @@ char *width_flags(char *print, char *tmp, char *s, int width)
j = 0; j = 0;
if (ft_strchr(s, '-')) if (ft_strchr(s, '-'))
{ {
while (print[j]) while (print[j] != '\0')
tmp[i++] = print[j++]; tmp[i++] = print[j++];
while (i < width) while (i < width)
tmp[i++] = ' '; tmp[i++] = ' ';
@@ -122,7 +111,7 @@ char *width_flags(char *print, char *tmp, char *s, int width)
c = (ft_strchr(s, '0')) ? '0' : ' '; c = (ft_strchr(s, '0')) ? '0' : ' ';
while (i < (width - ft_strlen(print))) while (i < (width - ft_strlen(print)))
tmp[i++] = c; tmp[i++] = c;
while (print[j]) while (print[j] != '\0')
tmp[i++] = print[j++]; tmp[i++] = print[j++];
} }
free(print); free(print);
@@ -132,6 +121,7 @@ char *width_flags(char *print, char *tmp, char *s, int width)
/* /*
** -if there is a minimal width field, calculate it and add it to print ** -if there is a minimal width field, calculate it and add it to print
** according to the flags '-' and '0' if present ** according to the flags '-' and '0' if present
** -if print[0] value 0
*/ */
char *ft_width(char *s, char *print) char *ft_width(char *s, char *print)
@@ -142,8 +132,12 @@ char *ft_width(char *s, char *print)
tmp = s; tmp = s;
while (*tmp != '\0' && ft_strchr("%#- +'0.", *tmp)) while (*tmp != '\0' && ft_strchr("%#- +'0.", *tmp))
tmp++; tmp++;
if (*tmp == '\0')
return (print);
width = ft_atoi(tmp); width = ft_atoi(tmp);
tmp[0] = '\0'; tmp[0] = '\0';
if (print[0] == '\0')
width--;
if (width > ft_strlen(print)) if (width > ft_strlen(print))
{ {
if (!(tmp = (char *)malloc(sizeof(char) * (width + 1)))) if (!(tmp = (char *)malloc(sizeof(char) * (width + 1))))