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

Improve hexadecimal and pointer by using ltoa instead of itoa

Browse Source
This commit is contained in:
gbaconni
2022-04-15 20:55:58 +02:00
parent 175a774e49
commit d7d3f39e54
8 changed files with 73 additions and 51 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 17:19:14 by gbaconni ### lausanne.ch # # Updated: 2022/04/15 20:37:26 by gbaconni ### lausanne.ch #
# # # #
# **************************************************************************** # # **************************************************************************** #
# #
@@ -88,9 +88,10 @@ test: clean $(NAME)
@$(PREFIX) ./$(NAME) "%d" 42 || true @$(PREFIX) ./$(NAME) "%d" 42 || true
@$(PREFIX) ./$(NAME) "%x" 42 || true @$(PREFIX) ./$(NAME) "%x" 42 || true
@$(PREFIX) ./$(NAME) "%X" 42 || true @$(PREFIX) ./$(NAME) "%X" 42 || true
@$(PREFIX) ./$(NAME) "42" "" || true
@$(PREFIX) ./$(NAME) "%%" "" || true @$(PREFIX) ./$(NAME) "%%" "" || true
@$(PREFIX) ./$(NAME) "%p" "" || true @$(PREFIX) ./$(NAME) "%p" "" || true
@$(PREFIX) ./$(NAME) "%p" "\n" || true
@$(PREFIX) ./$(NAME) "Forty Two" "" || true
test2: leak test2: leak
@$(MAKE) test LEAK=1 @$(MAKE) test LEAK=1

4
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/15 17:19:30 by gbaconni ### lausanne.ch # # Updated: 2022/04/15 20:19:14 by gbaconni ### lausanne.ch #
# # # #
# **************************************************************************** # # **************************************************************************** #
# #
@@ -30,7 +30,7 @@ SRC = \
$(LIBFT)/ft_calloc.c \ $(LIBFT)/ft_calloc.c \
$(LIBFT)/ft_strlen.c \ $(LIBFT)/ft_strlen.c \
$(LIBFT)/ft_itoa.c \ $(LIBFT)/ft_itoa.c \
ft_itoa_base.c \ ft_ltoa_base.c \
ft_vprintf_char.c \ ft_vprintf_char.c \
ft_vprintf_string.c \ ft_vprintf_string.c \
ft_vprintf_pointer.c \ ft_vprintf_pointer.c \

12
libftprintf/ft_itoa_base.c → libftprintf/ft_ltoa_base.c
View File

@@ -1,21 +1,21 @@
/* ************************************************************************** */ /* ************************************************************************** */
/* */ /* */
/* ::: :::::::: */ /* ::: :::::::: */
/* ft_itoa_base.c :+: :+: :+: */ /* ft_ltoa_base.c :+: :+: :+: */
/* +:+ +:+ +:+ */ /* +:+ +:+ +:+ */
/* By: gbaconni <gbaconni@42lausanne.ch> +#+ +:+ +#+ */ /* By: gbaconni <gbaconni@42lausanne.ch> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2021/08/16 13:51:16 by gbaconni #+# #+# */ /* Created: 2021/08/16 13:51:16 by gbaconni #+# #+# */
/* Updated: 2022/04/15 00:08:27 by gbaconni ### lausanne.ch */ /* Updated: 2022/04/15 20:20:23 by gbaconni ### lausanne.ch */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
#include "libftprintf.h" #include "libftprintf.h"
static int ft_intlen_base(int n, int nbase); static long ft_longlen_base(long n, long nbase);
static char *ft_strrev(char *s); static char *ft_strrev(char *s);
char *ft_itoa_base(int n, char *base) char *ft_ltoa_base(long n, char *base)
{ {
char *s; char *s;
int i; int i;
@@ -23,7 +23,7 @@ char *ft_itoa_base(int n, char *base)
long nbase; long nbase;
nbase = ft_strlen(base); nbase = ft_strlen(base);
s = (char *) ft_calloc((ft_intlen_base(n, nbase) + 1), sizeof(char)); s = (char *) ft_calloc((ft_longlen_base(n, nbase) + 1), sizeof(char));
if (s == NULL) if (s == NULL)
return (NULL); return (NULL);
i = 0; i = 0;
@@ -43,7 +43,7 @@ char *ft_itoa_base(int n, char *base)
return (ft_strrev(s)); return (ft_strrev(s));
} }
static int ft_intlen_base(int n, int nbase) static long ft_longlen_base(long n, long nbase)
{ {
size_t len; size_t len;

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 16:37:06 by gbaconni ### lausanne.ch */ /* Updated: 2022/04/15 20:44:24 by gbaconni ### lausanne.ch */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */

10
libftprintf/ft_vprintf_hexadecimal.c
View File

@@ -6,7 +6,7 @@
/* By: gbaconni@student.42lausanne.ch +#+ +:+ +#+ */ /* By: gbaconni@student.42lausanne.ch +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2022/01/20 11:55:33 by gbaconni #+# #+# */ /* Created: 2022/01/20 11:55:33 by gbaconni #+# #+# */
/* Updated: 2022/04/15 00:13:02 by gbaconni ### lausanne.ch */ /* Updated: 2022/04/15 20:22:19 by gbaconni ### lausanne.ch */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -16,17 +16,17 @@ int ft_vprintf_hexadecimal(const char *format, va_list ap)
{ {
int ret; int ret;
int len; int len;
int d; long l;
char *s; char *s;
(void) format; (void) format;
ret = 0; ret = 0;
len = 0; len = 0;
d = va_arg(ap, int); l = va_arg(ap, long);
if (format[0] == 'x') if (format[0] == 'x')
s = ft_itoa_base(d, "0123456789abcdef"); s = ft_ltoa_base(l, "0123456789abcdef");
else else
s = ft_itoa_base(d, "0123456789ABCDEF"); s = ft_ltoa_base(l, "0123456789ABCDEF");
len = ft_strlen(s); len = ft_strlen(s);
write(1, s, len); write(1, s, len);
ret += len; ret += len;

7
libftprintf/ft_vprintf_pointer.c
View File

@@ -6,7 +6,7 @@
/* By: gbaconni@student.42lausanne.ch +#+ +:+ +#+ */ /* By: gbaconni@student.42lausanne.ch +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2022/01/20 11:56:16 by gbaconni #+# #+# */ /* Created: 2022/01/20 11:56:16 by gbaconni #+# #+# */
/* Updated: 2022/04/15 17:12:36 by gbaconni ### lausanne.ch */ /* Updated: 2022/04/15 20:54:31 by gbaconni ### lausanne.ch */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -29,10 +29,11 @@ int ft_vprintf_pointer(const char *format, va_list ap)
write(1, NIL, len); write(1, NIL, len);
return (len); return (len);
} }
s = ft_itoa_base((unsigned long) p, "0123456789ABCDEF"); s = ft_ltoa_base((long) p, "0123456789abcdef");
len = ft_strlen(s); len = ft_strlen(s);
write(1, "0x", 2);
write(1, s, len); write(1, s, len);
ret += len; ret += len + 2;
free(s); free(s);
return (ret); return (ret);
} }

