diff options
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | ft_asprintf.c | 24 | ||||
| -rw-r--r-- | ft_dprintf.c | 24 | ||||
| -rw-r--r-- | ft_printf.c | 24 | ||||
| -rw-r--r-- | ft_printf/convert.c | 122 | ||||
| -rw-r--r-- | ft_printf/convert_char.c | 53 | ||||
| -rw-r--r-- | ft_printf/convert_hex.c | 34 | ||||
| -rw-r--r-- | ft_printf/convert_int.c | 40 | ||||
| -rw-r--r-- | ft_printf/convert_none.c | 25 | ||||
| -rw-r--r-- | ft_printf/convert_percent.c | 23 | ||||
| -rw-r--r-- | ft_printf/convert_ptr.c | 29 | ||||
| -rw-r--r-- | ft_printf/convert_str.c | 25 | ||||
| -rw-r--r-- | ft_printf/convert_uint.c | 34 | ||||
| -rw-r--r-- | ft_printf/convert_written.c | 28 | ||||
| -rw-r--r-- | ft_printf/extract.c | 98 | ||||
| -rw-r--r-- | ft_printf/ft_printf.c | 92 | ||||
| -rw-r--r-- | ft_printf/ft_vasprintf.h | 155 | ||||
| -rw-r--r-- | ft_printf/length_modifier.c | 39 | ||||
| -rw-r--r-- | ft_printf/list.c | 67 | ||||
| -rw-r--r-- | ft_printf/parse.c | 61 | ||||
| -rw-r--r-- | ft_printf/utils.c | 115 | ||||
| -rw-r--r-- | ft_snprintf.c | 24 | ||||
| -rw-r--r-- | ft_sprintf.c | 24 | ||||
| -rw-r--r-- | ft_strncpy.c | 5 | ||||
| -rw-r--r-- | ft_vasprintf.c | 21 | ||||
| -rw-r--r-- | ft_vdprintf.c | 24 | ||||
| -rw-r--r-- | ft_vprintf.c | 18 | ||||
| -rw-r--r-- | ft_vsnprintf.c | 26 | ||||
| -rw-r--r-- | ft_vsprintf.c | 18 | ||||
| -rw-r--r-- | get_next_line.c | 114 | ||||
| -rw-r--r-- | get_next_line.h | 5 | ||||
| -rw-r--r-- | libft.h | 25 |
33 files changed, 1354 insertions, 70 deletions
@@ -6,7 +6,7 @@ # By: cacharle <marvin@42.fr> +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2019/10/08 15:45:53 by cacharle #+# #+# # -# Updated: 2019/11/20 04:13:32 by cacharle ### ########.fr # +# Updated: 2019/11/21 03:43:46 by cacharle ### ########.fr # # # # **************************************************************************** # @@ -28,7 +28,9 @@ SRC = ft_atoi.c ft_bzero.c ft_isalnum.c ft_isalpha.c ft_isascii.c ft_isdigit.c \ ft_strncmp.c ft_strncpy.c ft_strnequ.c ft_strnew.c ft_strnstr.c \ ft_strrchr.c ft_split.c ft_strstr.c ft_substr.c ft_strtrim.c \ ft_tolower.c ft_toupper.c ft_strlcpy.c ft_calloc.c ft_strndup.c \ - ft_strjoin_free.c ft_strjoin_free_snd.c get_next_line.c ft_strcount.c + ft_strjoin_free.c ft_strjoin_free_snd.c get_next_line.c ft_strcount.c \ + ft_printf.c ft_sprintf.c ft_snprintf.c ft_asprintf.c ft_dprintf.c \ + ft_vprintf.c ft_vsprintf.c ft_vsnprintf.c ft_vasprintf.c ft_vdprintf.c OBJ = $(SRC:.c=.o) INCLUDE = libft.h @@ -2,6 +2,6 @@ The state of this repo when I pass can be checked with the [raw](http://github.com/HappyTramp/libft/tree/raw) tag. -I have both the pre 2019 and current functions. There is also my [get\_nex\_line](http://github.com/HappyTramp/get_next_line) in the mix. +I have both the pre 2019 and current functions. There is also my [get\_nex\_line](http://github.com/HappyTramp/get_next_line) and [ft\_printf](http://github.com/HappyTramp/ft_printf) in the mix. The [rendu](http://github.com/HappyTramp/libft/tree/rendu) branch is the one I use for my other projects, it doesnt contain .gitignore, README.md and subjects. diff --git a/ft_asprintf.c b/ft_asprintf.c new file mode 100644 index 0000000..5eb62d9 --- /dev/null +++ b/ft_asprintf.c @@ -0,0 +1,24 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_asprintf.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2019/11/21 02:30:33 by cacharle #+# #+# */ +/* Updated: 2019/11/21 03:43:08 by cacharle ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include "libft.h" + +int ft_asprintf(char **ret, const char *format, ...) +{ + int vret; + va_list ap; + + va_start(ap, format); + vret = ft_vasprintf(ret, format, ap); + va_end(ap); + return (vret); +} diff --git a/ft_dprintf.c b/ft_dprintf.c new file mode 100644 index 0000000..8e60970 --- /dev/null +++ b/ft_dprintf.c @@ -0,0 +1,24 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_dprintf.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2019/11/21 02:29:11 by cacharle #+# #+# */ +/* Updated: 2019/11/21 03:42:05 by cacharle ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include "libft.h" + +int ft_dprintf(int fd, const char *format, ...) +{ + int ret; + va_list ap; + + va_start(ap, format); + ret = ft_vdprintf(fd, format, ap); + va_end(ap); + return (ret); +} diff --git a/ft_printf.c b/ft_printf.c new file mode 100644 index 0000000..1b92bb2 --- /dev/null +++ b/ft_printf.c @@ -0,0 +1,24 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_printf.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2019/11/21 02:31:32 by cacharle #+# #+# */ +/* Updated: 2019/11/21 03:41:54 by cacharle ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include "libft.h" + +int ft_printf(const char *format, ...) +{ + int ret; + va_list ap; + + va_start(ap, format); + ret = ft_vprintf(format, ap); + va_end(ap); + return (ret); +} diff --git a/ft_printf/convert.c b/ft_printf/convert.c new file mode 100644 index 0000000..398c754 --- /dev/null +++ b/ft_printf/convert.c @@ -0,0 +1,122 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* printer.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2019/10/28 23:19:24 by cacharle #+# #+# */ +/* Updated: 2019/11/14 10:22:04 by cacharle ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include <unistd.h> +#include <stdlib.h> +#include <stdarg.h> +#include "libft.h" +#include "ft_vasprintf.h" + +char *convert(t_pformat *pformat, va_list ap) +{ + char *str; + + if (pformat == NULL) + return (NULL); + if (pformat->flags & FLAG_WIDTH_WILDCARD) + { + if (pformat->flags & FLAG_WIDTH_OVERWRITE) + (void)va_arg(ap, int); + else + pformat->width = va_arg(ap, int); + if (pformat->width < 0) + { + pformat->flags |= FLAG_MINUS; + pformat->width *= -1; + } + } + if (pformat->flags & FLAG_PRECISION_WILDCARD) + pformat->precision = va_arg(ap, int); + if ((str = convert_specifier(ap, pformat)) == NULL) + return (NULL); + return (str); +} + +char *convert_specifier(va_list ap, t_pformat *pformat) +{ + if (pformat->specifier == 'c') + return (convert_char(ap, pformat)); + if (pformat->specifier == 's') + return (convert_str(ap, pformat)); + if (pformat->specifier == 'p') + return (convert_ptr(ap, pformat)); + if (pformat->specifier == 'd' || pformat->specifier == 'i') + return (convert_int(ap, pformat)); + if (pformat->specifier == 'u') + return (convert_uint(ap, pformat)); + if (pformat->specifier == 'x') + return (convert_hex(ap, pformat)); + if (pformat->specifier == 'X') + return (convert_hex(ap, pformat)); + if (pformat->specifier == '%') + return (convert_percent(ap, pformat)); + if (pformat->specifier == 'n') + return (convert_written(ap, pformat)); + else + return (convert_none(ap, pformat)); + return (NULL); +} + +char *handle_width(t_pformat *pformat, char *str) +{ + char *tmp; + int len; + int i; + + if ((len = ft_strlen(str)) >= pformat->width) + return (str); + if ((tmp = (char*)malloc(sizeof(char) * (pformat->width + 1))) == NULL) + return (NULL); + if (pformat->flags & FLAG_MINUS) + { + i = len; + ft_strcpy(tmp, str); + while (i < pformat->width) + tmp[i++] = ' '; + tmp[i] = 0; + } + else + { + i = 0; + while (i <= pformat->width - len) + tmp[i++] = pformat->flags & FLAG_ZERO ? '0' : ' '; + ft_strcpy(tmp + i - 1, str); + } + free(str); + return (tmp); +} + +char *handle_precision(t_pformat *pformat, char *str) +{ + int len; + char *tmp; + + if (pformat == NULL || str == NULL) + return (NULL); + if (ft_strchr("diuxX", pformat->specifier) && pformat->precision >= 0) + pformat->flags &= ~FLAG_ZERO; + len = ft_strlen(str); + if (pformat->precision == 0 && str[0] == '0') + { + free(str); + return (ft_strdup("")); + } + if (!ft_strchr("diuxXp", pformat->specifier) || len >= pformat->precision) + return (str); + if ((tmp = (char*)malloc(sizeof(char) * (pformat->precision + 1))) == NULL) + return (NULL); + ft_strcpy(tmp + pformat->precision - len, str); + while (pformat->precision-- > len) + tmp[pformat->precision - len] = '0'; + free(str); + return (tmp); +} diff --git a/ft_printf/convert_char.c b/ft_printf/convert_char.c new file mode 100644 index 0000000..c5f3a93 --- /dev/null +++ b/ft_printf/convert_char.c @@ -0,0 +1,53 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* convert_char.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2019/10/30 23:22:29 by cacharle #+# #+# */ +/* Updated: 2019/11/05 23:44:42 by cacharle ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include "ft_vasprintf.h" + +static char *handle_width_char(t_pformat *pformat, char *str) +{ + char *tmp; + int i; + + pformat->size = 1; + if (1 >= pformat->width) + return (str); + if ((tmp = (char*)malloc(sizeof(char) * (pformat->width + 1))) == NULL) + return (NULL); + if (pformat->flags & FLAG_MINUS) + { + ft_memcpy(tmp, str, (i = 1) + 1); + while (i < pformat->width) + tmp[i++] = ' '; + tmp[i] = 0; + } + else + { + i = 0; + while (i <= pformat->width - 1) + tmp[i++] = pformat->flags & FLAG_ZERO ? '0' : ' '; + ft_memcpy(tmp + i - 1, str, 2); + } + free(str); + pformat->size = pformat->width; + return (tmp); +} + +char *convert_char(va_list ap, t_pformat *pformat) +{ + char *str; + + if ((str = ft_strnew(2)) == NULL) + return (NULL); + str[0] = va_arg(ap, int); + str[1] = '\0'; + return (handle_width_char(pformat, str)); +} diff --git a/ft_printf/convert_hex.c b/ft_printf/convert_hex.c new file mode 100644 index 0000000..0464dc7 --- /dev/null +++ b/ft_printf/convert_hex.c @@ -0,0 +1,34 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* convert_hex.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2019/10/30 23:23:06 by cacharle #+# #+# */ +/* Updated: 2019/11/05 23:58:59 by cacharle ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include "ft_vasprintf.h" + +char *convert_hex(va_list ap, t_pformat *pformat) +{ + char *str; + long long unsigned int n; + + n = length_modifier_unsigned_int(ap, pformat); + str = pformat->specifier == 'x' ? ITOA_HEX_LOW(n) : ITOA_HEX_UP(n); + str = handle_precision(pformat, str); + if (pformat->flags & FLAG_ZERO) + { + if (pformat->flags & FLAG_ALTERNATE && n != 0) + pformat->width -= 2; + str = handle_width(pformat, str); + } + if (pformat->flags & FLAG_ALTERNATE && n != 0) + str = ft_strjoin_free_snd(pformat->specifier == 'X' ? "0X" : "0x", str); + if (!(pformat->flags & FLAG_ZERO)) + str = handle_width(pformat, str); + return (str); +} diff --git a/ft_printf/convert_int.c b/ft_printf/convert_int.c new file mode 100644 index 0000000..2345f76 --- /dev/null +++ b/ft_printf/convert_int.c @@ -0,0 +1,40 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* convert_int.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2019/10/30 23:29:53 by cacharle #+# #+# */ +/* Updated: 2019/11/06 00:00:09 by cacharle ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include "ft_vasprintf.h" + +char *convert_int(va_list ap, t_pformat *pformat) +{ + int is_neg; + long long int n; + char *str; + + n = length_modifier_int(ap, pformat); + is_neg = n < 0; + str = ITOA_DEC(n); + if (is_neg) + ft_strcpy(str, str + 1); + str = handle_precision(pformat, str); + if (pformat->flags & FLAG_ZERO) + { + if (is_neg || pformat->flags & (FLAG_SIGNED | FLAG_SPACE)) + pformat->width--; + str = handle_width(pformat, str); + } + if (is_neg) + str = ft_strjoin_free_snd("-", str); + else if (pformat->flags & (FLAG_SIGNED | FLAG_SPACE)) + str = ft_strjoin_free_snd(pformat->flags & FLAG_SPACE ? " " : "+", str); + if (!(pformat->flags & FLAG_ZERO)) + str = handle_width(pformat, str); + return (str); +} diff --git a/ft_printf/convert_none.c b/ft_printf/convert_none.c new file mode 100644 index 0000000..358ef1b --- /dev/null +++ b/ft_printf/convert_none.c @@ -0,0 +1,25 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* convert_none.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2019/11/04 19:30:25 by cacharle #+# #+# */ +/* Updated: 2019/11/05 23:44:13 by cacharle ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include "ft_vasprintf.h" + +char *convert_none(va_list ap, t_pformat *pformat) +{ + char *str; + + (void)ap; + if ((str = ft_strdup("")) == NULL) + return (NULL); + str = handle_precision(pformat, str); + str = handle_width(pformat, str); + return (str); +} diff --git a/ft_printf/convert_percent.c b/ft_printf/convert_percent.c new file mode 100644 index 0000000..813bb77 --- /dev/null +++ b/ft_printf/convert_percent.c @@ -0,0 +1,23 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* convert_percent.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2019/10/30 23:23:27 by cacharle #+# #+# */ +/* Updated: 2019/11/05 23:44:07 by cacharle ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include "ft_vasprintf.h" + +char *convert_percent(va_list ap, t_pformat *pformat) +{ + char *str; + + (void)ap; + str = ft_strdup("%"); + str = handle_width(pformat, str); + return (str); +} diff --git a/ft_printf/convert_ptr.c b/ft_printf/convert_ptr.c new file mode 100644 index 0000000..63babb9 --- /dev/null +++ b/ft_printf/convert_ptr.c @@ -0,0 +1,29 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* convert_ptr.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2019/10/30 23:24:08 by cacharle #+# #+# */ +/* Updated: 2019/11/05 23:43:45 by cacharle ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include "ft_vasprintf.h" + +char *convert_ptr(va_list ap, t_pformat *pformat) +{ + char *str; + + str = ITOA_HEX_LOW((long long unsigned int)va_arg(ap, void*)); + str = handle_precision(pformat, str); + if (!(pformat->flags & FLAG_ZERO)) + str = ft_strjoin_free_snd("0x", str); + if (pformat->flags & FLAG_ZERO) + pformat->width -= 2; + str = handle_width(pformat, str); + if (pformat->flags & FLAG_ZERO) + str = ft_strjoin_free_snd("0x", str); + return (str); +} diff --git a/ft_printf/convert_str.c b/ft_printf/convert_str.c new file mode 100644 index 0000000..7d51a5e --- /dev/null +++ b/ft_printf/convert_str.c @@ -0,0 +1,25 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* convert_str.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2019/10/30 23:22:25 by cacharle #+# #+# */ +/* Updated: 2019/11/09 01:07:24 by cacharle ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include "ft_vasprintf.h" + +char *convert_str(va_list ap, t_pformat *pformat) +{ + char *str; + + str = va_arg(ap, char*); + str = str == NULL ? ft_strdup("(null)") : ft_strdup(str); + if (pformat->precision >= 0 && pformat->precision < (int)ft_strlen(str)) + str[pformat->precision] = '\0'; + str = handle_width(pformat, str); + return (str); +} diff --git a/ft_printf/convert_uint.c b/ft_printf/convert_uint.c new file mode 100644 index 0000000..4207165 --- /dev/null +++ b/ft_printf/convert_uint.c @@ -0,0 +1,34 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* convert_uint.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2019/10/30 23:25:40 by cacharle #+# #+# */ +/* Updated: 2019/11/05 23:44:19 by cacharle ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include "ft_vasprintf.h" + +char *convert_uint(va_list ap, t_pformat *pformat) +{ + char *str; + long long unsigned int n; + + if (pformat->flags & FLAG_SHORT) + n = (unsigned short)va_arg(ap, int); + else if (pformat->flags & FLAG_SHORT_SHORT) + n = (unsigned char)va_arg(ap, int); + else if (pformat->flags & FLAG_LONG) + n = va_arg(ap, long unsigned int); + else if (pformat->flags & FLAG_LONG_LONG) + n = va_arg(ap, long long unsigned int); + else + n = va_arg(ap, unsigned int); + str = ft_itoa_unsigned_base(n, "0123456789"); + str = handle_precision(pformat, str); + str = handle_width(pformat, str); + return (str); +} diff --git a/ft_printf/convert_written.c b/ft_printf/convert_written.c new file mode 100644 index 0000000..4beeaef --- /dev/null +++ b/ft_printf/convert_written.c @@ -0,0 +1,28 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* convert_written.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2019/10/30 23:38:28 by cacharle #+# #+# */ +/* Updated: 2019/11/05 23:59:24 by cacharle ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include "ft_vasprintf.h" + +char *convert_written(va_list ap, t_pformat *pformat) +{ + if (pformat->flags & FLAG_SHORT) + pformat->written = (long long int*)va_arg(ap, signed char*); + if (pformat->flags & FLAG_SHORT_SHORT) + pformat->written = (long long int*)va_arg(ap, short*); + if (pformat->flags & FLAG_LONG) + pformat->written = (long long int*)va_arg(ap, long int*); + if (pformat->flags & FLAG_LONG_LONG) + pformat->written = va_arg(ap, long long int*); + else + pformat->written = (long long int*)va_arg(ap, int*); + return (NULL); +} diff --git a/ft_printf/extract.c b/ft_printf/extract.c new file mode 100644 index 0000000..c56a777 --- /dev/null +++ b/ft_printf/extract.c @@ -0,0 +1,98 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* extract.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2019/10/29 00:10:36 by cacharle #+# #+# */ +/* Updated: 2019/11/10 10:33:33 by cacharle ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include "ft_vasprintf.h" + +const char *extract_flags(t_pformat *pformat, const char *fmt) +{ + if (*fmt == '\0') + return (fmt); + while (ft_strchr(FLAGS_STR, *fmt) != NULL) + { + if (*fmt == '0') + pformat->flags |= FLAG_ZERO; + if (*fmt == '-') + pformat->flags |= FLAG_MINUS; + if (*fmt == '+') + pformat->flags |= FLAG_SIGNED; + if (*fmt == ' ') + pformat->flags |= FLAG_SPACE; + if (*fmt == '#') + pformat->flags |= FLAG_ALTERNATE; + if (*fmt == '\'') + ; + fmt++; + } + if (pformat->flags & FLAG_SIGNED) + pformat->flags &= ~FLAG_SPACE; + return (fmt); +} + +const char *extract_width(t_pformat *pformat, const char *fmt) +{ + if (*fmt == '\0') + return (fmt); + if (*fmt == '*') + { + pformat->flags |= FLAG_WIDTH_WILDCARD; + fmt++; + } + if (!ft_isdigit(*fmt)) + return (fmt); + pformat->width = ft_atoi(fmt); + while (*fmt && ft_isdigit(*fmt)) + fmt++; + if (pformat->flags & FLAG_WIDTH_WILDCARD) + pformat->flags |= FLAG_WIDTH_OVERWRITE; + return (fmt); +} + +const char *extract_precision(t_pformat *pformat, const char *fmt) +{ + if (*fmt == '\0' || *fmt != '.') + return (fmt); + fmt++; + if (*fmt == '*') + { + pformat->flags |= FLAG_PRECISION_WILDCARD; + fmt++; + } + pformat->precision = ft_atoi(fmt); + while (*fmt && ft_isdigit(*fmt)) + fmt++; + return (fmt); +} + +const char *extract_length_modifier(t_pformat *pformat, const char *fmt) +{ + if (fmt[0] && fmt[0] == 'l') + { + if (fmt[1] && fmt[1] == 'l') + { + pformat->flags |= FLAG_LONG_LONG; + return (fmt + 2); + } + pformat->flags |= FLAG_LONG; + return (fmt + 1); + } + if (fmt[0] && fmt[0] == 'h') + { + if (fmt[1] && fmt[1] == 'h') + { + pformat->flags |= FLAG_SHORT_SHORT; + return (fmt + 2); + } + pformat->flags |= FLAG_SHORT; + return (fmt + 1); + } + return (fmt); +} diff --git a/ft_printf/ft_printf.c b/ft_printf/ft_printf.c new file mode 100644 index 0000000..daa0cf2 --- /dev/null +++ b/ft_printf/ft_printf.c @@ -0,0 +1,92 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_printf.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2019/10/29 00:15:28 by cacharle #+# #+# */ +/* Updated: 2019/11/13 08:56:49 by cacharle ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include "ft_vasprintf.h" + +int ft_printf(const char *format, ...) +{ + t_printf_status status; + + if (format == NULL) + return (STATUS_ERROR); + if (!parse(format, &status.flist)) + return (STATUS_ERROR); + va_start(status.ap, format); + status.format = format; + status.out = NULL; + status.out_size = 0; + while (*status.format) + { + if (*status.format == '%' + && (status.format = + add_conversion(&status, status.flist->content)) == NULL) + return (destroy_status_error(&status)); + else if ((status.format = add_between(&status)) == NULL) + return (destroy_status_error(&status)); + } + va_end(status.ap); + list_destroy(&status.flist); + write(STDOUT_FILENO, status.out, status.out_size); + free(status.out); + return (status.out_size); +} + +const char *add_conversion(t_printf_status *status, t_pformat *pformat) +{ + char *conversion_str; + + conversion_str = convert(pformat, status->ap); + if (pformat->specifier == 'n') + { + if (pformat->written != NULL) |
