baco/ft_printf
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add pointer support and improve debug and valgrind in Makefile

Browse Source
This commit is contained in:
gbaconni
2022-04-15 17:20:15 +02:00
parent af87168372
commit 175a774e49
6 changed files with 82 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
Makefile
View File

@@ -6,7 +6,7 @@
# By: gbaconni@student.42lausanne.ch +#+ +:+ +#+ # # By: gbaconni@student.42lausanne.ch +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ # # +#+#+#+#+#+ +#+ #
# Created: 2022/01/18 15:11:16 by gbaconni #+# #+# # # Created: 2022/01/18 15:11:16 by gbaconni #+# #+# #
# Updated: 2022/04/15 00:23:05 by gbaconni ### lausanne.ch # # Updated: 2022/04/15 17:19:14 by gbaconni ### lausanne.ch #
# # # #
# **************************************************************************** # # **************************************************************************** #
# #
@@ -31,23 +31,25 @@ HDR = $(LIBFTPRINTF)/libftprintf.h
CC = gcc CC = gcc
CFLAGS = -Wall -Wextra -Werror CFLAGS = -Wall -Wextra -Werror
ifeq ($(FAST), 1) ifeq ($(FAST), 1)
CFLAGS += -v -pipe -O3 -ffast-math -fomit-frame-pointer -funroll-loops CFLAGS += -pipe -O3 -ffast-math -fomit-frame-pointer -funroll-loops
#CFLAGS += -v -pipe -Ofast -ffast-math -funroll-loops -fomit-frame-pointer #CFLAGS += -pipe -Ofast -ffast-math -funroll-loops -fomit-frame-pointer
endif endif
ifeq ($(DEBUG), 1) ifeq ($(DEBUG), 1)
CFLAGS += -g -O1 -fsanitize=address -fsanitize=undefined -fsanitize=signed-integer-overflow CFLAGS += -g -O0 -fsanitize=address -fsanitize=undefined -fsanitize=signed-integer-overflow
#CFLAGS += -v -g -O1 -fsanitize=address -fsanitize=undefined -fsanitize=signed-integer-overflow endif
ifeq ($(LEAK), 1)
CFLAGS += -g -O0
endif
VALGRIND = valgrind
VALGRINDFLAGS = --quiet --leak-check=full --show-leak-kinds=all
ifeq ($(LEAK), 1)
PREFIX += $(VALGRIND) $(VALGRINDFLAGS)
endif endif
RM = rm RM = rm
RMFLAGS = -f RMFLAGS = -f
VALGRIND = valgrind
VALGRINDFLAGS = --quiet --leak-check=full --show-leak-kinds=all
ifeq ($(DEBUG), 1)
PREFIX += $(VALGRIND) $(VALGRINDFLAGS)
endif
NORMINETTE = norminette NORMINETTE = norminette
NORMINETTEFLAGS = -o NORMINETTEFLAGS = -o
@@ -66,17 +68,19 @@ fclean: clean
@$(MAKE) -C $(LIBFTPRINTF) fclean @$(MAKE) -C $(LIBFTPRINTF) fclean
re: fclean all re: fclean all
@$(MAKE) -C $(LIBFTPRINTF) re
check: check:
@$(MAKE) -C $(LIBFTPRINTF) check @$(MAKE) -C $(LIBFTPRINTF) check
leak:
@$(MAKE) -C $(LIBFTPRINTF) re LEAK=1
debug: debug:
@$(MAKE) -C $(LIBFTPRINTF) re DEBUG=1 @$(MAKE) -C $(LIBFTPRINTF) re DEBUG=1
@$(MAKE) re DEBUG=1
fast: fast:
@$(MAKE) -C $(LIBFTPRINTF) re FAST=1 @$(MAKE) -C $(LIBFTPRINTF) re FAST=1
@$(MAKE) re FAST=1
test: clean $(NAME) test: clean $(NAME)
@$(PREFIX) ./$(NAME) "%c" C || true @$(PREFIX) ./$(NAME) "%c" C || true
@@ -86,11 +90,15 @@ test: clean $(NAME)
@$(PREFIX) ./$(NAME) "%X" 42 || true @$(PREFIX) ./$(NAME) "%X" 42 || true
@$(PREFIX) ./$(NAME) "42" "" || true @$(PREFIX) ./$(NAME) "42" "" || true
@$(PREFIX) ./$(NAME) "%%" "" || true @$(PREFIX) ./$(NAME) "%%" "" || true
@$(PREFIX) ./$(NAME) "%p" "" || true
test2: debug test2: leak
@$(MAKE) test LEAK=1
test3: debug
@$(MAKE) test DEBUG=1 @$(MAKE) test DEBUG=1
test3: fast test4: fast
@$(MAKE) test FAST=1 @$(MAKE) test FAST=1
update: config online pull update: config online pull

