finish the bonus just need to verify some files i guess

This commit is contained in:
Maoake Teriierooiterai
2026-01-14 10:22:15 +01:00
parent fe69eeb821
commit 68dbe33733
18 changed files with 116 additions and 60 deletions

View File

@@ -18,7 +18,7 @@ COMPLEX_DIR = radix
FLAGS_DIR = flags
CHECKER_DIR = checker
CHECKER_DIR = check_error
INCLUDES = includes
@@ -32,7 +32,7 @@ INSERTION = insertion.c
FLAGS_FILES = algorithms_sort.c flag.c bench.c
PARSING = ft_atoi.c parsing.c ft_strncmp.c ft_split.c ft_strlen.c ft_substr.c checker.c ft_itoa.c ft_isdigit.c \
PARSING = ft_atoi.c parsing.c ft_strncmp.c ft_split.c ft_strlen.c ft_substr.c ft_itoa.c ft_isdigit.c \
ft_strjoin.c ft_strlcat.c ft_strlcpy.c parsing_2.c disorder.c
CHECKER_FILES = check_error.c verif_flag.c verif_is_digit.c verif_overflow.c verif_double.c
@@ -71,19 +71,27 @@ DEP = $(OBJ:.o=.d)
BONUS_DIR = bonus
GNL_D = GNL
GNL_DIR = bonus/GNL
BONUS_FILES = $(BONUS_DIR)/ft_bzero.c $(BONUS_DIR)/checker_bonus.c
BONUS_FILES = checker_bonus.c
GNL_FILES = $(GNL_DIR)/get_next_line.c $(GNL_DIR)/get_next_line_utils.c
GNL_FILES = get_next_line.c get_next_line_utils.c
ALL_BONUS_FILES = $(BONUS_FILES) $(GNL_FILES)
SRC_FOR_BONUS = ft_putnbr.c secure_write.c
ALL_BONUS_FILES = $(SRC_FOR_BONUS) $(BONUS_DIR)/$(BONUS_FILES) $(BONUS_DIR)/$(GNL_D)/$(GNL_FILES) \
$(STACK_UTILS_DIR)/$(STACK_UTILS) $(PARS_DIR)/$(PARSING) \
$(ALGO_DIR)/$(MEDIUM_DIR)/$(MEDIUM_ALGO) $(ALGO_UTILS_DIR)/$(ALGO_UTILS) \
$(INSERT_DIR)/$(INSERTION) $(ALGO_DIR)/$(COMPLEX_DIR)/$(COMPLEX_ALGO) \
$(FLAGS_DIR)/$(FLAGS_FILES) $(CHECKER_DIR)/$(CHECKER_FILES)
BONUS_OBJ = $(addprefix $(OBJ_DIR)/, $(notdir $(ALL_BONUS_FILES:.c=.o)))
BONUS = checker
NAME_BONUS = checker
.PHONY: all clean fclean re
.PHONY: all clean fclean re bonus
all: $(NAME)
@@ -93,8 +101,8 @@ $(NAME): $(OBJ)
@echo "======= PUSH SWAP COMPILED ========="
@echo "===================================="
$(BONUS): $(BONUS_OBJ)
@$(CC) $(CFLAGS) -I$(GNL_DIR) $(BONUS_OBJ) -o $(BONUS)
$(NAME_BONUS): $(BONUS_OBJ)
@$(CC) $(CFLAGS) $(BONUS_OBJ) -o $(NAME_BONUS)
@echo "===================================="
@echo "======= PUSH SWAP COMPILED ========="
@echo "===================================="
@@ -126,13 +134,16 @@ $(OBJ_DIR)/%.o: $(FLAGS_DIR)/%.c | $(OBJ_DIR)
$(OBJ_DIR)/%.o: $(CHECKER_DIR)/%.c | $(OBJ_DIR)
$(CC) $(CFLAGS) -MMD -MP -c $< -o $@
$(OBJ_DIR)/%.o: $(BONUS_DIR)/%.c | $(OBJ_DIR)
$(CC) $(CFLAGS) -MMD -MP -c $< -o $@
$(OBJ_DIR)/%.o: $(BONUS_DIR)/$(GNL_D)/%.c | $(OBJ_DIR)
$(CC) $(CFLAGS) -MMD -MP -c $< -o $@
$(OBJ_DIR)/%.o: %.c | $(OBJ_DIR)
$(CC) $(CFLAGS) -MMD -MP -c $< -o $@
$(OBJ_DIR)/%.o: $(BONUS_DIR)%.c | $(OBJ_DIR)
$(CC) $(CFLAGS) -MMD -MP -c $< -o $@
$(OBJ_DIR)/%.o: $(GNL_DIR)%.c | $(OBJ_DIR)
$(OBJ_DIR_BONUS)/%.o: %.c | $(OBJ_DIR_BONUS)
$(CC) $(CFLAGS) -MMD -MP -c $< -o $@
$(OBJ_DIR):
@@ -146,9 +157,12 @@ clean:
fclean: clean
@rm -f $(NAME)
@rm -f $(NAME_BONUS)
@echo "========== EXEC DELETED ============"
@echo "===================================="
re: fclean all
bonus: $(NAME_BONUS)
-include $(DEP)

