diff --git a/libftprintf/ft_eoflags.c b/libftprintf/ft_eoflags.c index 265d8ca..e2a0625 100644 --- a/libftprintf/ft_eoflags.c +++ b/libftprintf/ft_eoflags.c @@ -10,7 +10,7 @@ /* */ /* ************************************************************************** */ -#include "libftprintf.h" +#include "ft_printf.h" int ft_eoflags(const char *s) { diff --git a/libftprintf/ft_ltoa_base.c b/libftprintf/ft_ltoa_base.c index d3edc69..8e5e68b 100644 --- a/libftprintf/ft_ltoa_base.c +++ b/libftprintf/ft_ltoa_base.c @@ -10,7 +10,7 @@ /* */ /* ************************************************************************** */ -#include "libftprintf.h" +#include "ft_printf.h" static long ft_ltoa_base_len(long n, long nbase); diff --git a/libftprintf/ft_printf.c b/libftprintf/ft_printf.c index 8c39a9b..62386a8 100644 --- a/libftprintf/ft_printf.c +++ b/libftprintf/ft_printf.c @@ -10,7 +10,7 @@ /* */ /* ************************************************************************** */ -#include "libftprintf.h" +#include "ft_printf.h" int ft_printf(const char *format, ...) { diff --git a/libftprintf/libftprintf.h b/libftprintf/ft_printf.h similarity index 100% rename from libftprintf/libftprintf.h rename to libftprintf/ft_printf.h diff --git a/libftprintf/ft_putchar.c b/libftprintf/ft_putchar.c index dae1f8f..d6ab000 100644 --- a/libftprintf/ft_putchar.c +++ b/libftprintf/ft_putchar.c @@ -10,7 +10,7 @@ /* */ /* ************************************************************************** */ -#include "libftprintf.h" +#include "ft_printf.h" int ft_putchar(int c) { diff --git a/libftprintf/ft_puts.c b/libftprintf/ft_puts.c index 7958936..b72314d 100644 --- a/libftprintf/ft_puts.c +++ b/libftprintf/ft_puts.c @@ -10,7 +10,7 @@ /* */ /* ************************************************************************** */ -#include "libftprintf.h" +#include "ft_printf.h" int ft_puts(const char *s) { diff --git a/libftprintf/ft_strrev.c b/libftprintf/ft_strrev.c index 359e66b..33b6c48 100644 --- a/libftprintf/ft_strrev.c +++ b/libftprintf/ft_strrev.c @@ -10,7 +10,7 @@ /* */ /* ************************************************************************** */ -#include "libftprintf.h" +#include "ft_printf.h" char *ft_strrev(char *s) { diff --git a/libftprintf/ft_va_char.c b/libftprintf/ft_va_char.c index ce26e44..bed958c 100644 --- a/libftprintf/ft_va_char.c +++ b/libftprintf/ft_va_char.c @@ -10,7 +10,7 @@ /* */ /* ************************************************************************** */ -#include "libftprintf.h" +#include "ft_printf.h" int ft_va_char(const char *format, va_list ap) { diff --git a/libftprintf/ft_va_decimal.c b/libftprintf/ft_va_decimal.c index 880619d..ad1a794 100644 --- a/libftprintf/ft_va_decimal.c +++ b/libftprintf/ft_va_decimal.c @@ -10,7 +10,7 @@ /* */ /* ************************************************************************** */ -#include "libftprintf.h" +#include "ft_printf.h" int ft_va_decimal(const char *format, va_list ap) { diff --git a/libftprintf/ft_va_decimal_bonus.c b/libftprintf/ft_va_decimal_bonus.c index 24c9ad3..2937b01 100644 --- a/libftprintf/ft_va_decimal_bonus.c +++ b/libftprintf/ft_va_decimal_bonus.c @@ -10,7 +10,7 @@ /* */ /* ************************************************************************** */ -#include "libftprintf.h" +#include "ft_printf.h" int ft_va_decimal_bonus(const char *format, va_list ap, char *s) { diff --git a/libftprintf/ft_va_escape.c b/libftprintf/ft_va_escape.c index d46b667..a71e930 100644 --- a/libftprintf/ft_va_escape.c +++ b/libftprintf/ft_va_escape.c @@ -10,7 +10,7 @@ /* */ /* ************************************************************************** */ -#include "libftprintf.h" +#include "ft_printf.h" static char ft_unescape_char(const char c); static size_t ft_unescape_len(const char *str); diff --git a/libftprintf/ft_va_flags_bonus.c b/libftprintf/ft_va_flags_bonus.c index 961e35e..727b0c0 100644 --- a/libftprintf/ft_va_flags_bonus.c +++ b/libftprintf/ft_va_flags_bonus.c @@ -10,7 +10,7 @@ /* */ /* ************************************************************************** */ -#include "libftprintf.h" +#include "ft_printf.h" int ft_va_flags_bonus(const char *format, va_list ap) { diff --git a/libftprintf/ft_va_hexadecimal.c b/libftprintf/ft_va_hexadecimal.c index f84c6c3..7b4dd9b 100644 --- a/libftprintf/ft_va_hexadecimal.c +++ b/libftprintf/ft_va_hexadecimal.c @@ -10,7 +10,7 @@ /* */ /* ************************************************************************** */ -#include "libftprintf.h" +#include "ft_printf.h" int ft_va_hexadecimal(const char *format, va_list ap) { diff --git a/libftprintf/ft_va_hexadecimal_bonus.c b/libftprintf/ft_va_hexadecimal_bonus.c index effba5b..92919aa 100644 --- a/libftprintf/ft_va_hexadecimal_bonus.c +++ b/libftprintf/ft_va_hexadecimal_bonus.c @@ -10,7 +10,7 @@ /* */ /* ************************************************************************** */ -#include "libftprintf.h" +#include "ft_printf.h" int ft_va_hexadecimal_bonus(const char *format, va_list ap, char *s) { diff --git a/libftprintf/ft_va_other.c b/libftprintf/ft_va_other.c index f67b5db..dce2960 100644 --- a/libftprintf/ft_va_other.c +++ b/libftprintf/ft_va_other.c @@ -10,7 +10,7 @@ /* */ /* ************************************************************************** */ -#include "libftprintf.h" +#include "ft_printf.h" int ft_va_other(const char *format, va_list ap) { diff --git a/libftprintf/ft_va_percent.c b/libftprintf/ft_va_percent.c index 7955b9d..3e2ada7 100644 --- a/libftprintf/ft_va_percent.c +++ b/libftprintf/ft_va_percent.c @@ -10,7 +10,7 @@ /* */ /* ************************************************************************** */ -#include "libftprintf.h" +#include "ft_printf.h" int ft_va_percent(const char *format, va_list ap) { diff --git a/libftprintf/ft_va_pointer.c b/libftprintf/ft_va_pointer.c index 35526b0..a5b345f 100644 --- a/libftprintf/ft_va_pointer.c +++ b/libftprintf/ft_va_pointer.c @@ -10,7 +10,7 @@ /* */ /* ************************************************************************** */ -#include "libftprintf.h" +#include "ft_printf.h" int ft_va_pointer(const char *format, va_list ap) { diff --git a/libftprintf/ft_va_precision_bonus.c b/libftprintf/ft_va_precision_bonus.c index 635d9e0..2587fbd 100644 --- a/libftprintf/ft_va_precision_bonus.c +++ b/libftprintf/ft_va_precision_bonus.c @@ -10,7 +10,7 @@ /* */ /* ************************************************************************** */ -#include "libftprintf.h" +#include "ft_printf.h" int ft_va_precision_bonus(const char *format, va_list ap) { diff --git a/libftprintf/ft_va_string.c b/libftprintf/ft_va_string.c index 26b8bc1..632ebd6 100644 --- a/libftprintf/ft_va_string.c +++ b/libftprintf/ft_va_string.c @@ -10,7 +10,7 @@ /* */ /* ************************************************************************** */ -#include "libftprintf.h" +#include "ft_printf.h" int ft_va_string(const char *format, va_list ap) { diff --git a/libftprintf/ft_va_string_bonus.c b/libftprintf/ft_va_string_bonus.c index 2b6ef79..b2e220c 100644 --- a/libftprintf/ft_va_string_bonus.c +++ b/libftprintf/ft_va_string_bonus.c @@ -10,7 +10,7 @@ /* */ /* ************************************************************************** */ -#include "libftprintf.h" +#include "ft_printf.h" int ft_va_string_bonus(const char *format, va_list ap, char *s) { diff --git a/libftprintf/ft_vprintf.c b/libftprintf/ft_vprintf.c index f09538c..69da13a 100644 --- a/libftprintf/ft_vprintf.c +++ b/libftprintf/ft_vprintf.c @@ -10,7 +10,7 @@ /* */ /* ************************************************************************** */ -#include "libftprintf.h" +#include "ft_printf.h" int ft_vprintf(char const *format, va_list ap) { diff --git a/main.c b/main.c index 826092f..b510deb 100644 --- a/main.c +++ b/main.c @@ -6,7 +6,7 @@ /* By: gbaconni@student.42lausanne.ch +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/04/13 06:58:46 by gbaconni #+# #+# */ -/* Updated: 2022/04/29 15:14:41 by gbaconni ### ########.fr */ +/* Updated: 2022/04/29 17:50:00 by gbaconni ### ########.fr */ /* */ /* ************************************************************************** */ @@ -15,7 +15,7 @@ #include // isdigit #include // assert -#include "libftprintf/libftprintf.h" +#include "libftprintf/ft_printf.h" int ft_skipchars(const char *s, char *chars) { diff --git a/tests/.gitignore b/tests/.gitignore index ae20be9..8f0b573 100644 --- a/tests/.gitignore +++ b/tests/.gitignore @@ -1 +1,3 @@ pft +printftester +libftprintf diff --git a/tests/Makefile b/tests/Makefile index 3fefd19..2e14b2e 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -6,7 +6,7 @@ # By: gbaconni@student.42lausanne.ch +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2022/04/16 20:12:38 by gbaconni #+# #+# # -# Updated: 2022/04/29 10:00:15 by gbaconni ### ########.fr # +# Updated: 2022/04/29 16:49:32 by gbaconni ### ########.fr # # # # **************************************************************************** # @@ -15,11 +15,14 @@ MACHINE = $(shell uname -m) all: test -libftprintf.a: libftprintf - @ln -snf ../libftprintf/libftprintf.a libftprintf.a +libftprintf.a: + @ln -snf ../libftprintf/libftprintf/libftprintf.a libftprintf.a libftprintf: - @make -C ../libftprintf bonus + @ln -snf ../libftprintf/libftprintf libftprintf + +bonus: + @make -C ../libftprintf/libftprintf bonus bonus: test-pft @@ -45,7 +48,16 @@ test-pft3: @cd pft && ./test x @cd pft && ./test X -pft: libftprintf.a +printftester: bonus libftprintf + @test -d ~/goinfre/ || ln -snf /goinfre/$(USER) ~/goinfre + @test -d ~/goinfre/docker/ || install -d ~/goinfre/docker + @test -d ~/goinfre/agent/ || install -d ~/goinfre/agent + @test -d ~/.docker/ || ln -snf ~/goinfre/docker ~/.docker + @test -d ~/Library/Containers || ln -snf ~/goinfre/agent ~/Library/Containers/com.docker.docker + @test -d printftester || git clone https://github.com/Tripouille/printfTester.git printftester + @grep -qF '../libftprintf' Makefile && sed -i '' 's/\(\.\.\)/\1\/libftprintf/' Makefile + +pft: bonus libftprintf.a @test -d pft || git clone https://github.com/gavinfielder/pft.git pft ifeq ($(KERNEL),Linux) @which php >/dev/null 2>&1 || sudo apt-get install -qq -y php-cli