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

Move dispatcher to ft_vprintf_percent.c

Browse Source
This commit is contained in:
gbaconni
2022-04-18 00:52:18 +02:00
parent 0269a1dc70
commit 0cd1d2ef1b
10 changed files with 141 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
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/17 13:18:09 by gbaconni ### lausanne.ch # # Updated: 2022/04/17 20:56:04 by gbaconni ### lausanne.ch #
# # # #
# **************************************************************************** # # **************************************************************************** #
# #
@@ -99,6 +99,7 @@ test: clean $(NAME)
@$(PREFIX) ./$(NAME) "%p" "" || true @$(PREFIX) ./$(NAME) "%p" "" || true
@$(PREFIX) ./$(NAME) "%p" "\n" || true @$(PREFIX) ./$(NAME) "%p" "\n" || true
@$(PREFIX) ./$(NAME) "Forty Two" "" || true @$(PREFIX) ./$(NAME) "Forty Two" "" || true
@$(PREFIX) ./$(NAME) "\t\r\n" "" || true
test2: leak test2: leak
@$(MAKE) test LEAK=1 @$(MAKE) test LEAK=1

3
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/17 11:18:36 by gbaconni ### lausanne.ch # # Updated: 2022/04/18 00:28:09 by gbaconni ### lausanne.ch #
# # # #
# **************************************************************************** # # **************************************************************************** #
# #
@@ -40,6 +40,7 @@ SRC = \
ft_vprintf_decimal.c \ ft_vprintf_decimal.c \
ft_vprintf_hexadecimal.c \ ft_vprintf_hexadecimal.c \
ft_vprintf_percent.c \ ft_vprintf_percent.c \
ft_vprintf_escape.c \
ft_vprintf_other.c \ ft_vprintf_other.c \
ft_vprintf.c \ ft_vprintf.c \
ft_printf.c ft_printf.c