View File

@@ -11,6 +11,7 @@
/* ************************************************************************** */
#include "get_next_line.h"
#include "parsing.h"
#include <unistd.h>
static int del_before_nl(char buf[BUFFER_SIZE])
@@ -22,7 +23,7 @@ static int del_before_nl(char buf[BUFFER_SIZE])
nl_i = index_of_nl(buf, BUFFER_SIZE);
if (nl_i >= 0)
{
temp = ft_substr(buf, nl_i + 1, BUFFER_SIZE - nl_i);
temp = ft_substr_gnl(buf, nl_i + 1, BUFFER_SIZE - nl_i);
if (!temp)
return (-1);
ft_bzero(buf, BUFFER_SIZE);
@@ -51,7 +52,7 @@ static char *ft_read_one(char buf[BUFFER_SIZE], int fd, char *str)
free(str);
return (NULL);
}
if ((!str || ft_strlen(str) == 0) && temp == 0)
if ((!str || ft_strlen_1(str) == 0) && temp == 0)
{
free(str);
return (NULL);
@@ -73,7 +74,7 @@ static char *extract_all_nl(char buf[BUFFER_SIZE], int fd, char *str, int nl_i)
if (!str)
return (NULL);
nl_i = index_of_nl(buf, BUFFER_SIZE);
if (nl_i < 0 && !ft_strlen(buf))
if (nl_i < 0 && !ft_strlen_1(buf))
return (str);
}
str = ft_strjoin_new(str, buf, nl_i);
@@ -100,12 +101,12 @@ char *get_next_line(int fd)
nl_i = index_of_nl(buf, BUFFER_SIZE);
if (nl_i >= 0)
{
str = ft_substr(buf, 0, nl_i + 1);
str = ft_substr_gnl(buf, 0, nl_i + 1);
temp = del_before_nl(buf);
if (temp < 0)
return (free(str), NULL);
}
else
str = extract_all_nl(buf, fd, ft_substr("", 0, 1), nl_i);
str = extract_all_nl(buf, fd, ft_substr_gnl("", 0, 1), nl_i);
return (str);
}

View File

@@ -29,7 +29,7 @@ int index_of_nl(char *str, int limit)
return (-1);
}
size_t ft_strlen(const char *s)
size_t ft_strlen_1(const char *s)
{
size_t i;
@@ -45,7 +45,7 @@ char *ft_strjoin_new(char const *s1, char const *s2, size_t limit)
size_t i;
size_t j;
str = malloc(sizeof(char) * (ft_strlen(s1) + ft_strlen(s2) + 1));
str = malloc(sizeof(char) * (ft_strlen_1(s1) + ft_strlen_1(s2) + 1));
if (!str)
return (NULL);
i = 0;
@@ -65,7 +65,7 @@ char *ft_strjoin_new(char const *s1, char const *s2, size_t limit)
return (str);
}
char *ft_substr(char const *s, unsigned int start, size_t len)
char *ft_substr_gnl(char const *s, unsigned int start, size_t len)
{
size_t i;
char *sub_str;
@@ -73,7 +73,7 @@ char *ft_substr(char const *s, unsigned int start, size_t len)
if (!s)
return (NULL);
s_len = ft_strlen(s);
s_len = ft_strlen_1(s);
if (start > s_len)
len = 0;
else if (s_len < (start + len))

View File

@@ -13,8 +13,8 @@
#include "push_swap.h"
#include "parsing.h"
#include "get_next_line.h"
#include "check_error.h"
#include <unistd.h>
#include <stdlib.h>
static int apply_operation(t_stacks *stacks, char buf[1024])
{
@@ -43,7 +43,14 @@ static int apply_operation(t_stacks *stacks, char buf[1024])
return (0);
}
static void tester(t_stacks *stacks)
static int is_stacks_b_empty(t_stacks *stacks)
{
if (stacks->b != NULL)
return (0);
return (1);
}
static int tester(t_stacks *stacks)
{
char *buf;
@@ -55,12 +62,43 @@ static void tester(t_stacks *stacks)
free(buf);
buf = get_next_line(0);
}
if ()
if (!is_stacks_b_empty(stacks))
return (write(1, "KO\n", 3));
if (!check_order(stacks->a))
return (write(1, "KO\n", 3));
write(1, "OK\n", 3);
return (0);
}
static int bonus(char **tab)
{
t_stacks *stacks;
int len;
stacks = NULL;
len = len_split(tab);
stacks = init_stacks(len, tab, 0);
stacks->print = 0;
if (!stacks)
return (0);
tester(stacks);
free_all(stacks);
return (1);
}
int main(int argc, char **argv)
{
t_stacks *stacks;
char **tab;
if (argc < 2)
return (write(2, "Error\n", 7));
tab = split_all(join_all(argc, argv));
if (!tab)
return (0);
if (!check_error_bonus(tab))
write(2, "Error\n", 7);
else
bonus(tab);
free_tab(tab);
return (0);
}