4
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/15 16:50:38 by gbaconni ### lausanne.ch */ /* Updated: 2022/04/15 20:20:35 by gbaconni ### lausanne.ch */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -25,7 +25,7 @@
/* Helper */ /* Helper */
char *ft_itoa_base(int n, char *base); char *ft_ltoa_base(long n, char *base);
/* Mandatory */ /* Mandatory */

80
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 17:19:36 by gbaconni ### lausanne.ch */ /* Updated: 2022/04/15 20:48:55 by gbaconni ### lausanne.ch */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -87,23 +87,55 @@ int main(int argc, char *argv[])
if (argc > 1) if (argc > 1)
{ {
format = argv[1]; format = argv[1];
if (isnumber(argv[2])) if (format[0] == '%')
{ {
d = atoi(argv[2]); if (format[1] == 'c')
ret = printf(format, d); {
printf(": %d = printf(\"%s\", %d)\n", ret, format, d); c = argv[2][0];
ret = ft_printf(format, d); ret = printf(format, c);
printf(": %d = ft_printf(\"%s\", %d)\n", ret, format, d); printf(": %d = printf(\"%s\", '%c')\n", ret, format, c);
} ret = ft_printf(format, c);
else if (ft_strlen(argv[2]) == 1 && isalnum(argv[2][0])) printf(": %d = ft_printf(\"%s\", '%c')\n", ret, format, c);
{ }
c = argv[2][0]; else if (format[1] == 's')
ret = printf(format, c); {
printf(": %d = printf(\"%s\", '%c')\n", ret, format, c); s = argv[2];
ret = ft_printf(format, c); ret = printf(format, s);
printf(": %d = ft_printf(\"%s\", '%c')\n", ret, format, c); printf(": %d = printf(\"%s\", \"%s\")\n", ret, format, s);
} ret = ft_printf(format, s);
else if (ft_strlen(argv[2]) > 1 && isstring(argv[2])) printf(": %d = ft_printf(\"%s\", \"%s\")\n", ret, format, s);
}
else if (format[1] == 'p')
{
s = argv[2];
if (ft_strlen(s) == 0)
{
s = NULL;
ptr = NULL;
}
ret = printf(format, ptr);
printf(": %d = printf(\"%s\", \"%s\")\n", ret, format, s);
ret = ft_printf(format, ptr);
printf(": %d = ft_printf(\"%s\", \"%s\")\n", ret, format, s);
}
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);
printf(": %d = ft_printf(\"%s\", %d)\n", ret, format, d);
}
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);
printf(": %d = ft_printf(\"%s\", %d)\n", ret, format, d);
}
}
else
{ {
s = argv[2]; s = argv[2];
ret = printf(format, s); ret = printf(format, s);
@@ -111,18 +143,6 @@ int main(int argc, char *argv[])
ret = ft_printf(format, s); 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);
} }
else if (ft_strlen(argv[2]) == 0)
{
s = argv[2];
ret = printf(format, ptr);
printf(": %d = printf(\"%s\", \"%s\")\n", ret, format, s);
ret = ft_printf(format, ptr);
printf(": %d = ft_printf(\"%s\", \"%s\")\n", ret, format, s);
}
else
{
printf("Error: invalid argument\n");
}
} }
return (0); return (0);
} }