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

66
main.c
View File

@@ -6,7 +6,7 @@
/* By: baco <baco@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* 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 <stdlib.h> // malloc, free
#include <ctype.h> // isdigit
#include <assert.h> // assert
#include <fcntl.h>
#include "libftprintf/libftprintf.h"
int isnumber(char *s);
int isstring(char *s);
int isnumber(char *s);
int isstring(char *s);
int isnumber(char *s)
{
@@ -49,34 +52,34 @@ int isstring(char *s)
return (1);
}
/*
int diff_printf_decimal(const char *format, va_list ap);
int diff_printf_decimal(const char *format, va_list ap)
void ft_begin(int *fd)
{
int ret;
int d;
char *s;
ret = 0;
d = 0;
d = atoi(argv[2]);
ret = printf(format, d);
printf(": %d = printf(\"%s\", %d)\n", ret, format, d);
ret = ft_printf(format, d);
printf(": %d = ft_printf(\"%s\", %d)\n", ret, format, d);
return (ret);
pipe(fd);
fd[2] = dup(STDOUT_FILENO);
dup2(fd[1], STDOUT_FILENO);
}
void ft_end(int *fd, char *str)
{
close(fd[1]);
read(fd[0], str, sizeof(str));
close(fd[0]);
dup2(fd[2], STDOUT_FILENO);
}
*/
int main(int argc, char *argv[])
{
int ft_ret;
int ret;
char out[256];
char ft_out[256];
char *format;
int d;
char c;
char *s;
int x;
void *ptr;
int fd[3];
d = 0;
c = '\0';
@@ -93,17 +96,22 @@ int main(int argc, char *argv[])
{
c = argv[2][0];
ret = printf(format, c);
printf(": %d = printf(\"%s\", '%c')\n", ret, format, c);
ret = ft_printf(format, c);
printf(": %d = ft_printf(\"%s\", '%c')\n", ret, format, c);
printf("%d = printf(\"%s\", '%c')\n%s\n", ret, format, c, out);
ft_begin(fd);
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')
{
s = argv[2];
ret = printf(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);
assert(ret == ft_ret);
}
else if (format[1] == 'p')
{
@@ -115,24 +123,27 @@ int main(int argc, char *argv[])
}
ret = printf(format, ptr);
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);
assert(ret == ft_ret);
}
else if (format[1] == 'd' || format[1] == 'i' || format[1] == 'u')
{
d = atoi(argv[2]);
ret = printf(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);
assert(ret == ft_ret);
}
else if (format[1] == 'x' || format[1] == 'X')
{
d = atoi(argv[2]);
ret = printf(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);
assert(ret == ft_ret);
}
}
else
@@ -140,8 +151,9 @@ int main(int argc, char *argv[])
s = argv[2];
ret = printf(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);
assert(ret == ft_ret);
}
}
return (0);