21
libftprintf/Makefile
View File

@@ -6,7 +6,7 @@
# By: gbaconni@student.42lausanne.ch +#+ +:+ +#+ # # By: gbaconni@student.42lausanne.ch +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ # # +#+#+#+#+#+ +#+ #
# Created: 2022/01/18 15:11:16 by gbaconni #+# #+# # # Created: 2022/01/18 15:11:16 by gbaconni #+# #+# #
# Updated: 2022/04/14 23:54:03 by gbaconni ### lausanne.ch # # Updated: 2022/04/15 17:19:30 by gbaconni ### lausanne.ch #
# # # #
# **************************************************************************** # # **************************************************************************** #
# #
@@ -52,12 +52,20 @@ HDR = libftprintf.h
CC = gcc CC = gcc
CFLAGS = -Wall -Wextra -Werror CFLAGS = -Wall -Wextra -Werror
ifeq ($(FAST), 1) ifeq ($(FAST), 1)
CFLAGS += -v -pipe -O3 -ffast-math -fomit-frame-pointer -funroll-loops CFLAGS += -pipe -O3 -ffast-math -fomit-frame-pointer -funroll-loops
#CFLAGS += -v -pipe -Ofast -ffast-math -funroll-loops -fomit-frame-pointer #CFLAGS += -pipe -Ofast -ffast-math -funroll-loops -fomit-frame-pointer
endif endif
ifeq ($(DEBUG), 1) ifeq ($(DEBUG), 1)
CFLAGS += -g -O1 -fsanitize=address -fsanitize=undefined -fsanitize=signed-integer-overflow CFLAGS += -g -O0 -fsanitize=address -fsanitize=undefined -fsanitize=signed-integer-overflow
#CFLAGS += -v -g -O1 -fsanitize=address -fsanitize=undefined -fsanitize=signed-integer-overflow endif
ifeq ($(LEAK), 1)
CFLAGS += -g -O0
endif
VALGRIND = valgrind
VALGRINDFLAGS = --quiet --leak-check=full --show-leak-kinds=all
ifeq ($(LEAK), 1)
PREFIX += $(VALGRIND) $(VALGRINDFLAGS)
endif endif
AR = ar AR = ar
@@ -102,6 +110,9 @@ so: $(OBJ) $(OBJ_BONUS)
check: check:
@$(NORMINETTE) $(NORMINETTEFLAGS) $(HDR) $(SRC) ${SRC_BONUS} 2>&1 | grep -v '\.[ch]: OK!' || true @$(NORMINETTE) $(NORMINETTEFLAGS) $(HDR) $(SRC) ${SRC_BONUS} 2>&1 | grep -v '\.[ch]: OK!' || true
leak:
@$(MAKE) re LEAK=1
debug: debug:
@$(MAKE) re DEBUG=1 @$(MAKE) re DEBUG=1

4
libftprintf/ft_vprintf.c
View File

