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

Improve main by implementing fmtsplit to split format into chunks and pass function pointer to compare ft_printf with printf

Browse Source
This commit is contained in:
gbaconni
2022-04-24 00:40:01 +02:00
parent 505f5d9912
commit d4fb946428
11 changed files with 236 additions and 271 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libftprintf/Makefile
View File

@@ -6,7 +6,7 @@
# By: gbaconni@student.42lausanne.ch +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ #
# Created: 2022/01/18 15:11:16 by gbaconni #+# #+# #
# Updated: 2022/04/18 00:28:09 by gbaconni ### lausanne.ch #
# Updated: 2022/04/23 23:52:03 by gbaconni ### lausanne.ch #
# #
# **************************************************************************** #
#
@@ -30,6 +30,7 @@ SRC = \
$(LIBFT)/ft_calloc.c \
$(LIBFT)/ft_strlen.c \
$(LIBFT)/ft_itoa.c \
ft_skipchars.c \
ft_strrev.c \
ft_ltoa_base.c \
ft_putchar.c \

2
libftprintf/ft_printf.c
View File

@@ -6,7 +6,7 @@
/* By: gbaconni@student.42lausanne.ch +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2022/01/18 16:17:58 by gbaconni #+# #+# */
/* Updated: 2022/04/16 03:07:52 by gbaconni ### lausanne.ch */
/* Updated: 2022/04/24 00:23:02 by gbaconni ### lausanne.ch */
/* */
/* ************************************************************************** */

3
libftprintf/ft_putchar.c
View File

@@ -6,7 +6,7 @@
/* By: gbaconni@student.42lausanne.ch +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2022/04/16 00:05:56 by gbaconni #+# #+# */
/* Updated: 2022/04/16 00:27:53 by gbaconni ### lausanne.ch */
/* Updated: 2022/04/24 00:08:55 by gbaconni ### lausanne.ch */
/* */
/* ************************************************************************** */
@@ -16,7 +16,6 @@ int ft_putchar(int c)
{
int ret;
ret = 0;
ret = write(1, &c, 1);
return (ret);
}

35
libftprintf/ft_skipchars.c Normal file
View File

@@ -0,0 +1,35 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* ft_skipchars.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: gbaconni@student.42lausanne.ch +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2022/04/23 23:49:26 by gbaconni #+# #+# */
/* Updated: 2022/04/24 00:00:43 by gbaconni ### lausanne.ch */
/* */
/* ************************************************************************** */
#include "libftprintf.h"
int ft_skipchars(const char *s, char *chars)
{
int ret;
int i;
int hits;
ret = 0;
while (*s != '\0')
{
i = 0;
hits = 0;
while (chars[i] != '\0')
hits += (chars[i++] == *s);
if (hits > 0)
ret++;
else
break ;
s++;
}
return (ret);
}

21
libftprintf/ft_vprintf.c
View File

@@ -6,7 +6,7 @@
/* By: gbaconni@student.42lausanne.ch +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2022/01/20 11:43:52 by gbaconni #+# #+# */
/* Updated: 2022/04/18 09:01:19 by gbaconni ### lausanne.ch */
/* Updated: 2022/04/24 00:36:07 by gbaconni ### lausanne.ch */
/* */
/* ************************************************************************** */
@@ -14,18 +14,21 @@
int ft_vprintf(char const *format, va_list ap)
{
int ret;
int ret;
const char *fmt;
ret = 0;
while (*format != 0)
fmt = format;
while (*fmt != 0)
{
if (*format == '%')
ret += ft_vprintf_percent(++format, ap);
else if (*format == '\\')
ret += ft_vprintf_escape(++format, ap);
if (*fmt == '%')
{
fmt++;
ret += ft_vprintf_percent(fmt, ap);
}
else
ret += ft_vprintf_other(format, ap);
format++;
ret += ft_vprintf_other(fmt, ap);
fmt++;
}
return (ret);
}

83
libftprintf/ft_vprintf_escape.c
View File

