TP 13 exo1: Implement a FIXME on array dynamic resizing

[TD_C.git] / TP_13 / exo1 / lib / io.c

diff --git a/TP_13/exo1/lib/io.c b/TP_13/exo1/lib/io.c
index e5a300070d24305638d8f140b866b480950a93d6..b0a66a0fb1b14f4cc821a475c0a8558e9c90a44d 100644 (file)
--- a/TP_13/exo1/lib/io.c
+++ b/TP_13/exo1/lib/io.c
@@ -1,9 +1,9 @@
+#include <stdlib.h>
 #include <stdio.h>
 #include <stdbool.h>
 
 #include "io.h"
 #include "array.h"
-#include "utils.h"
 
 int prompt_value(const char* msg, int* result) {
     puts(msg);
@@ -15,10 +15,10 @@ int* prompt_array(int array[], unsigned* size) {
     int errno = prompt_value("Taille du tableau?", (int*)size);
     array = create_tab(array, *size);
     for (unsigned i = 0; i < *size; i++) {
-       errno += prompt_value("Valeur?", &array[i]);
+        errno += prompt_value("Valeur?", &array[i]);
+        /* error might have occured */
+        handle_prompt_error(errno);
     }
-    /* error might have occured */
-    handle_prompt_error(errno);
     return array;
 }
 
@@ -102,12 +102,25 @@ void do_resize(int array[], unsigned* old_size) {
 
     errno = prompt_value("\nNouvelle taille?", (int*)&new_size);
     handle_prompt_error(errno);
-    /* FIXME: one should able the set the array new content if new_size > *old_size 
-     * for now, new values are zeroed */
     array = resize_tab(array, *old_size, new_size);
+    if (new_size > *old_size) {
+        printf("Saisie des valeurs supplementaires du tableau\n");
+        for (unsigned i = *old_size; i < new_size; i++) {
+            errno += prompt_value("Valeur?", &array[i]);
+            handle_prompt_error(errno);
+        }
+    }
     *old_size = new_size;
 }
 
+void handle_prompt_error(int errno) {
+    if (errno != 0) {
+        printf("\nMerci de saisir un nombre entier, exiting\n");
+        /* it's somewhat violent but better than looping forever */
+        exit(EXIT_FAILURE);
+    }
+}
+
 void display_array(int array[], unsigned size) {
     if (array != NULL) {
         printf("\n--array begin--\n");