View File

@@ -1,21 +0,0 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* ft_bzero.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: dgaillet <dgaillet@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2026/01/09 11:59:20 by dgaillet #+# #+# */
/* Updated: 2026/01/09 11:59:46 by dgaillet ### ########lyon.fr */
/* */
/* ************************************************************************** */
void ft_bzero(void *s, unsigned int n)
{
while (n > 0)
{
*((unsigned char *) s) = '\0';
s++;
n--;
}
}

View File

@@ -23,6 +23,17 @@ int verif_is_number(char **tab)
return (1);
}
int check_error_bonus(char **tab)
{
if (!verif_is_digit(tab, 0))
return (0);
if (!verif_overflow(tab, 0))
return (0);
if (!verif_double(tab, 0))
return (0);
return (1);
}
int check_error(char **tab, int mod)
{
if (!verif_flag(tab, mod))

View File

@@ -19,5 +19,6 @@ int verif_is_digit(char **tab, int mod);
int verif_overflow(char **tab, int mod);
int verif_double(char **tab, int mod);
int scan_str_is_digit(char *tab);
int check_error_bonus(char **tab);
#endif

View File

@@ -21,10 +21,10 @@
char *get_next_line(int fd);
size_t ft_strlen(const char *s);
size_t ft_strlen_1(const char *s);
char *ft_strjoin_new(char const *s1, char const *s2, size_t limit);
void ft_bzero(void *s, size_t n);
int index_of_nl(char *str, int limit);
char *ft_substr(char const *s, unsigned int start, size_t len);
char *ft_substr_gnl(char const *s, unsigned int start, size_t len);
#endif

View File

@@ -26,6 +26,7 @@ typedef struct s_stacks
t_stack *b;
int algo;
int bench;
int print;
float disorder;
unsigned int ra;
unsigned int rb;

View File

@@ -51,6 +51,7 @@ static void set_t_stacks(t_stacks *stacks)
stacks->algo = 0;
stacks->bench = 0;
stacks->disorder = 0;
stacks->print = 1;
stacks->sa = 0;
stacks->sb = 0;
stacks->ss = 0;

View File

@@ -31,6 +31,7 @@ void pa(t_stacks *stacks)
}
stack_add_front(&(stacks->a), b_push);
stacks->pa++;
if (stacks->print)
write(1, "pa\n", 3);
}
@@ -51,5 +52,6 @@ void pb(t_stacks *stacks)
}
stack_add_front(&(stacks->b), a_push);
stacks->pb++;
if (stacks->print)
write(1, "pb\n", 3);
}

View File

@@ -26,6 +26,7 @@ void rrb(t_stacks *stacks)
if (stacks && stacks->b && stacks->b->previous)
stacks->b = stacks->b->previous;
stacks->rrb++;
if (stacks->print)
write(1, "rrb\n", 4);
}
@@ -36,5 +37,6 @@ void rrr(t_stacks *stacks)
if (stacks && stacks->a && stacks->a->previous)
stacks->a = stacks->a->previous;
stacks->rrr++;
if (stacks->print)
write(1, "rrr\n", 4);
}

View File

@@ -18,6 +18,7 @@ void ra(t_stacks *stacks)
if (stacks && stacks->a && stacks->a->next)
stacks->a = stacks->a->next;
stacks->ra++;
if (stacks->print)
write(1, "ra\n", 3);
}
@@ -26,6 +27,7 @@ void rb(t_stacks *stacks)
if (stacks && stacks->b && stacks->b->next)
stacks->b = stacks->b->next;
stacks->rb++;
if (stacks->print)
write(1, "rb\n", 3);
}
@@ -36,5 +38,6 @@ void rr(t_stacks *stacks)
if (stacks && stacks->b && stacks->b->next)
stacks->b = stacks->b->next;
stacks->rr++;
if (stacks->print)
write(1, "rr\n", 3);
}

View File

@@ -25,6 +25,7 @@ void sa(t_stacks *stacks)
a->value = a->next->value;
a->next->value = stock;
stacks->sa++;
if (stacks->print)
write(1, "sa\n", 3);
}
@@ -40,6 +41,7 @@ void sb(t_stacks *stacks)
b->value = b->next->value;
b->next->value = stock;
stacks->sb++;
if (stacks->print)
write(1, "sb\n", 3);
}
@@ -66,5 +68,6 @@ void ss(t_stacks *stacks)
a->next->value = stock;
}
stacks->ss++;
if (stacks->print)
write(1, "ss\n", 3);
}