@@ -6,34 +6,79 @@
/* By: gbaconni@student.42lausanne.ch +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2022/04/17 22:35:03 by gbaconni #+# #+# */
/* Updated: 2022/04/17 23:08:35 by gbaconni ### lausanne.ch */
/* Updated: 2022/04/23 23:37:55 by gbaconni ### lausanne.ch */
/* */
/* ************************************************************************** */
#include "libftprintf.h"
static char ft_unescape_char(const char c);
static size_t ft_unescape_len(const char *str);
int ft_vprintf_escape(const char *format, va_list ap)
{
int ret;
(void) ap;
if (*format == '0')
ret = ft_putchar('\0');
if (*format == 'a')
ret = ft_putchar('\a');
else if (*format == 'b')
ret = ft_putchar('\b');
else if (*format == 't')
ret = ft_putchar('\t');
else if (*format == 'n')
ret = ft_putchar('\n');
else if (*format == 'v')
ret = ft_putchar('\v');
else if (*format == 'f')
ret = ft_putchar('\f');
else if (*format == 'r')
ret = ft_putchar('\r');
else if (*format == 'e')
ret = ft_putchar('\033');
ret = ft_putchar(ft_unescape_char(*format));
return (ret);
}
char *ft_unescape(const char *str)
{
char *s;
void *ptr;
s = (char *) ft_calloc(ft_unescape_len(str) + 1, sizeof(char));
if (s == NULL)
return (NULL);
ptr = s;
while (*str != '\0')
{
if (*str == '\\')
*s++ = ft_unescape_char(*++str);
else
*s++ = *str;
str++;
}
*s = '\0';
s = ptr;
return (s);
}
static char ft_unescape_char(const char c)
{
if (c == 'a')
return ('\a');
else if (c == 'b')
return ('\b');
else if (c == 't')
return ('\t');
else if (c == 'n')
return ('\n');
else if (c == 'v')
return ('\v');
else if (c == 'f')
return ('\f');
else if (c == 'r')
return ('\r');
else if (c == 'e')
return ('\033');
else
return (c);
}
static size_t ft_unescape_len(const char *str)
{
size_t len;
len = 0;
while (*str != '\0')
{
if (*str == '\\')
str++;
len++;
str++;
}
return (len);
}

8
libftprintf/ft_vprintf_other.c
View File

@@ -6,7 +6,7 @@
/* By: gbaconni@student.42lausanne.ch +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2022/01/20 12:58:03 by gbaconni #+# #+# */
/* Updated: 2022/04/17 22:39:45 by gbaconni ### lausanne.ch */
/* Updated: 2022/04/24 00:34:40 by gbaconni ### lausanne.ch */
/* */
/* ************************************************************************** */
@@ -14,9 +14,11 @@
int ft_vprintf_other(const char *format, va_list ap)
{
int ret;
int ret;
char c;
(void) ap;
ret = ft_putchar(*format);
c = *format;
ret = ft_putchar(c);
return (ret);
}

25
libftprintf/ft_vprintf_percent.c
View File

@@ -6,7 +6,7 @@
/* By: gbaconni@student.42lausanne.ch +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2022/01/20 11:55:58 by gbaconni #+# #+# */
/* Updated: 2022/04/17 22:40:01 by gbaconni ### lausanne.ch */
/* Updated: 2022/04/24 00:29:57 by gbaconni ### lausanne.ch */
/* */
/* ************************************************************************** */
@@ -14,19 +14,24 @@
int ft_vprintf_percent(const char *format, va_list ap)
{
int ret;
const char *fmt;
int ret;
char c;
if (*format == '%')
ret = ft_vprintf_other(format, ap);
else if (*format == 'c')
ret = 0;
fmt = format + 1;
c = *(fmt + ft_skipchars(fmt, "0123456789# +"));
if (c == 'c')
ret = ft_vprintf_char(format, ap);
else if (*format == 's')
else if (c == 's')
ret = ft_vprintf_string(format, ap);
else if (*format == 'p')
else if (c == 'p')
ret = ft_vprintf_pointer(format, ap);
else if (*format == 'd' || *format == 'i' || *format == 'u')
ret = ft_vprintf_decimal(format, ap);
else if (*format == 'x' || *format == 'X')
else if (c == 'x' || c == 'X')
ret = ft_vprintf_hexadecimal(format, ap);
else if (c == 'd' || c == 'i' || c == 'u')
ret = ft_vprintf_decimal(format, ap);
else
ret = ft_vprintf_other(format, ap);
return (ret);
}

4
libftprintf/libftprintf.h
View File

@@ -6,7 +6,7 @@
/* By: gbaconni@student.42lausanne.ch +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2022/01/18 15:26:06 by gbaconni #+# #+# */
/* Updated: 2022/04/18 00:26:16 by gbaconni ### lausanne.ch */
/* Updated: 2022/04/24 00:00:59 by gbaconni ### lausanne.ch */
/* */
/* ************************************************************************** */
@@ -25,10 +25,12 @@
/* Helper */
int ft_skipchars(const char *s, char *chars);
char *ft_strrev(char *s);
char *ft_ltoa_base(long n, char *base);
int ft_putchar(int c);
int ft_puts(const char *s);
char *ft_unescape(const char *str);
/* Mandatory */