From 91fafd04ca9ef5df428f186b6c4c18c90b8d1809 Mon Sep 17 00:00:00 2001 From: hugodu69 Date: Fri, 14 Feb 2020 12:49:14 +0100 Subject: [PATCH] pour l'instant la conversion ne marche pas du tout --- Makefile | 2 +- ft_printf | Bin 13880 -> 17920 bytes ft_printf.c | 20 ++++++++------------ ft_printf.h | 2 +- libft.c => libft | 0 5 files changed, 10 insertions(+), 14 deletions(-) rename libft.c => libft (100%) diff --git a/Makefile b/Makefile index 03779f0..e64c328 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,7 @@ IDIR = . _DEPS = ft_printf.h DEPS = $(_DEPS:%.h=$(IDIR)/%.h) -LDIR = ./libft.c/ +LDIR = ./libft/ _LIBS = libft.a LIBS = $(_LIBS:lib%.a=%) diff --git a/ft_printf b/ft_printf index b12185b390ed31a4f3f24b3e0e1e60d247ae3157..37f794ddd07f19e94bec98b221d64f8e38da9c86 100755 GIT binary patch delta 4879 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 D+;u>- diff --git a/ft_printf.c b/ft_printf.c index d1d1812..3753c1a 100644 --- a/ft_printf.c +++ b/ft_printf.c @@ -156,12 +156,6 @@ ll ll ll ll ll . . . . . . . [int *] [n] [long *] [ln] [long long *] [lln] - -faire un itoa qui fonctionne pour les long int -faire un uitoa qui fonctionne pour les unsigned long int -comme ca [d i c] et [ld li] sont traites pareil, et -[u x X p] et [lu lx lX s] aussi - */ char *ft_convert(va_list ap, char *type) @@ -170,10 +164,11 @@ char *ft_convert(va_list ap, char *type) if (ft_strchr(type, 'h') || ft_strchr(type, 'l')) return (NULL); - if (ft_strchr("diuxXcspefgn", type[0])) + if (ft_strchr("efgn", type[0])) + return (NULL); + if (ft_strchr("diuxXcsp", type[0])) print = ft_itoa((int)va_arg(ap, int)); - printf("%s\n", print); - return (NULL); + return (print); } int ft_printf(char *string, ...) @@ -196,6 +191,7 @@ int ft_printf(char *string, ...) if (!(ft_expand_star(va_arg(ap, int), &s))) return (-1); print = ft_convert(ap, type); + printf("= %s | %s\n",s,print); // print = ft_flag_transform(s, print); // length += ft_put_word(print); } @@ -324,10 +320,10 @@ int main(int ac, char **av) ft_printf("%i", -23); // ft_printf_test(str2, i1, i2, i3, i4, i5, i6); } - if (ac == 2) + if (ac > 1) { - printf("[%s]\n", av[1]); - ft_printf(av[1]); + printf("\"%s\",%s,%s,%s\n", av[1], av[2], av[3], av[4]); + ft_printf(av[1],av[2],av[3],av[4]); } return (0); } diff --git a/ft_printf.h b/ft_printf.h index 77c0add..cb769cd 100644 --- a/ft_printf.h +++ b/ft_printf.h @@ -3,7 +3,7 @@ # include # include # include -# include "libft.c/libft.h" +# include "libft/libft.h" # include diff --git a/libft.c b/libft similarity index 100% rename from libft.c rename to libft