From b32f8680f0ebe6438c486505cce9f7a3363351f9 Mon Sep 17 00:00:00 2001 From: whaffman Date: Mon, 28 Oct 2024 17:35:09 +0100 Subject: [PATCH] paco fail --- Makefile | 16 +++---- ft_printf.h | 32 ++++++++++++++ inc/libft.h | 2 +- libft.h | 78 +++++++++++++++++++++++++++++++++++ src/ft_printf/print_pointer.c | 2 +- 5 files changed, 120 insertions(+), 10 deletions(-) create mode 100644 ft_printf.h create mode 100644 libft.h diff --git a/Makefile b/Makefile index 22e0553..92b678c 100644 --- a/Makefile +++ b/Makefile @@ -12,9 +12,9 @@ NAME = libftprintf.a -INC_DIR = inc/ +INC_DIR = inc -OBJ_DIR = obj/ +OBJ_DIR = obj CC = cc @@ -48,19 +48,19 @@ SRC_FT_PRINTF = ft_isbase.c ft_putnbr_base.c ft_write_str.c parse_placeholder.c SOURCES = $(SRC_CONVERSION) $(SRC_MEMORY) $(SRC_STRING) \ $(SRC_LIST) $(SRC_OUTPUT) $(SRC_FT_PRINTF) -OBJECTS = $(addprefix $(OBJ_DIR), $(SOURCES:.c=.o)) +OBJECTS = $(addprefix $(OBJ_DIR)/, $(SOURCES:.c=.o)) all: $(NAME) $(NAME): $(OBJECTS) - $(AR) rcs $@ $? + $(AR) rcs $@ $^ -$(OBJ_DIR)/%.o: %.c - mkdir -o $(OBJ_DIR) +$(OBJ_DIR): + mkdir -p $@ + +$(OBJ_DIR)/%.o: %.c | $(OBJ_DIR) $(CC) $(CFLAGS) -I $(INC_DIR) -c $< -o $@ -bonus: $(NAME) - clean: rm -f $(OBJECTS) diff --git a/ft_printf.h b/ft_printf.h new file mode 100644 index 0000000..a7c7171 --- /dev/null +++ b/ft_printf.h @@ -0,0 +1,32 @@ +/* ************************************************************************** */ +/* */ +/* ::: o_ :::::: ::: */ +/* ft_printf.h :+: / :+::+: :+: */ +/* +:+ > +:++:+ +:+ */ +/* By: whaffman +#+ +:+ +#++#++:++#++ */ +/* +#+ +#+#+ +#++#+ +#+ \o/ */ +/* Created: 2024/10/15 13:04:31 by whaffman #+#+# #+#+# #+# #+# | */ +/* Updated: 2024/10/15 13:07:34 by whaffman ### ### ### ### / \ */ +/* */ +/* ************************************************************************** */ + +#ifndef FT_PRINTF_H +# define FT_PRINTF_H + +# include + +int ft_isbase(char *str); +void ft_write_str(char c, char *str); +void ft_putnbr_base(unsigned long nbr, char *base, char *result); +void ft_putnbr_signed(long nbr, char *base, char *result); +int print_char(va_list args); +int print_string(va_list args); +int print_number(va_list args); +int print_unumber(va_list args); +int print_hex(va_list args, int uppercase); +int print_pointer(va_list args); +int parse_conversion(const char **format, va_list args); +int parse_placeholder(const char **format, va_list args); + +int ft_printf(const char *format, ...); +#endif diff --git a/inc/libft.h b/inc/libft.h index 24dacfa..bd30d78 100644 --- a/inc/libft.h +++ b/inc/libft.h @@ -73,6 +73,6 @@ t_list *ft_lstmap(t_list *lst, void *(*f)(void *), void (*del)(void *)); * Printf */ -int ft_printf(const char *format, ...); +int ft_printf(const char *format, ...); #endif diff --git a/libft.h b/libft.h new file mode 100644 index 0000000..e8c99db --- /dev/null +++ b/libft.h @@ -0,0 +1,78 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* libft.h :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: whaffman +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2024/07/06 11:15:10 by whaffman #+# #+# */ +/* Updated: 2024/07/10 16:27:58 by whaffman ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#ifndef LIBFT_H +# define LIBFT_H +# include + +typedef struct s_list +{ + void *content; + struct s_list *next; +} t_list; + +int ft_isalpha(int c); +int ft_isdigit(int c); +int ft_isalnum(int c); +int ft_isascii(int c); +int ft_isprint(int c); +size_t ft_strlen(const char *s); +void *ft_memset(void *s, int c, size_t n); +void ft_bzero(void *s, size_t n); +void *ft_memcpy(void *dest, const void *src, size_t n); +void *ft_memmove(void *dest, const void *src, size_t n); +size_t ft_strlcpy(char *dst, const char *src, size_t size); +size_t ft_strlcat(char *dst, const char *src, size_t size); +int ft_toupper(int c); +int ft_tolower(int c); +char *ft_strchr(const char *s, int c); +char *ft_strrchr(const char *s, int c); +int ft_strncmp(const char *s1, const char *s2, size_t n); +void *ft_memchr(const void *s, int c, size_t n); +int ft_memcmp(const void *s1, const void *s2, size_t n); +char *ft_strnstr(const char *big, const char *little, size_t len); +int ft_atoi(const char *nptr); +void *ft_calloc(size_t nmemb, size_t size); +char *ft_strdup(const char *s); +char *ft_substr(char const *s, unsigned int start, size_t len); +char *ft_strjoin(char const *s1, char const *s2); +char *ft_strtrim(char const *s1, char const *set); +char **ft_split(char const *s, char c); +char *ft_itoa(int n); +char *ft_strmapi(char const *s, char (*f)(unsigned int, char)); +void ft_striteri(char *s, void (*f)(unsigned int, char*)); +void ft_putchar_fd(char c, int fd); +void ft_putstr_fd(char *s, int fd); +void ft_putendl_fd(char *s, int fd); +void ft_putnbr_fd(int n, int fd); + +/* + * Lists + */ + +t_list *ft_lstnew(void *content); +void ft_lstadd_front(t_list **lst, t_list *new); +int ft_lstsize(t_list *lst); +t_list *ft_lstlast(t_list *lst); +void ft_lstadd_back(t_list **lst, t_list *new); +void ft_lstdelone(t_list *lst, void (*del)(void *)); +void ft_lstclear(t_list **lst, void (*del)(void *)); +void ft_lstiter(t_list *lst, void (*f)(void *)); +t_list *ft_lstmap(t_list *lst, void *(*f)(void *), void (*del)(void *)); + +/* + * Printf +*/ + + + +#endif diff --git a/src/ft_printf/print_pointer.c b/src/ft_printf/print_pointer.c index d7875c3..6067925 100644 --- a/src/ft_printf/print_pointer.c +++ b/src/ft_printf/print_pointer.c @@ -13,7 +13,7 @@ #include #include #include -#include "../libft/libft.h" +#include "libft.h" #include "ft_printf.h" int print_pointer(va_list args)