diff --git a/Makefile b/Makefile index 19e75ed..ca17fa9 100644 --- a/Makefile +++ b/Makefile @@ -57,7 +57,7 @@ $(NAME): $(OBJ) $(OBJ): | $(OBJDIR) $(OBJDIR)/%.o: $(SRCDIR)/%.c $(DEPS) - @norminette $< >/dev/null || { printf '\033[101;37m%s\033[m\n' "!Norminette Failed>>>"; norminette $<; printf '\033[101;37m%s\033[m\n' "<</dev/null || { printf '\033[101;37m%s\033[m\n' "!Norminette Failed>>>"; norminette $<; printf '\033[101;37m%s\033[m\n' "<< +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/04/04 16:19:27 by apago #+# #+# */ -/* Updated: 2023/04/05 10:04:09 by tischmid ### ########.fr */ +/* Updated: 2023/04/05 16:42:50 by apago ### ########.fr */ /* */ /* ************************************************************************** */ @@ -58,29 +58,31 @@ size_t parse_line(char *line, char *dst, t_meta *meta) return (meta->width + 1); } - // size_t offset; // unused +// size_t offset; // unused char *parse_data(char *data, t_meta *meta) { char *res; size_t read_bytes; + size_t read_total; int i; i = 0; + read_total = 0; res = malloc(meta->width * meta->height * sizeof(char)); if (!res) return (0); while (i < meta->height) { - read_bytes = parse_line(data, res, meta); + read_bytes = parse_line(&data[read_total], &res[read_total - i], meta); if (!read_bytes) { free(res); return (0); } - data += read_bytes; + read_total += read_bytes; i++; } - if (!*data) + if (!data[read_total]) return (res); free(res); return (0);