overtime

Makefile

@@ -6,12 +6,12 @@
 #    By: achubuko <marvin@42.fr>                    +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2023/12/02 21:33:22 by achubuko          #+#    #+#              #
-#    Updated: 2023/12/03 17:29:02 by achubuko         ###   ########.fr        #
+#    Updated: 2023/12/07 19:30:21 by achubuko         ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
 NAME=rush-02
-_CFLAGS = -Wall -Wextra -Werror
+_CFLAGS = -Wall -Wextra -fsanitize=address
 CFLAGS = -g
 CFLAGS := $(_CFLAGS) $(CFLAGS)
 #####################################
@@ -20,7 +20,7 @@ CFLAGS := $(_CFLAGS) $(CFLAGS)
 
 # all: default rule
 # norme prerequisite is not mandatory
-all: $(NAME) norme
+all: $(NAME)
 
 # clean: Delete *.o for project and libraries
 clean:

ex00/dict_struct.c

@@ -0,0 +1,39 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   dict_struct.c                                      :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: achubuko <marvin@42.fr>                    +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2023/12/03 20:35:11 by achubuko          #+#    #+#             */
+/*   Updated: 2023/12/03 23:07:41 by achubuko         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+#include "dict_struct.h"
+
+t_dict	*dict_create(void)
+{
+	t_dict	*d;
+
+	d = malloc(sizeof(t_dict));
+	d->size = 0;
+	return (d);
+}
+
+void	dict_destroy(t_dict *dict)
+{
+	free(dict);
+}
+
+void	dict_update(t_dict *d, char *path)
+{
+}
+
+t_dict	*dict_create_default(char *path)
+{
+	t_dict	*d;
+
+	d = dict_create();
+	dict_update(d, path);
+	return (d);
+}

ex00/dict_struct.h

@@ -0,0 +1,34 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   dict_struct.h                                      :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: achubuko <marvin@42.fr>                    +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2023/12/03 20:36:01 by achubuko          #+#    #+#             */
+/*   Updated: 2023/12/03 22:20:58 by achubuko         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+#ifndef DICT_STRUCT_H
+# define DICT_STRUCT_H
+# include <stdlib.h>
+
+typedef struct s_dictitem
+{
+	unsigned int		num_significant;
+	unsigned int		num_base;
+	char				*text;
+}	t_dictitem;
+
+typedef struct s_dict
+{
+	int			size;
+	t_dictitem	dict[42];
+}	t_dict;
+
+t_dict	*dict_create_default(char *path);
+void	dict_update(t_dict *d, char *path);
+void	dict_destroy(t_dict *dict);
+void	dict_init_default(t_dict *d, char *path);
+t_dict	*dict_create(void);
+#endif

ex00/digits_to_words.c

@@ -13,4 +13,5 @@
 
 void	print_digit_words(char *str)
 {
+    ///TODO:
 }

ex00/ft_open.c

@@ -9,6 +9,7 @@
 /*   Updated: 2023/12/03 23:36:29 by achubuko         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
+
 #include "ft_open.h"
 
 t_file	*ft_open(char *path)
@@ -45,7 +46,7 @@ void	ft_growbuffer(t_file *f, ssize_t grow)
 		cur[pos] = 0;
 		pos++;
 	}
-	free(prev);
+	// free(prev);
 	f->buffer = cur;
 }
 

ex00/ft_open.h

@@ -0,0 +1,30 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   ft_open.h                                          :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: achubuko <marvin@42.fr>                    +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2023/12/03 19:51:40 by achubuko          #+#    #+#             */
+/*   Updated: 2023/12/03 23:14:56 by achubuko         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+#ifndef FT_OPEN_H
+# define FT_OPEN_H
+# include <unistd.h>
+# include <fcntl.h>
+# include <stdlib.h>
+
+typedef struct s_file
+{
+	int			descriptor;
+	char		*read_window;
+	size_t		read_window_cursor;
+	size_t		read_window_size;
+	size_t		read_size;
+	char		*buffer;
+	size_t		buffer_size;
+}	t_file;
+t_file	*ft_open(char *path);
+char	*ft_dispence_line(t_file *f);
+#endif

ex00/main.c

@@ -41,6 +41,13 @@ int	main(int argc, char **argv)
 	if (argc == 3)
 		dict_update(d, argv[2]);
 	chk = invalid_arg_num(argv[1]);
+
+	t_file *file = ft_open(argv[1]);
+
+	ft_buffer_line(file);
+
+	printf("%s\n", file->buffer);
+
 	if (!chk)
 		print_digit_words(argv[1]);
 	else

ex00/main.h

@@ -16,4 +16,6 @@
 # include "digits_to_words.h"
 # include "ft_utils.h"
 # include "dict_struct.h"
+#include "ft_open.h"
+
 #endif

tests/test_ft_open.c

@@ -0,0 +1,40 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   test_ft_utils.c                                    :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: achubuko <marvin@42.fr>                    +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2023/12/03 22:39:20 by achubuko          #+#    #+#             */
+/*   Updated: 2023/12/03 22:50:28 by achubuko         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "unity.h"
+#include "ft_open.h"
+
+t_file	*g_f;
+
+void	setUp(void)
+{
+
+	g_f = ft_open("test_ft_open.txt");
+}
+
+void	tearDown(void)
+{
+	close(g_f->descriptor);
+	free(g_f);
+}
+
+void	test_ft_dispence_line_once(void)
+{
+	TEST_ASSERT_EQUAL_STRING("hello World!", ft_dispence_line(g_f));
+}
+
+int	main(void)
+{
+	UNITY_BEGIN();
+	RUN_TEST(test_ft_dispence_line_once);
+	return (UNITY_END());
+}