19
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/16 01:14:44 by gbaconni ### lausanne.ch */ /* Updated: 2022/04/17 22:45:28 by gbaconni ### lausanne.ch */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -20,20 +20,9 @@ int ft_vprintf(char const *format, va_list ap)
while (*format != 0) while (*format != 0)
{ {
if (*format == '%') if (*format == '%')
{ ret += ft_vprintf_percent(++format, ap);
if (*++format == '%') else if (*format == '\\')
ret += ft_vprintf_percent(format, ap); ret += ft_vprintf_escape(++format, ap);
else if (*format == 'c')
ret += ft_vprintf_char(format, ap);
else if (*format == 's')
ret += ft_vprintf_string(format, ap);
else if (*format == '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')
ret += ft_vprintf_hexadecimal(format, ap);
}
else else
ret += ft_vprintf_other(format, ap); ret += ft_vprintf_other(format, ap);
format++; format++;

2
libftprintf/ft_vprintf_char.c
View File

@@ -6,7 +6,7 @@
/* By: gbaconni@student.42lausanne.ch +#+ +:+ +#+ */ /* By: gbaconni@student.42lausanne.ch +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2022/01/20 11:54:48 by gbaconni #+# #+# */ /* Created: 2022/01/20 11:54:48 by gbaconni #+# #+# */
/* Updated: 2022/04/16 00:24:01 by gbaconni ### lausanne.ch */ /* Updated: 2022/04/17 20:56:56 by gbaconni ### lausanne.ch */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */

39
libftprintf/ft_vprintf_escape.c Normal file
View File

@@ -0,0 +1,39 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* ft_vprintf_escape.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* 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 */
/* */
/* ************************************************************************** */
#include "libftprintf.h"
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');
return (ret);
}

2
libftprintf/ft_vprintf_other.c
View File

@@ -6,7 +6,7 @@
/* By: gbaconni@student.42lausanne.ch +#+ +:+ +#+ */ /* By: gbaconni@student.42lausanne.ch +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2022/01/20 12:58:03 by gbaconni #+# #+# */ /* Created: 2022/01/20 12:58:03 by gbaconni #+# #+# */
/* Updated: 2022/04/16 01:28:02 by gbaconni ### lausanne.ch */ /* Updated: 2022/04/17 22:39:45 by gbaconni ### lausanne.ch */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */

17
libftprintf/ft_vprintf_percent.c
View File

@@ -6,7 +6,7 @@
/* By: gbaconni@student.42lausanne.ch +#+ +:+ +#+ */ /* By: gbaconni@student.42lausanne.ch +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2022/01/20 11:55:58 by gbaconni #+# #+# */ /* Created: 2022/01/20 11:55:58 by gbaconni #+# #+# */
/* Updated: 2022/04/16 00:32:06 by gbaconni ### lausanne.ch */ /* Updated: 2022/04/17 22:40:01 by gbaconni ### lausanne.ch */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -16,8 +16,17 @@ int ft_vprintf_percent(const char *format, va_list ap)
{ {
int ret; int ret;
(void) format; if (*format == '%')
(void) ap; ret = ft_vprintf_other(format, ap);
ret = ft_putchar('%'); else if (*format == 'c')
ret = ft_vprintf_char(format, ap);
else if (*format == 's')
ret = ft_vprintf_string(format, ap);
else if (*format == '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')
ret = ft_vprintf_hexadecimal(format, ap);
return (ret); return (ret);
} }

2
libftprintf/libft/ft_strlen.c
View File

@@ -6,7 +6,7 @@
/* By: gbaconni <gbaconni@42lausanne.ch> +#+ +:+ +#+ */ /* By: gbaconni <gbaconni@42lausanne.ch> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2021/10/11 14:35:03 by gbaconni #+# #+# */ /* Created: 2021/10/11 14:35:03 by gbaconni #+# #+# */
/* Updated: 2021/10/24 13:11:12 by gbaconni ### ########.fr */ /* Updated: 2022/04/17 23:47:44 by gbaconni ### lausanne.ch */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */

3
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/16 00:45:36 by gbaconni ### lausanne.ch */ /* Updated: 2022/04/18 00:26:16 by gbaconni ### lausanne.ch */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -40,6 +40,7 @@ int ft_vprintf_pointer(const char *format, va_list ap);
int ft_vprintf_decimal(const char *format, va_list ap); int ft_vprintf_decimal(const char *format, va_list ap);
int ft_vprintf_hexadecimal(const char *format, va_list ap); int ft_vprintf_hexadecimal(const char *format, va_list ap);
int ft_vprintf_percent(const char *format, va_list ap); int ft_vprintf_percent(const char *format, va_list ap);
int ft_vprintf_escape(const char *format, va_list ap);
int ft_vprintf_other(const char *format, va_list ap); int ft_vprintf_other(const char *format, va_list ap);
/* Bonus */ /* Bonus */

90
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/17 18:51:22 by gbaconni ### lausanne.ch */ /* Updated: 2022/04/18 00:50:01 by gbaconni ### lausanne.ch */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -94,6 +94,65 @@ int ft_sprintf(char *str, const char *format, ...)
} }
} }
size_t ft_unescape_len(const char *str)
{
size_t len;
len = 0;
while (*str != '\0')
{
if (*str == '\\')
str++;
len++;
str++;
}
return (len);
}
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);
}
char *ft_unescape(const char *str)
{
char *s;
void *ptr;
s = (char *) ft_calloc(ft_unescape_len(str), 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);
}
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
int ft_ret; int ft_ret;
@@ -101,6 +160,7 @@ int main(int argc, char *argv[])
char out[256]; char out[256];
char ft_out[256]; char ft_out[256];
char *format; char *format;
char *f;
int d; int d;
char c; char c;
char *s; char *s;
@@ -116,18 +176,19 @@ int main(int argc, char *argv[])
(void)s; (void)s;
if (argc > 1) if (argc > 1)
{ {
format = argv[1]; f = argv[1];
format = ft_unescape(f);
if (format[0] == '%') if (format[0] == '%')
{ {
if (format[1] == 'c') if (format[1] == 'c')
{ {
c = argv[2][0]; c = argv[2][0];
ret = sprintf(out, format, c); ret = sprintf(out, format, c);
printf("%d = printf(\"%s\", '%c')\n%s\n", ret, format, c, out); printf("%d = printf(\"%s\", '%c')\n%s\n", ret, f, c, out);
ft_begin(fd); ft_begin(fd);
ft_ret = ft_printf(format, c); ft_ret = ft_printf(format, c);
ft_end(fd, ft_out); ft_end(fd, ft_out);
printf("%d = ft_printf(\"%s\", '%c')\n%s\n\n", ft_ret, format, c, ft_out); printf("%d = ft_printf(\"%s\", '%c')\n%s\n\n", ft_ret, f, c, ft_out);
assert(ret == ft_ret); assert(ret == ft_ret);
assert(strcmp(out, ft_out) == 0); assert(strcmp(out, ft_out) == 0);
} }
@@ -135,11 +196,11 @@ int main(int argc, char *argv[])
{ {
s = argv[2]; s = argv[2];
ret = sprintf(out, format, s); ret = sprintf(out, format, s);
printf("%d = printf(\"%s\", \"%s\")\n%s\n", ret, format, s, out); printf("%d = printf(\"%s\", \"%s\")\n%s\n", ret, f, s, out);
ft_begin(fd); ft_begin(fd);
ft_ret = ft_printf(format, s); ft_ret = ft_printf(format, s);
ft_end(fd, ft_out); ft_end(fd, ft_out);
printf("%d = ft_printf(\"%s\", \"%s\")\n%s\n\n", ft_ret, format, s, ft_out); printf("%d = ft_printf(\"%s\", \"%s\")\n%s\n\n", ft_ret, f, s, ft_out);
assert(ret == ft_ret); assert(ret == ft_ret);
assert(strcmp(out, ft_out) == 0); assert(strcmp(out, ft_out) == 0);
} }
@@ -152,11 +213,11 @@ int main(int argc, char *argv[])
ptr = NULL; ptr = NULL;
} }
ret = sprintf(out, format, ptr); ret = sprintf(out, format, ptr);
printf("%d = printf(\"%s\", %p)\n%s\n", ret, format, ptr, out); printf("%d = printf(\"%s\", %p)\n%s\n", ret, f, ptr, out);
ft_begin(fd); ft_begin(fd);
ft_ret = ft_printf(format, ptr); ft_ret = ft_printf(format, ptr);
ft_end(fd, ft_out); ft_end(fd, ft_out);
printf("%d = ft_printf(\"%s\", %p)\n%s\n\n", ft_ret, format, ptr, ft_out); printf("%d = ft_printf(\"%s\", %p)\n%s\n\n", ft_ret, f, ptr, ft_out);
assert(ret == ft_ret); assert(ret == ft_ret);
assert(strcmp(out, ft_out) == 0); assert(strcmp(out, ft_out) == 0);
} }
@@ -164,11 +225,11 @@ int main(int argc, char *argv[])
{ {
d = atoi(argv[2]); d = atoi(argv[2]);
ret = sprintf(out, format, d); ret = sprintf(out, format, d);
printf("%d = printf(\"%s\", %d)\n%s\n", ret, format, d, out); printf("%d = printf(\"%s\", %d)\n%s\n", ret, f, d, out);
ft_begin(fd); ft_begin(fd);
ft_ret = ft_printf(format, d); ft_ret = ft_printf(format, d);
ft_end(fd, ft_out); ft_end(fd, ft_out);
printf("%d = ft_printf(\"%s\", %d)\n%s\n\n", ft_ret, format, d, ft_out); printf("%d = ft_printf(\"%s\", %d)\n%s\n\n", ft_ret, f, d, ft_out);
assert(ret == ft_ret); assert(ret == ft_ret);
assert(strcmp(out, ft_out) == 0); assert(strcmp(out, ft_out) == 0);
} }
@@ -176,11 +237,11 @@ int main(int argc, char *argv[])
{ {
d = atoi(argv[2]); d = atoi(argv[2]);
ret = sprintf(out, format, d); ret = sprintf(out, format, d);
printf("%d = printf(\"%s\", %d)\n%s\n", ret, format, d, out); printf("%d = printf(\"%s\", %d)\n%s\n", ret, f, d, out);
ft_begin(fd); ft_begin(fd);
ft_ret = ft_printf(format, d); ft_ret = ft_printf(format, d);
ft_end(fd, ft_out); ft_end(fd, ft_out);
printf("%d = ft_printf(\"%s\", %d)\n%s\n\n", ft_ret, format, d, ft_out); printf("%d = ft_printf(\"%s\", %d)\n%s\n\n", ft_ret, f, d, ft_out);
assert(ret == ft_ret); assert(ret == ft_ret);
assert(strcmp(out, ft_out) == 0); assert(strcmp(out, ft_out) == 0);
} }
@@ -189,14 +250,15 @@ int main(int argc, char *argv[])
{ {
s = argv[2]; s = argv[2];
ret = sprintf(out, format, s); ret = sprintf(out, format, s);
printf("%d = printf(\"%s\", \"%s\")\n%s\n", ret, format, s, out); printf("%d = printf(\"%s\", \"%s\")\n%s\n", ret, f, s, out);
ft_begin(fd); ft_begin(fd);
ft_ret = ft_printf(format, s); ft_ret = ft_printf(format, s);
ft_end(fd, ft_out); ft_end(fd, ft_out);
printf("%d = ft_printf(\"%s\", \"%s\")\n%s\n\n", ft_ret, format, s, ft_out); printf("%d = ft_printf(\"%s\", \"%s\")\n%s\n\n", ft_ret, f, s, ft_out);
assert(ret == ft_ret); assert(ret == ft_ret);
assert(strcmp(out, ft_out) == 0); assert(strcmp(out, ft_out) == 0);
} }
free(format);
} }
return (0); return (0);
} }