[ERROR] Uploading all files, computer stops

Author: ColColty

lib/my/my_putstr.c

@@ -12,5 +12,5 @@ int my_strlen(char const *str);
 int my_putstr(char const *str, int len)
 {
     write(1, str, len);
-    return (0);
+    return (len);
 }

main.c

@@ -9,6 +9,7 @@ int fs_open_file(char const *file_path);
 
 int main(int argc, char **argv)
 {
-    fs_open_file(argv[1]);
+    if (fs_open_file(argv[1]))
+        return (84);
     return (0);
 }

src/bsq.c

@@ -44,16 +44,14 @@ void buff_to_str(char *str)
             j = 0;
             i++;
         }
-        file[k][j] = str[i];
-        j++;
+        file[k][j++] = str[i];
     }
-    k++;
-    file[k] = NULL;
+    file[++k] = NULL;
     free(str);
     find_the_square(file);
 }
 
-void error_handler(char *str)
+int error_handler(char *str)
 {
     int i = 0;
     int j = 0;
@@ -62,13 +60,14 @@ void error_handler(char *str)
 
     for (i; str[i] != '\n'; i++)
         if (str[i] > 57 || str[i] < 48)
-            exit(84);
+            return (84);
     if (i == 0)
-        exit(84);
+        return (84);
     i++;
     for (j = i; str[j] != '\0'; j++)
         if (str[j] != '.' && str[j] != 'o' && str[j] != '\n')
-            exit(84);
+            return (84);
+    return (0);
 }
 
 int fs_open_file(char const *file_path)
@@ -89,7 +88,8 @@ int fs_open_file(char const *file_path)
     read(fd, buffer, sd.st_size);
     close(fd);
     buffer[sd.st_size - 1] = '\0';
-    error_handler(buffer);
+    if (error_handler(buffer))
+        return (84);
     buff_to_str(buffer);
     return (0);
 }

src/find_the_square.c

@@ -7,20 +7,21 @@
 
 #include "my.h"
 
-void squaring_map(square_t square, char **tab, int x, int y)
+void squaring_map(char **tab, int x, int y)
 {
-    if (tab[y - 1][x] <= tab[y - 1][x - 1]
-    && tab[y - 1][x] <= tab[y][x - 1])
-        tab[y][x] = tab[y - 1][x] + 1;
-    if (tab[y - 1][x - 1] <= tab[y - 1][x]
-    && tab[y - 1][x - 1] <= tab[y][x - 1])
-        tab[y][x] = tab[y - 1][x - 1] + 1;
-    if (tab[y][x - 1] <= tab[y - 1][x - 1]
-    && tab[y][x - 1] <= tab[y - 1][x])
-        tab[y][x] = tab[y][x - 1] + 1;
+    int up = tab[y - 1][x];
+    int up_left = tab[y - 1][x - 1];
+    int left = tab[y][x - 1];
+
+    if (up <= up_left && up <= left)
+        tab[y][x] = up + 1;
+    if (up_left <= up && up_left <= left)
+        tab[y][x] = up_left + 1;
+    if (left <= up_left && left <= up)
+        tab[y][x] = left + 1;
 }
 
-void first_lines(square_t square, char **tab)
+void first_lines(char **tab)
 {
     int x = 0;
     int y = 0;
@@ -83,13 +84,13 @@ void find_the_square(char **tab)
     int x = 1;
     square_t square = {1, 0, 0};
 
-    first_lines(square, tab);
+    first_lines(tab);
     for (y = 1; tab[y] != 0; y++)
         for (x = 1; tab[y][x] != '\0'; x++)
             if (tab[y][x] == 'o')
                 tab[y][x] = 1;
             else
-                squaring_map(square, tab, x, y);
+                squaring_map(tab, x, y);
     find_biggest(square, tab);
     for (y = 0; tab[y] != 0; y++)
         free(tab[y]);

tests/test_out.c

@@ -21,7 +21,48 @@ Test(fs_open_file, test01, .init = redirect_all_std)
     cr_assert_stdout_eq_str("xxxx.o\nxxxx.o\nxxxxo.\nxxxx.o\no...o.\n");
 }
 
-Test(fs_open_file, test02, .init = redirect_all_std)
+Test(fs_open_file, test_a_simple_box, .init = redirect_all_std)
 {
-    fs_open_file("map3.txt");
+    fs_open_file("mouli_maps/intermediate_map_one_empty_box");
+    cr_assert_stdout_eq_str("x\n");
+}
+
+Test(error_handler, test_unexisting_map, .init = redirect_all_std)
+{
+    int ret;
+
+    ret = fs_open_file("map3.txt");
+    cr_assert_eq(84, ret);
+}
+
+Test(error_handler, test_without_line_number, .init = redirect_all_std)
+{
+    int ret;
+
+    ret = fs_open_file("mouli_maps/maps_without_line_number");
+    cr_assert_eq(84, ret);
+}
+
+Test(error_handler, test_wihtout_number_in_line_number, .init = redirect_all_std)
+{
+    int ret;
+
+    ret = fs_open_file("mouli_maps/maps_without_number_in_first_line");
+    cr_assert_eq(84, ret);
+}
+
+Test(error_handler, test_with_a_letter_in_number_field, .init = redirect_all_std)
+{
+    int ret;
+
+    ret = fs_open_file("mouli_maps/maps_with_letter_in_number_field");
+    cr_assert_eq(84, ret);
+}
+
+Test(error_handler, test_a_letter_in_map, .init = redirect_all_std)
+{
+    int ret;
+
+    ret = fs_open_file("mouli_maps/map_with_other_character");
+    cr_assert_eq(84, ret);
 }