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

Add tests and fix bugs

Browse Source
This commit is contained in:
gbaconni
2022-04-17 09:59:41 +02:00
parent 5aa3e848e9
commit ba482a0104
8 changed files with 94 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
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 20:37:26 by gbaconni ### lausanne.ch # # Updated: 2022/04/16 01:24:13 by gbaconni ### lausanne.ch #
# # # #
# **************************************************************************** # # **************************************************************************** #
# #
@@ -86,6 +86,9 @@ test: clean $(NAME)
@$(PREFIX) ./$(NAME) "%c" C || true @$(PREFIX) ./$(NAME) "%c" C || true
@$(PREFIX) ./$(NAME) "%s" "42 Lausanne" || true @$(PREFIX) ./$(NAME) "%s" "42 Lausanne" || true
@$(PREFIX) ./$(NAME) "%d" 42 || true @$(PREFIX) ./$(NAME) "%d" 42 || true
@$(PREFIX) ./$(NAME) "%i" 2147483647 || true
@$(PREFIX) ./$(NAME) "%i" -2147483646 || true
@$(PREFIX) ./$(NAME) "%u" 4294967295 || true
@$(PREFIX) ./$(NAME) "%x" 42 || true @$(PREFIX) ./$(NAME) "%x" 42 || true
@$(PREFIX) ./$(NAME) "%X" 42 || true @$(PREFIX) ./$(NAME) "%X" 42 || true
@$(PREFIX) ./$(NAME) "%%" "" || true @$(PREFIX) ./$(NAME) "%%" "" || true

5
libftprintf/ft_printf.c
View File

@@ -6,7 +6,7 @@
/* By: gbaconni@student.42lausanne.ch +#+ +:+ +#+ */ /* By: gbaconni@student.42lausanne.ch +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2022/01/18 16:17:58 by gbaconni #+# #+# */ /* Created: 2022/01/18 16:17:58 by gbaconni #+# #+# */
/* Updated: 2022/04/13 00:21:03 by gbaconni ### lausanne.ch */ /* Updated: 2022/04/16 03:07:52 by gbaconni ### lausanne.ch */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -17,9 +17,8 @@ int ft_printf(const char *format, ...)
va_list ap; va_list ap;
int ret; int ret;
ret = 0;
va_start(ap, format); va_start(ap, format);
ret += ft_vprintf(format, ap); ret = ft_vprintf(format, ap);
va_end(ap); va_end(ap);
return (ret); return (ret);
} }

2
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 22:15:16 by gbaconni ### lausanne.ch */ /* Updated: 2022/04/16 01:14:44 by gbaconni ### lausanne.ch */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */

21
libftprintf/ft_vprintf_decimal.c
View File