@@ -6,7 +6,7 @@
/* By: gbaconni@student.42lausanne.ch +#+ +:+ +#+ */ /* By: gbaconni@student.42lausanne.ch +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2022/01/20 11:43:52 by gbaconni #+# #+# */ /* Created: 2022/01/20 11:43:52 by gbaconni #+# #+# */
/* Updated: 2022/04/15 00:25:52 by gbaconni ### lausanne.ch */ /* Updated: 2022/04/15 16:37:06 by gbaconni ### lausanne.ch */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -21,7 +21,7 @@ int ft_vprintf(char const *format, va_list ap)
{ {
if (*format == '%') if (*format == '%')
{ {
if (*format++ == '%') if (*++format == '%')
ret += ft_vprintf_percent(format, ap); ret += ft_vprintf_percent(format, ap);
else if (*format == 'c') else if (*format == 'c')
ret += ft_vprintf_char(format, ap); ret += ft_vprintf_char(format, ap);

24
libftprintf/ft_vprintf_pointer.c
View File

@@ -6,7 +6,7 @@
/* By: gbaconni@student.42lausanne.ch +#+ +:+ +#+ */ /* By: gbaconni@student.42lausanne.ch +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2022/01/20 11:56:16 by gbaconni #+# #+# */ /* Created: 2022/01/20 11:56:16 by gbaconni #+# #+# */
/* Updated: 2022/04/13 08:00:14 by gbaconni ### lausanne.ch */ /* Updated: 2022/04/15 17:12:36 by gbaconni ### lausanne.ch */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -14,7 +14,25 @@
int ft_vprintf_pointer(const char *format, va_list ap) int ft_vprintf_pointer(const char *format, va_list ap)
{ {
(void) ap; int ret;
int len;
void *p;
char *s;
(void) format; (void) format;
return (0); ret = 0;
len = 0;
p = va_arg(ap, void *);
if (p == NULL)
{
len = ft_strlen(NIL);
write(1, NIL, len);
return (len);
}
s = ft_itoa_base((unsigned long) p, "0123456789ABCDEF");
len = ft_strlen(s);
write(1, s, len);
ret += len;
free(s);
return (ret);
} }

8
libftprintf/libftprintf.h
View File

@@ -6,7 +6,7 @@
/* By: gbaconni@student.42lausanne.ch +#+ +:+ +#+ */ /* By: gbaconni@student.42lausanne.ch +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2022/01/18 15:26:06 by gbaconni #+# #+# */ /* Created: 2022/01/18 15:26:06 by gbaconni #+# #+# */
/* Updated: 2022/04/14 23:56:24 by gbaconni ### lausanne.ch */ /* Updated: 2022/04/15 16:50:38 by gbaconni ### lausanne.ch */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -17,6 +17,12 @@
# include <stdarg.h> # include <stdarg.h>
# include <unistd.h> # include <unistd.h>
# if defined (__APPLE__)
# define NIL "0x0"
# else
# define NIL "(nil)"
# endif
/* Helper */ /* Helper */
char *ft_itoa_base(int n, char *base); char *ft_itoa_base(int n, char *base);

14
main.c
View File

@@ -6,7 +6,7 @@
/* By: baco <baco@student.42.fr> +#+ +:+ +#+ */ /* By: baco <baco@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2022/04/13 06:58:46 by gbaconni #+# #+# */ /* Created: 2022/04/13 06:58:46 by gbaconni #+# #+# */
/* Updated: 2022/04/13 07:54:40 by gbaconni ### lausanne.ch */ /* Updated: 2022/04/15 17:19:36 by gbaconni ### lausanne.ch */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -75,10 +75,14 @@ int main(int argc, char *argv[])
int d; int d;
char c; char c;
char *s; char *s;
int x;
void *ptr;
d = 0; d = 0;
c = '\0'; c = '\0';
s = ""; s = "";
x = 42;
ptr = &x;
(void)s; (void)s;
if (argc > 1) if (argc > 1)
{ {
@@ -107,6 +111,14 @@ int main(int argc, char *argv[])
ret = ft_printf(format, s); ret = ft_printf(format, s);
printf(": %d = ft_printf(\"%s\", \"%s\")\n", ret, format, s); printf(": %d = ft_printf(\"%s\", \"%s\")\n", ret, format, s);
} }
else if (ft_strlen(argv[2]) == 0)
{
s = argv[2];
ret = printf(format, ptr);
printf(": %d = printf(\"%s\", \"%s\")\n", ret, format, s);
ret = ft_printf(format, ptr);
printf(": %d = ft_printf(\"%s\", \"%s\")\n", ret, format, s);
}
else else
{ {
printf("Error: invalid argument\n"); printf("Error: invalid argument\n");