@@ -6,7 +6,7 @@
/* By: gbaconni@student.42lausanne.ch +#+ +:+ +#+ */ /* By: gbaconni@student.42lausanne.ch +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2022/01/20 11:55:02 by gbaconni #+# #+# */ /* Created: 2022/01/20 11:55:02 by gbaconni #+# #+# */
/* Updated: 2022/04/16 00:29:49 by gbaconni ### lausanne.ch */ /* Updated: 2022/04/16 01:19:09 by gbaconni ### lausanne.ch */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -14,13 +14,22 @@
int ft_vprintf_decimal(const char *format, va_list ap) int ft_vprintf_decimal(const char *format, va_list ap)
{ {
int ret; int ret;
int d; unsigned int u;
char *s; int d;
char *s;
(void) format; (void) format;
d = va_arg(ap, int); if (*format == 'u')
s = ft_itoa(d); {
u = va_arg(ap, unsigned int);
s = ft_ltoa_base((long) u, "0123456789");
}
else
{
d = va_arg(ap, int);
s = ft_itoa(d);
}
ret = ft_puts(s); ret = ft_puts(s);
free(s); free(s);
return (ret); 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 00:36:48 by gbaconni ### lausanne.ch */ /* Updated: 2022/04/16 01:28:02 by gbaconni ### lausanne.ch */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */

66
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/15 20:48:55 by gbaconni ### lausanne.ch */ /* Updated: 2022/04/17 09:59:04 by gbaconni ### lausanne.ch */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -16,10 +16,13 @@
#include <string.h> // strlen #include <string.h> // strlen
#include <stdlib.h> // malloc, free #include <stdlib.h> // malloc, free
#include <ctype.h> // isdigit #include <ctype.h> // isdigit
#include <assert.h> // assert
#include <fcntl.h>
#include "libftprintf/libftprintf.h" #include "libftprintf/libftprintf.h"
int isnumber(char *s); int isnumber(char *s);
int isstring(char *s); int isstring(char *s);
int isnumber(char *s) int isnumber(char *s)
{ {
@@ -49,34 +52,34 @@ int isstring(char *s)
return (1); return (1);
} }
/* void ft_begin(int *fd)
int diff_printf_decimal(const char *format, va_list ap);
int diff_printf_decimal(const char *format, va_list ap)
{ {
int ret; pipe(fd);
int d; fd[2] = dup(STDOUT_FILENO);
char *s; dup2(fd[1], STDOUT_FILENO);
}
ret = 0;
d = 0; void ft_end(int *fd, char *str)
d = atoi(argv[2]); {
ret = printf(format, d); close(fd[1]);
printf(": %d = printf(\"%s\", %d)\n", ret, format, d); read(fd[0], str, sizeof(str));
ret = ft_printf(format, d); close(fd[0]);
printf(": %d = ft_printf(\"%s\", %d)\n", ret, format, d); dup2(fd[2], STDOUT_FILENO);
return (ret);
} }
*/
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
int ft_ret;
int ret; int ret;
char out[256];
char ft_out[256];
char *format; char *format;
int d; int d;
char c; char c;
char *s; char *s;
int x; int x;
void *ptr; void *ptr;
int fd[3];
d = 0; d = 0;
c = '\0'; c = '\0';
@@ -93,17 +96,22 @@ int main(int argc, char *argv[])
{ {
c = argv[2][0]; c = argv[2][0];
ret = printf(format, c); ret = printf(format, c);
printf(": %d = printf(\"%s\", '%c')\n", ret, format, c); printf("%d = printf(\"%s\", '%c')\n%s\n", ret, format, c, out);
ret = ft_printf(format, c); ft_begin(fd);
printf(": %d = ft_printf(\"%s\", '%c')\n", ret, format, c); ft_ret = ft_printf(format, c);
ft_end(fd, ft_out);
printf("%d = ft_printf(\"%s\", '%c')\n%s\n", ret, format, c, ft_out);
assert(ret == ft_ret);
assert(strcmp(out, ft_out) == 0);
} }
else if (format[1] == 's') else if (format[1] == 's')
{ {
s = argv[2]; s = argv[2];
ret = printf(format, s); ret = printf(format, s);
printf(": %d = printf(\"%s\", \"%s\")\n", ret, format, s); printf(": %d = printf(\"%s\", \"%s\")\n", ret, format, s);
ret = ft_printf(format, s); ft_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);
assert(ret == ft_ret);
} }
else if (format[1] == 'p') else if (format[1] == 'p')
{ {
@@ -115,24 +123,27 @@ int main(int argc, char *argv[])
} }
ret = printf(format, ptr); ret = printf(format, ptr);
printf(": %d = printf(\"%s\", \"%s\")\n", ret, format, s); printf(": %d = printf(\"%s\", \"%s\")\n", ret, format, s);
ret = ft_printf(format, ptr); ft_ret = ft_printf(format, ptr);
printf(": %d = ft_printf(\"%s\", \"%s\")\n", ret, format, s); printf(": %d = ft_printf(\"%s\", \"%s\")\n", ret, format, s);
assert(ret == ft_ret);
} }
else if (format[1] == 'd' || format[1] == 'i' || format[1] == 'u') else if (format[1] == 'd' || format[1] == 'i' || format[1] == 'u')
{ {
d = atoi(argv[2]); d = atoi(argv[2]);
ret = printf(format, d); ret = printf(format, d);
printf(": %d = printf(\"%s\", %d)\n", ret, format, d); printf(": %d = printf(\"%s\", %d)\n", ret, format, d);
ret = ft_printf(format, d); ft_ret = ft_printf(format, d);
printf(": %d = ft_printf(\"%s\", %d)\n", ret, format, d); printf(": %d = ft_printf(\"%s\", %d)\n", ret, format, d);
assert(ret == ft_ret);
} }
else if (format[1] == 'x' || format[1] == 'X') else if (format[1] == 'x' || format[1] == 'X')
{ {
d = atoi(argv[2]); d = atoi(argv[2]);
ret = printf(format, d); ret = printf(format, d);
printf(": %d = printf(\"%s\", %d)\n", ret, format, d); printf(": %d = printf(\"%s\", %d)\n", ret, format, d);
ret = ft_printf(format, d); ft_ret = ft_printf(format, d);
printf(": %d = ft_printf(\"%s\", %d)\n", ret, format, d); printf(": %d = ft_printf(\"%s\", %d)\n", ret, format, d);
assert(ret == ft_ret);
} }
} }
else else
@@ -140,8 +151,9 @@ int main(int argc, char *argv[])
s = argv[2]; s = argv[2];
ret = printf(format, s); ret = printf(format, s);
printf(": %d = printf(\"%s\", \"%s\")\n", ret, format, s); printf(": %d = printf(\"%s\", \"%s\")\n", ret, format, s);
ret = ft_printf(format, s); ft_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);
assert(ret == ft_ret);
} }
} }
return (0); return (0);

1
tests/.gitignore vendored Normal file
View File

@@ -0,0 +1 @@
pft

31
tests/Makefile Normal file
View File

@@ -0,0 +1,31 @@
# **************************************************************************** #
# #
# ::: :::::::: #
# Makefile :+: :+: :+: #
# +:+ +:+ +:+ #
# By: gbaconni@student.42lausanne.ch +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ #
# Created: 2022/04/16 20:12:38 by gbaconni #+# #+# #
# Updated: 2022/04/16 20:22:22 by gbaconni ### lausanne.ch #
# #
# **************************************************************************** #
UNAME_S = $(shell uname -s)
all: test
libftprintf.a:
@ln -snf ../libftprintf/libftprintf.a libftprintf.a
test: test-pft
test-pft: libftprintf.a
@test -d pft || git clone https://github.com/gavinfielder/pft.git pft
ifeq ($(UNAME_S),Linux)
@which php >/dev/null 2>&1 || sudo apt-get install -qq -y php-cli
@sed -i -r 's/^(INCLUDE_LIBPTHREAD)=.*/\1=1/' pft/options-config.ini
endif
@make -C pft
@cd pft && ./test