Refactor: fl_console_parameter_to_string_dynamic_directory() to f_path_directory_clea...

I decided to improve the mentioned function and realized that it could be further generalized and move into the f_path project.
There is nothing else in fl_console and as such the fl_console project is entirely removed.

diff --git a/build/level_1/settings b/build/level_1/settings
index 2fc1500f033b23ea9a61887b2401ab76a4a3b32e..54e1995bb6e7c23136922056896a7ff14724a9bf 100644 (file)
--- a/build/level_1/settings
+++ b/build/level_1/settings
@@ -25,14 +25,14 @@ build_libraries-level -lfll_0
 build_libraries-level_threadless -lfll_0
 build_libraries_shared
 build_libraries_static
-build_sources_library console.c control_group.c conversion.c private-conversion.c directory.c directory-common.c private-directory.c environment.c private-fss.c fss_basic.c fss_basic_list.c fss_embedded_list.c fss_extended.c fss_extended_list.c iki.c print.c print-common.c private-print.c signal.c string.c private-string.c utf.c private-utf.c utf_file.c private-utf_file.c
+build_sources_library control_group.c conversion.c private-conversion.c directory.c private-directory.c environment.c private-fss.c fss_basic.c fss_basic_list.c fss_embedded_list.c fss_extended.c fss_extended_list.c iki.c print.c print-common.c private-print.c signal.c string.c private-string.c utf.c private-utf.c utf_file.c private-utf_file.c
 build_sources_library-level
 build_sources_library_shared
 build_sources_library_static
 build_sources_program
 build_sources_program_shared
 build_sources_program_static
-build_sources_headers console.h control_group.h conversion.h directory.h directory-common.h environment.h execute.h execute-common.h fss.h fss_basic.h fss_basic_list.h fss_embedded_list.h fss_extended.h fss_extended_list.h iki.h print.h print-common.h signal.h signal-common.h string.h utf.h utf_file.h
+build_sources_headers control_group.h conversion.h directory.h directory-common.h environment.h execute.h execute-common.h fss.h fss_basic.h fss_basic_list.h fss_embedded_list.h fss_extended.h fss_extended_list.h iki.h print.h print-common.h signal.h signal-common.h string.h utf.h utf_file.h
 build_sources_headers-level
 build_sources_headers_shared
 build_sources_headers_static

diff --git a/build/monolithic/settings b/build/monolithic/settings
index 8ff08998a6783aad29c666f0800c777681feb841..4b5748333c361c9003bed3b1025a22c62881fc55 100644 (file)
--- a/build/monolithic/settings
+++ b/build/monolithic/settings
@@ -25,14 +25,14 @@ build_libraries-monolithic
 build_libraries-monolithic_threadless
 build_libraries_shared
 build_libraries_static
-build_sources_library level_0/account.c level_0/private-account.c level_0/capability.c level_0/color.c level_0/color-common.c level_0/console.c level_0/console-common.c level_0/control_group.c level_0/control_group-common.c level_0/conversion.c level_0/conversion-common.c level_0/private-conversion.c level_0/directory.c level_0/private-directory.c level_0/environment.c level_0/private-environment.c level_0/execute.c level_0/file.c level_0/file-common.c level_0/private-file.c level_0/fss.c level_0/private-fss.c level_0/fss-common.c level_0/fss_named.c level_0/fss_nest.c level_0/fss_set.c level_0/iki.c level_0/iki-common.c level_0/private-iki.c level_0/limit.c level_0/memory.c level_0/memory_structure.c level_0/private-memory.c level_0/path.c level_0/path-common.c level_0/private-path.c level_0/pipe.c level_0/print.c level_0/print_to.c level_0/print-common.c level_0/private-print.c level_0/private-print_to.c level_0/serialize.c level_0/serialize-common.c level_0/private-serialize.c level_0/signal.c level_0/socket.c level_0/status_string.c level_0/string.c level_0/string-common.c level_0/private-string.c level_0/string_dynamic.c level_0/string_map.c level_0/string_quantity.c level_0/string_range.c level_0/string_triple.c level_0/type_array.c level_0/private-type_array.c level_0/utf.c level_0/utf-common.c level_0/utf_dynamic.c level_0/utf_map.c level_0/utf_string.c level_0/utf_triple.c level_0/private-utf.c level_0/private-utf-is_unassigned.c level_0/private-utf_string.c level_1/console.c level_1/control_group.c level_1/conversion.c level_1/private-conversion.c level_1/directory.c level_1/directory-common.c level_1/private-directory.c level_1/environment.c level_1/private-fss.c level_1/fss_basic.c level_1/fss_basic_list.c level_1/fss_embedded_list.c level_1/fss_extended.c level_1/fss_extended_list.c level_1/iki.c level_1/print.c level_1/print-common.c level_1/private-print.c level_1/signal.c level_1/string.c level_1/private-string.c level_1/utf.c level_1/private-utf.c level_1/utf_file.c level_1/private-utf_file.c level_2/control_group.c level_2/error.c level_2/error-common.c level_2/private-error.c level_2/execute.c level_2/private-execute.c level_2/file.c level_2/private-file.c level_2/fss.c level_2/private-fss.c level_2/fss_basic.c level_2/fss_basic_list.c level_2/fss_embedded_list.c level_2/fss_extended.c level_2/fss_extended_list.c level_2/fss_payload.c level_2/fss_status_string.c level_2/iki.c level_2/private-iki.c level_2/path.c level_2/print.c level_2/program.c level_2/program-common.c level_2/status_string.c
+build_sources_library level_0/account.c level_0/private-account.c level_0/capability.c level_0/color.c level_0/color-common.c level_0/console.c level_0/console-common.c level_0/control_group.c level_0/control_group-common.c level_0/conversion.c level_0/conversion-common.c level_0/private-conversion.c level_0/directory.c level_0/private-directory.c level_0/environment.c level_0/private-environment.c level_0/execute.c level_0/file.c level_0/file-common.c level_0/private-file.c level_0/fss.c level_0/private-fss.c level_0/fss-common.c level_0/fss_named.c level_0/fss_nest.c level_0/fss_set.c level_0/iki.c level_0/iki-common.c level_0/private-iki.c level_0/limit.c level_0/memory.c level_0/memory_structure.c level_0/private-memory.c level_0/path.c level_0/path-common.c level_0/private-path.c level_0/pipe.c level_0/print.c level_0/print_to.c level_0/print-common.c level_0/private-print.c level_0/private-print_to.c level_0/serialize.c level_0/serialize-common.c level_0/private-serialize.c level_0/signal.c level_0/socket.c level_0/status_string.c level_0/string.c level_0/string-common.c level_0/private-string.c level_0/string_dynamic.c level_0/string_map.c level_0/string_quantity.c level_0/string_range.c level_0/string_triple.c level_0/type_array.c level_0/private-type_array.c level_0/utf.c level_0/utf-common.c level_0/utf_dynamic.c level_0/utf_map.c level_0/utf_string.c level_0/utf_triple.c level_0/private-utf.c level_0/private-utf-is_unassigned.c level_0/private-utf_string.c level_1/control_group.c level_1/conversion.c level_1/private-conversion.c level_1/directory.c level_1/private-directory.c level_1/environment.c level_1/private-fss.c level_1/fss_basic.c level_1/fss_basic_list.c level_1/fss_embedded_list.c level_1/fss_extended.c level_1/fss_extended_list.c level_1/iki.c level_1/print.c level_1/print-common.c level_1/private-print.c level_1/signal.c level_1/string.c level_1/private-string.c level_1/utf.c level_1/private-utf.c level_1/utf_file.c level_1/private-utf_file.c level_2/control_group.c level_2/error.c level_2/error-common.c level_2/private-error.c level_2/execute.c level_2/private-execute.c level_2/file.c level_2/private-file.c level_2/fss.c level_2/private-fss.c level_2/fss_basic.c level_2/fss_basic_list.c level_2/fss_embedded_list.c level_2/fss_extended.c level_2/fss_extended_list.c level_2/fss_payload.c level_2/fss_status_string.c level_2/iki.c level_2/private-iki.c level_2/path.c level_2/print.c level_2/program.c level_2/program-common.c level_2/status_string.c
 build_sources_library-monolithic level_0/thread.c level_0/private-thread.c
 build_sources_library_shared
 build_sources_library_static
 build_sources_program
 build_sources_program_shared
 build_sources_program_static
-build_sources_headers level_0/account.h level_0/account-common.h level_0/capability.h level_0/capability-common.h level_0/color.h level_0/color-common.h level_0/console.h level_0/console-common.h level_0/control_group.h level_0/control_group-common.h level_0/conversion.h level_0/conversion-common.h level_0/directory.h level_0/directory_type.h level_0/directory-common.h level_0/environment.h level_0/environment-common.h level_0/execute.h level_0/execute-common.h level_0/file.h level_0/file-common.h level_0/fss.h level_0/fss-common.h level_0/fss_comment.h level_0/fss_delimit.h level_0/fss_named.h level_0/fss_nest.h level_0/fss_quote.h level_0/fss_set.h level_0/iki.h level_0/iki-common.h level_0/limit.h level_0/limit-common.h level_0/memory.h level_0/memory_structure.h level_0/memory-common.h level_0/path.h level_0/path-common.h level_0/pipe.h level_0/print.h level_0/print_to.h level_0/print-common.h level_0/serialize.h level_0/serialize-common.h level_0/signal.h level_0/signal-common.h level_0/socket.h level_0/socket-common.h level_0/status.h level_0/status_string.h level_0/string.h level_0/string-common.h level_0/string_dynamic.h level_0/string_map.h level_0/string_quantity.h level_0/string_range.h level_0/string_triple.h level_0/type.h level_0/type_array.h level_0/type_array-common.h level_0/utf.h level_0/utf-common.h level_0/utf_dynamic.h level_0/utf_map.h level_0/utf_string.h level_0/utf_triple.h level_1/console.h level_1/control_group.h level_1/conversion.h level_1/directory.h level_1/directory-common.h level_1/environment.h level_1/execute.h level_1/execute-common.h level_1/fss.h level_1/fss_basic.h level_1/fss_basic_list.h level_1/fss_embedded_list.h level_1/fss_extended.h level_1/fss_extended_list.h level_1/iki.h level_1/print.h level_1/print-common.h level_1/signal.h level_1/signal-common.h level_1/string.h level_1/utf.h level_1/utf_file.h level_2/control_group.h level_2/error.h level_2/error-common.h level_2/execute.h level_2/file.h level_2/fss.h level_2/fss_basic.h level_2/fss_basic_list.h level_2/fss_embedded_list.h level_2/fss_extended.h level_2/fss_extended_list.h level_2/fss_payload.h level_2/fss_status_string.h level_2/iki.h level_2/path.h level_2/print.h level_2/program.h level_2/program-common.h level_2/status_string.h
+build_sources_headers level_0/account.h level_0/account-common.h level_0/capability.h level_0/capability-common.h level_0/color.h level_0/color-common.h level_0/console.h level_0/console-common.h level_0/control_group.h level_0/control_group-common.h level_0/conversion.h level_0/conversion-common.h level_0/directory.h level_0/directory_type.h level_0/directory-common.h level_0/environment.h level_0/environment-common.h level_0/execute.h level_0/execute-common.h level_0/file.h level_0/file-common.h level_0/fss.h level_0/fss-common.h level_0/fss_comment.h level_0/fss_delimit.h level_0/fss_named.h level_0/fss_nest.h level_0/fss_quote.h level_0/fss_set.h level_0/iki.h level_0/iki-common.h level_0/limit.h level_0/limit-common.h level_0/memory.h level_0/memory_structure.h level_0/memory-common.h level_0/path.h level_0/path-common.h level_0/pipe.h level_0/print.h level_0/print_to.h level_0/print-common.h level_0/serialize.h level_0/serialize-common.h level_0/signal.h level_0/signal-common.h level_0/socket.h level_0/socket-common.h level_0/status.h level_0/status_string.h level_0/string.h level_0/string-common.h level_0/string_dynamic.h level_0/string_map.h level_0/string_quantity.h level_0/string_range.h level_0/string_triple.h level_0/type.h level_0/type_array.h level_0/type_array-common.h level_0/utf.h level_0/utf-common.h level_0/utf_dynamic.h level_0/utf_map.h level_0/utf_string.h level_0/utf_triple.h level_1/control_group.h level_1/conversion.h level_1/directory.h level_1/directory-common.h level_1/environment.h level_1/execute.h level_1/execute-common.h level_1/fss.h level_1/fss_basic.h level_1/fss_basic_list.h level_1/fss_embedded_list.h level_1/fss_extended.h level_1/fss_extended_list.h level_1/iki.h level_1/print.h level_1/print-common.h level_1/signal.h level_1/signal-common.h level_1/string.h level_1/utf.h level_1/utf_file.h level_2/control_group.h level_2/error.h level_2/error-common.h level_2/execute.h level_2/file.h level_2/fss.h level_2/fss_basic.h level_2/fss_basic_list.h level_2/fss_embedded_list.h level_2/fss_extended.h level_2/fss_extended_list.h level_2/fss_payload.h level_2/fss_status_string.h level_2/iki.h level_2/path.h level_2/print.h level_2/program.h level_2/program-common.h level_2/status_string.h
 build_sources_headers-monolithic level_0/thread.h level_0/thread-common.h
 build_sources_headers_shared
 build_sources_headers_static

diff --git a/level_0/f_path/c/path.c b/level_0/f_path/c/path.c
index bad3471d091ac0557476c20e315dbd0590a1b7f3..f3bcb6f72901e053993cb13e610c8c66fbe7de17 100644 (file)
--- a/level_0/f_path/c/path.c
+++ b/level_0/f_path/c/path.c
@@ -92,6 +92,73 @@ extern "C" {
   }
 #endif // _di_f_path_current_
 
+#ifndef _f_path_directory_cleanup_
+  f_status_t f_path_directory_cleanup(const f_string_static_t argument, f_string_dynamic_t *directory) {
+    #ifndef _di_level_0_parameter_checking_
+      if (!directory) return F_status_set_error(F_parameter);
+    #endif // _di_level_0_parameter_checking_
+
+    const f_array_length_t used_original = argument.used;
+
+    directory->used = 0;
+
+    if (!used_original) {
+      return F_none;
+    }
+
+    // Ensure enough space is available for termiting slash and terminating NULL.
+    if (argument.string[argument.used - 1] == f_path_separator_s.string[0]) {
+      const f_status_t status = f_string_dynamic_increase_by(used_original + 1, directory);
+      if (F_status_is_error(status)) return status;
+    }
+    else {
+      const f_status_t status = f_string_dynamic_increase_by(used_original + 2, directory);
+      if (F_status_is_error(status)) return status;
+    }
+
+    if (used_original == 1) {
+      directory->string[0] = argument.string[0];
+
+      return F_none;
+    }
+
+    f_array_length_t i = 0;
+    f_array_length_t j = 0;
+
+    do {
+      if (argument.string[i] == f_path_separator_s.string[0]) {
+        directory->string[directory->used++] = f_path_separator_s.string[0];
+
+        do {
+          ++i;
+        } while (i < used_original && (argument.string[i] == f_path_separator_s.string[0] || !argument.string[i]));
+      }
+      else {
+        j = i + 1;
+
+        while (j < used_original && argument.string[j] != f_path_separator_s.string[0]) {
+          ++j;
+        } // while
+
+        // Use memcpy() to take advantage of its optimized copy behaviors whenever possible.
+        memcpy(directory->string + directory->used, argument.string + i, j - i);
+
+        directory->used += j - i;
+        i = j;
+      }
+
+    } while (i < used_original);
+
+    if (directory->string[directory->used - 1] != f_path_separator_s.string[0]) {
+      directory->string[directory->used++] = f_path_separator_s.string[0];
+    }
+
+    directory->string[directory->used++] = 0;
+
+    return F_none;
+  }
+#endif // _f_path_directory_cleanup_
+
 #ifndef _di_f_path_is_
   f_status_t f_path_is(const f_string_t path, const f_array_length_t length) {
 

diff --git a/level_0/f_path/c/path.h b/level_0/f_path/c/path.h
index 030457efd1395fe5e599c3f595f2fb6caf5136c0..b862b7c8433f3ff5ecef6d87b5ca4406197e18e4 100644 (file)
--- a/level_0/f_path/c/path.h
+++ b/level_0/f_path/c/path.h
@@ -119,6 +119,35 @@ extern "C" {
 #endif // _di_f_path_current_
 
 /**
+ * Ensure that the given directory path string doesn't have redundant path separators.
+ *
+ * The directory path is not validated to exist.
+ *
+ * The path to a directory has the following very basic cleanup operations performed:
+ *   - Ensures that the directory always ends in a '/'.
+ *   - Ensures that multiple consecutive '/' in the path are reduced to a single '/'.
+ *   - Ensures that multiple consecutive '/' following './' is reduced to only './' ('.////' would become './').
+ *   - Ensures that multiple consecutive '/' following '../' is reduced to only '../' ('..////' would become '../').
+ *
+ * The directory string will be NULL terminated after directory.used.
+ *
+ * @param source
+ *   The south path to cleanup.
+ * @param directory
+ *   The cleaned up directory string.
+ *   The directory string is replaced by this function.
+ *
+ * @return
+ *   F_none on success.
+ *
+ *   F_memory_not (with error bit) on out of memory.
+ *   F_parameter (with error bit) if a parameter is invalid.
+ */
+#ifndef _f_path_directory_cleanup_
+  extern f_status_t f_path_directory_cleanup(const f_string_static_t source, f_string_dynamic_t *directory);
+#endif // _f_path_directory_cleanup_
+
+/**
  * Identify whether or not a string represents a path string.
  *
  * This does not check to see if the path exists or not.

diff --git a/level_1/fl_console/c/console.c b/level_1/fl_console/c/console.c
deleted file mode 100644 (file)
index b844761..0000000
--- a/level_1/fl_console/c/console.c
+++ /dev/null
@@ -1,168 +0,0 @@
-#include "console.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef _fl_console_parameter_to_string_dynamic_directory_
-  f_status_t fl_console_parameter_to_string_dynamic_directory(const f_string_static_t argument, f_string_dynamic_t *directory) {
-    #ifndef _di_level_1_parameter_checking_
-      if (!directory) return F_status_set_error(F_parameter);
-    #endif // _di_level_1_parameter_checking_
-
-    f_array_length_t length = argument.used;
-
-    if (!length) {
-      directory->used = 0;
-
-      return F_none;
-    }
-
-    f_status_t status = F_none;
-
-    if (length > 1) {
-      while (length > 1 && argument.string[length - 1] == f_path_separator_s.string[0]) {
-        --length;
-      } // while
-
-      if (argument.string[0] == f_path_separator_s.string[0]) {
-        f_array_length_t begin = 1;
-
-        while (begin < length && argument.string[begin] == f_path_separator_s.string[0]) {
-          ++begin;
-        } // while
-
-        length -= begin;
-        directory->used = 0;
-
-        if (length) {
-          directory->used = 0;
-
-          status = f_string_dynamic_increase_by(length + 3, directory);
-          if (F_status_is_error(status)) return status;
-
-          memcpy(directory->string + 1, argument.string + begin, length);
-
-          directory->string[0] = f_path_separator_s.string[0];
-          directory->string[length + 1] = f_path_separator_s.string[0];
-          directory->string[length + 2] = 0;
-          directory->used = length + 2;
-        }
-        else {
-          status = f_string_dynamic_increase_by(2, directory);
-          if (F_status_is_error(status)) return status;
-
-          directory->string[0] = f_path_separator_s.string[0];
-          directory->string[length + 1] = 0;
-          directory->used = length + 1;
-        }
-      }
-      else if (length > 3 && argument.string[0] == f_path_separator_current_s.string[0] && argument.string[1] == f_path_separator_current_s.string[0] && argument.string[2] == f_path_separator_s.string[0]) {
-        f_array_length_t begin = 3;
-
-        while (begin < length && argument.string[begin] == f_path_separator_s.string[0]) {
-          ++begin;
-        } // while
-
-        length -= begin;
-        directory->used = 0;
-
-        if (length) {
-          status = f_string_dynamic_increase_by(length + 5, directory);
-          if (F_status_is_error(status)) return status;
-
-          memcpy(directory->string + 3, argument.string + begin, length);
-
-          directory->string[0] = f_path_separator_current_s.string[0];
-          directory->string[1] = f_path_separator_current_s.string[0];
-          directory->string[2] = f_path_separator_s.string[0];
-          directory->string[length] = f_path_separator_s.string[0];
-          directory->string[length + 4] = 0;
-          directory->used = length + 4;
-        }
-        else {
-          status = f_string_dynamic_increase_by(5, directory);
-          if (F_status_is_error(status)) return status;
-
-          directory->string[0] = f_path_separator_current_s.string[0];
-          directory->string[1] = f_path_separator_current_s.string[0];
-          directory->string[2] = f_path_separator_s.string[0];
-          directory->string[3] = f_path_separator_s.string[0];
-          directory->string[4] = 0;
-          directory->used = 4;
-        }
-      }
-      else if (length > 2 && argument.string[0] == f_path_separator_current_s.string[0] && argument.string[1] == f_path_separator_s.string[0]) {
-        f_array_length_t begin = 2;
-
-        while (begin < length && argument.string[begin] == f_path_separator_s.string[0]) {
-          ++begin;
-        } // while
-
-        length -= begin;
-        directory->used = 0;
-
-        if (length) {
-          status = f_string_dynamic_increase_by(length + 4, directory);
-          if (F_status_is_error(status)) return status;
-
-          memcpy(directory->string + 2, argument.string + begin, length);
-
-          directory->string[0] = f_path_separator_current_s.string[0];
-          directory->string[1] = f_path_separator_s.string[0];
-          directory->string[length] = f_path_separator_s.string[0];
-          directory->string[length + 3] = 0;
-          directory->used = length + 3;
-        }
-        else {
-          status = f_string_dynamic_increase_by(4, directory);
-          if (F_status_is_error(status)) return status;
-
-          directory->string[0] = f_path_separator_current_s.string[0];
-          directory->string[1] = f_path_separator_s.string[0];
-          directory->string[2] = f_path_separator_s.string[0];
-          directory->string[3] = 0;
-          directory->used = 3;
-        }
-      }
-      else {
-        directory->used = 0;
-
-        status = f_string_dynamic_increase_by(length + 2, directory);
-        if (F_status_is_error(status)) return status;
-
-        memcpy(directory->string, argument.string, length);
-
-        directory->string[length] = f_path_separator_s.string[0];
-        directory->string[length + 1] = 0;
-        directory->used = length + 1;
-      }
-    }
-    else if (argument.string[0] != f_path_separator_s.string[0]) {
-      directory->used = 0;
-
-      status = f_string_dynamic_increase_by(2, directory);
-      if (F_status_is_error(status)) return status;
-
-      directory->string[0] = f_path_separator_s.string[0];
-      directory->string[1] = 0;
-      directory->used = 1;
-    }
-    else {
-      directory->used = 0;
-
-      status = f_string_dynamic_increase_by(2, directory);
-      if (F_status_is_error(status)) return status;
-
-      directory->string[0] = argument.string[0];
-      directory->string[1] = 0;
-      directory->used = 1;
-    }
-
-    return F_none;
-  }
-#endif // _fl_console_parameter_to_string_dynamic_directory_
-
-#ifdef __cplusplus
-} // extern "C"
-#endif

diff --git a/level_1/fl_console/c/console.h b/level_1/fl_console/c/console.h
deleted file mode 100644 (file)
index 3fc7bfc..0000000
--- a/level_1/fl_console/c/console.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/**
- * FLL - Level 1
- *
- * Project: Console
- * API Version: 0.5
- * Licenses: lgpl-2.1-or-later
- *
- * Some console input/output commands.
- */
-#ifndef _FL_console_h
-#define _FL_console_h
-
-// libc include
-#include <limits.h>
-#include <string.h>
-#include <sys/stat.h>
-
-// FLL-0 includes.
-#include <fll/level_0/type.h>
-#include <fll/level_0/status.h>
-#include <fll/level_0/memory.h>
-#include <fll/level_0/string.h>
-#include <fll/level_0/utf.h>
-#include <fll/level_0/console.h>
-#include <fll/level_0/conversion.h>
-#include <fll/level_0/path.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * Validate and convert a console parameter values argument to a file directory in a dynamic string.
- *
- * The directory path is validated to exist.
- *
- * The path to a directy has the following very basic cleanup operations performed:
- *   - Ensures that it always ends in a '/'.
- *   - Ensures that multiple '/' in front or multiple '/' at end of string is reduced to a single '/' in front and a single '/' at end.
- *   - Ensures that multiple '/' following './' at the start of the string is reduced to only './' ('.////' would become './').
- *   - Ensures that multiple '/' following '../' at the start of the string is reduced to only '../' ('..////' would become '../').
- *
- * The directory string will be NULL terminated after directory.used.
- *
- * This does not perform complex cleanup, such as '..///..///' to '../../'.
- *
- * The purpose of the cleanups is to ensure/enforce a consistent beginning and ending of the path strings.
- * These path strings can then, very simply, be checked to see how to join them with another string, such as a filename.
- *
- * @param argv
- *   The argument string expected to be a number.
- * @param directory
- *   The dynamically allocated processed directory string.
- *   The string will be replaced on success.
- *
- * @return
- *   F_none on success.
- *
- *   F_memory_not (with error bit) on out of memory.
- *   F_parameter (with error bit) if a parameter is invalid.
- */
-#ifndef _fl_console_parameter_to_string_dynamic_directory_
-  extern f_status_t fl_console_parameter_to_string_dynamic_directory(const f_string_static_t argument, f_string_dynamic_t *directory);
-#endif // _fl_console_parameter_to_string_dynamic_directory_
-
-#ifdef __cplusplus
-} // extern "C"
-#endif
-
-#endif // _FL_console_h

diff --git a/level_1/fl_console/data/build/defines b/level_1/fl_console/data/build/defines
deleted file mode 100644 (file)
index c665317..0000000
--- a/level_1/fl_console/data/build/defines
+++ /dev/null
@@ -1,2 +0,0 @@
-# fss-0000
-

diff --git a/level_1/fl_console/data/build/dependencies b/level_1/fl_console/data/build/dependencies
deleted file mode 100644 (file)
index 19ccf17..0000000
--- a/level_1/fl_console/data/build/dependencies
+++ /dev/null
@@ -1,10 +0,0 @@
-# fss-0000
-
-f_type
-f_status
-f_memory
-f_string
-f_utf
-f_console
-f_conversion
-f_path

diff --git a/level_1/fl_console/data/build/settings b/level_1/fl_console/data/build/settings
deleted file mode 100644 (file)
index a32797b..0000000
--- a/level_1/fl_console/data/build/settings
+++ /dev/null
@@ -1,75 +0,0 @@
-# fss-0001
-
-project_name fl_console
-
-version_major 0
-version_minor 5
-version_micro 8
-version_file micro
-version_target minor
-
-environment
-
-process_pre
-process_post
-
-modes individual
-modes_default individual
-
-build_compiler gcc
-build_indexer ar
-build_indexer_arguments rcs
-build_language c
-build_libraries -lc
-build_libraries-individual -lf_console -lf_conversion -lf_memory -lf_path -lf_string -lf_type_array -lf_utf
-build_libraries_shared
-build_libraries_static
-build_sources_library console.c
-build_sources_library_shared
-build_sources_library_static
-build_sources_program
-build_sources_program_shared
-build_sources_program_static
-build_sources_headers console.h
-build_sources_headers_shared
-build_sources_headers_static
-build_sources_script
-build_sources_setting
-build_script yes
-build_shared yes
-build_static no
-
-path_headers fll/level_1
-path_headers_preserve no
-path_library_script script
-path_library_shared shared
-path_library_static static
-path_program_script script
-path_program_shared shared
-path_program_static static
-path_sources
-path_standard yes
-
-search_exclusive yes
-search_shared yes
-search_static yes
-
-defines
-defines_library
-defines_library_shared
-defines_library_static
-defines_program
-defines_program_shared
-defines_program_static
-defines_static
-defines_shared
-
-flags -O2 -z now -g -fdiagnostics-color=always -Wno-logical-not-parentheses -Wno-logical-op-parentheses -Wno-parentheses
-flags_library -fPIC
-flags_library_shared
-flags_library_static
-flags_program -fPIE
-flags_program_shared
-flags_program_static
-flags_shared
-flags_static

diff --git a/level_3/byte_dump/c/byte_dump.h b/level_3/byte_dump/c/byte_dump.h
index 7bdcaec2f9bf29042c50aafcbf91c7495f2ba5df..37e4c61a274e856535e074f9a47b22cb22aa2091 100644 (file)
--- a/level_3/byte_dump/c/byte_dump.h
+++ b/level_3/byte_dump/c/byte_dump.h
@@ -36,7 +36,6 @@
 #include <fll/level_0/signal.h>
 
 // FLL-1 includes.
-#include <fll/level_1/console.h>
 #include <fll/level_1/conversion.h>
 #include <fll/level_1/print.h>
 #include <fll/level_1/string.h>

diff --git a/level_3/byte_dump/data/build/dependencies b/level_3/byte_dump/data/build/dependencies
index fa075534070aea21727be3fcc1013b9429cf073b..fd644c4bd56506fb2cfe58d09077cc6fe078cf9f 100644 (file)
--- a/level_3/byte_dump/data/build/dependencies
+++ b/level_3/byte_dump/data/build/dependencies
@@ -12,7 +12,6 @@ f_file
 f_pipe
 f_print
 f_signal
-fl_console
 fl_conversion
 fl_print
 fl_string

diff --git a/level_3/byte_dump/data/build/settings b/level_3/byte_dump/data/build/settings
index 9c8440d0a41a708b250a1c86a760107392ebf2c1..8181531073e2c7745a3e46799ca0625a966050f7 100644 (file)
--- a/level_3/byte_dump/data/build/settings
+++ b/level_3/byte_dump/data/build/settings
@@ -21,7 +21,7 @@ build_indexer ar
 build_indexer_arguments rcs
 build_language c
 build_libraries -lc
-build_libraries-individual -lfll_error -lfll_print -lfll_program -lfl_console -lfl_conversion -lfl_print -lfl_string -lf_color -lf_console -lf_conversion -lf_file -lf_memory -lf_path -lf_pipe -lf_print -lf_signal -lf_string -lf_type_array -lf_utf
+build_libraries-individual -lfll_error -lfll_print -lfll_program -lfl_conversion -lfl_print -lfl_string -lf_color -lf_console -lf_conversion -lf_file -lf_memory -lf_pipe -lf_print -lf_signal -lf_string -lf_type_array -lf_utf
 build_libraries-level -lfll_2 -lfll_1 -lfll_0
 build_libraries-monolithic -lfll
 build_libraries_shared

diff --git a/level_3/control/c/control.h b/level_3/control/c/control.h
index 281594a7ea9a7852c07190a8b18c1ef99e381243..7c2b6770a6361c920a4190719b50e034a466a5a8 100644 (file)
--- a/level_3/control/c/control.h
+++ b/level_3/control/c/control.h
@@ -33,7 +33,6 @@
 #include <fll/level_0/socket.h>
 
 // FLL-1 includes.
-#include <fll/level_1/console.h>
 #include <fll/level_1/fss.h>
 #include <fll/level_1/print.h>
 #include <fll/level_1/string.h>

diff --git a/level_3/control/data/build/dependencies b/level_3/control/data/build/dependencies
index dca69a23e6e0dff536c3dae19f48f45b07bdc039..0e9b310d373a7b6f8c454644d715d869075268ac 100644 (file)
--- a/level_3/control/data/build/dependencies
+++ b/level_3/control/data/build/dependencies
@@ -13,7 +13,6 @@ f_pipe
 f_print
 f_signal
 f_socket
-fl_console
 fl_fss
 fl_print
 fl_string

diff --git a/level_3/control/data/build/settings b/level_3/control/data/build/settings
index d763bddaf37317a6952e2cee4bc8f4a41bc1f531..0a5a10b5ad1a91fbd18188c787c5dd5415eb3949 100644 (file)
--- a/level_3/control/data/build/settings
+++ b/level_3/control/data/build/settings
@@ -21,7 +21,7 @@ build_indexer ar
 build_indexer_arguments rcs
 build_language c
 build_libraries -lc
-build_libraries-individual -lfll_error -lfll_fss -lfll_print -lfll_program -lfl_console -lfl_conversion -lfl_fss -lfl_print -lfl_string -lf_color -lf_console -lf_conversion -lf_file -lf_fss -lf_memory -lf_path -lf_pipe -lf_print -lf_signal -lf_socket -lf_status_string -lf_string -lf_type_array -lf_utf
+build_libraries-individual -lfll_error -lfll_fss -lfll_print -lfll_program -lfl_conversion -lfl_fss -lfl_print -lfl_string -lf_color -lf_console -lf_conversion -lf_file -lf_fss -lf_memory -lf_pipe -lf_print -lf_signal -lf_socket -lf_status_string -lf_string -lf_type_array -lf_utf
 build_libraries-level -lfll_2 -lfll_1 -lfll_0
 build_libraries-monolithic -lfll
 build_libraries_shared

diff --git a/level_3/controller/c/controller.h b/level_3/controller/c/controller.h
index a1569cb4f41db6ef9c22ed930f2bd3cd692d7510..f41d8304c8987a42761398b7cb3fddde52b6a7a9 100644 (file)
--- a/level_3/controller/c/controller.h
+++ b/level_3/controller/c/controller.h
@@ -63,7 +63,6 @@
 #include <fll/level_0/socket.h>
 
 // FLL-1 includes.
-#include <fll/level_1/console.h>
 #include <fll/level_1/control_group.h>
 #include <fll/level_1/environment.h>
 #include <fll/level_1/fss.h>

diff --git a/level_3/controller/data/build/dependencies b/level_3/controller/data/build/dependencies
index 79cc71f7f9a8cf3cf749e88f25be947ec43023e5..ddf1abe52f44b0e219f9b99d4e9c1e36d92c3036 100644 (file)
--- a/level_3/controller/data/build/dependencies
+++ b/level_3/controller/data/build/dependencies
@@ -24,7 +24,6 @@ f_print
 f_signal
 f_socket
 f_thread
-fl_console
 fl_control_group
 fl_conversion
 fl_environment

diff --git a/level_3/controller/data/build/settings b/level_3/controller/data/build/settings
index 86a5fc05d2b2284c8dc97cab929ab3198dd44210..8c472e53195bfd093c65004cc0bf839ca233eb23 100644 (file)
--- a/level_3/controller/data/build/settings
+++ b/level_3/controller/data/build/settings
@@ -22,7 +22,7 @@ build_indexer_arguments rcs
 build_language c
 build_libraries -lc -lcap
 build_libraries-individual -lfll_control_group -lfll_error -lfll_execute -lfll_fss -lfll_path -lfll_print -lfll_program
-build_libraries-individual -lfl_console -lfl_control_group -lfl_conversion -lfl_directory -lfl_environment -lfl_fss -lfl_iki -lfl_print -lfl_string
+build_libraries-individual -lfl_control_group -lfl_conversion -lfl_directory -lfl_environment -lfl_fss -lfl_iki -lfl_print -lfl_string
 build_libraries-individual -lf_account -lf_capability -lf_color -lf_console -lf_control_group -lf_conversion -lf_directory -lf_environment -lf_execute -lf_file -lf_fss -lf_iki -lf_limit -lf_memory -lf_path -lf_pipe -lf_print -lf_signal -lf_socket -lf_status_string -lf_string -lf_thread -lf_type_array -lf_utf
 build_libraries-level -lfll_2 -lfll_1 -lfll_0
 build_libraries-monolithic -lfll

diff --git a/level_3/fake/c/fake.h b/level_3/fake/c/fake.h
index d9087b579a815759129bbb23c219bd9cb1ee21e4..da4ef731a699918bd058f2fb970db6fc2f3bb351 100644 (file)
--- a/level_3/fake/c/fake.h
+++ b/level_3/fake/c/fake.h
@@ -70,7 +70,6 @@
 #include <fll/level_0/signal.h>
 
 // FLL-1 includes.
-#include <fll/level_1/console.h>
 #include <fll/level_1/conversion.h>
 #include <fll/level_1/directory.h>
 #include <fll/level_1/environment.h>

diff --git a/level_3/fake/c/private-fake-path_generate.c b/level_3/fake/c/private-fake-path_generate.c
index bc165011b9c2962a46f942f64bb240bdfa039cd7..bbfae4d8322d58928922bacd9b41fa70c50ce2a8 100644 (file)
--- a/level_3/fake/c/private-fake-path_generate.c
+++ b/level_3/fake/c/private-fake-path_generate.c
@@ -241,6 +241,8 @@ extern "C" {
 
         for (i = 0; i < 3; ++i) {
 
+          parameters_value[i]->used = 0;
+
           status = f_string_dynamic_append_nulless(main->path_work, parameters_value[i]);
 
           if (F_status_is_error(status)) {

diff --git a/level_3/fake/c/private-fake.c b/level_3/fake/c/private-fake.c
index 59dedc7b9e0f7bdf25f935dc548772604a2fee82..6abc2cc6ab91239404dc341bae1c6c2bd92740a1 100644 (file)
--- a/level_3/fake/c/private-fake.c
+++ b/level_3/fake/c/private-fake.c
@@ -375,6 +375,8 @@ extern "C" {
 
           const f_array_length_t index = main->parameters.array[parameters_id[i]].values.array[main->parameters.array[parameters_id[i]].values.used - 1];
 
+          parameters_value[i]->used = 0;
+
           status = f_string_dynamic_increase_by(main->parameters.arguments.array[index].used + 1, parameters_value[i]);
 
           if (F_status_is_error(status)) {
@@ -383,10 +385,10 @@ extern "C" {
             return status;
           }
 
-          status = fl_console_parameter_to_string_dynamic_directory(main->parameters.arguments.array[index], parameters_value[i]);
+          status = f_path_directory_cleanup(main->parameters.arguments.array[index], parameters_value[i]);
 
           if (F_status_is_error(status)) {
-            if (fll_error_print(main->error, F_status_set_fine(status), "fl_console_parameter_to_string_dynamic_directory", F_false) == F_known_not && main->error.verbosity != f_console_verbosity_quiet_e) {
+            if (fll_error_print(main->error, F_status_set_fine(status), "f_path_directory_cleanup", F_false) == F_known_not && main->error.verbosity != f_console_verbosity_quiet_e) {
               flockfile(main->error.to.stream);
 
               fl_print_format("%r%[%QFailed to process parameter '%]", main->error.to.stream, f_string_eol_s, main->error.context, main->error.prefix, main->error.context);

diff --git a/level_3/fake/data/build/dependencies b/level_3/fake/data/build/dependencies
index a588aea2f0e8b5b0c18a363c12840c2afdfcb956..618799c195abdcd0ea7b1c8388d59761efa7d6bc 100644 (file)
--- a/level_3/fake/data/build/dependencies
+++ b/level_3/fake/data/build/dependencies
@@ -20,7 +20,6 @@ f_iki
 f_path
 f_print
 f_signal
-fl_console
 fl_control_group
 fl_conversion
 fl_directory

diff --git a/level_3/fake/data/build/settings b/level_3/fake/data/build/settings
index 075f01aed71d8d625f3c89baa08b68ac520602ca..c7e1ab9d3ad7e414b4d80cfe5b1a9671fc39a08c 100644 (file)
--- a/level_3/fake/data/build/settings
+++ b/level_3/fake/data/build/settings
@@ -21,7 +21,7 @@ build_indexer ar
 build_indexer_arguments rcs
 build_language c
 build_libraries -lc -lcap
-build_libraries-individual -lfll_error -lfll_execute -lfll_file -lfll_fss -lfll_path -lfll_print -lfll_program -lfl_console -lfl_control_group -lfl_conversion -lfl_directory -lfl_environment -lfl_fss -lfl_iki -lfl_print -lfl_string -lf_account -lf_capability -lf_color -lf_console -lf_control_group -lf_conversion -lf_directory -lf_environment -lf_execute -lf_file -lf_fss -lf_iki -lf_limit -lf_memory -lf_path -lf_print -lf_signal -lf_status_string -lf_string -lf_thread -lf_type_array -lf_utf
+build_libraries-individual -lfll_error -lfll_execute -lfll_file -lfll_fss -lfll_path -lfll_print -lfll_program -lfl_control_group -lfl_conversion -lfl_directory -lfl_environment -lfl_fss -lfl_iki -lfl_print -lfl_string -lf_account -lf_capability -lf_color -lf_console -lf_control_group -lf_conversion -lf_directory -lf_environment -lf_execute -lf_file -lf_fss -lf_iki -lf_limit -lf_memory -lf_path -lf_print -lf_signal -lf_status_string -lf_string -lf_thread -lf_type_array -lf_utf
 build_libraries-level -lfll_2 -lfll_1 -lfll_0
 build_libraries-monolithic -lfll
 build_libraries_shared

diff --git a/level_3/firewall/c/firewall.h b/level_3/firewall/c/firewall.h
index ea5279c3c71c4f6cde3e7d1dae04b82d5cab4247..6b0fbf6658f96153eb572f5b1bfd3a49415fbbf7 100644 (file)
--- a/level_3/firewall/c/firewall.h
+++ b/level_3/firewall/c/firewall.h
@@ -35,7 +35,6 @@
 #include <fll/level_0/signal.h>
 
 // FLL-1 includes.
-#include <fll/level_1/console.h>
 #include <fll/level_1/string.h>
 #include <fll/level_1/print.h>
 

diff --git a/level_3/firewall/data/build/dependencies b/level_3/firewall/data/build/dependencies
index e52d0350a7259401c3b37c96232b56dd6ffa25d7..f60dbaec113b92802b6635d709a89349c737bf8a 100644 (file)
--- a/level_3/firewall/data/build/dependencies
+++ b/level_3/firewall/data/build/dependencies
@@ -20,7 +20,6 @@ f_path
 f_pipe
 f_print
 f_signal
-fl_console
 fl_control_group
 fl_conversion
 fl_environment

diff --git a/level_3/firewall/data/build/settings b/level_3/firewall/data/build/settings
index fee492d4f6c238eea47f824b671eaf7f35f81fb3..5cfb4165f29fb2c6864e2ca1561b1ebef5a5bd74 100644 (file)
--- a/level_3/firewall/data/build/settings
+++ b/level_3/firewall/data/build/settings
@@ -21,7 +21,7 @@ build_indexer ar
 build_indexer_arguments rcs
 build_language c
 build_libraries -lc -lcap
-build_libraries-individual -lfll_error -lfll_execute -lfll_fss -lfll_print -lfll_program -lfl_console -lfl_control_group -lfl_conversion -lfl_environment -lfl_fss -lfl_print -lfl_string -lf_account -lf_capability -lf_color -lf_console -lf_control_group -lf_conversion -lf_directory -lf_environment -lf_execute -lf_file -lf_fss -lf_limit -lf_memory -lf_path -lf_pipe -lf_print -lf_signal -lf_status_string -lf_string -lf_thread -lf_type_array -lf_utf
+build_libraries-individual -lfll_error -lfll_execute -lfll_fss -lfll_print -lfll_program -lfl_control_group -lfl_conversion -lfl_environment -lfl_fss -lfl_print -lfl_string -lf_account -lf_capability -lf_color -lf_console -lf_control_group -lf_conversion -lf_directory -lf_environment -lf_execute -lf_file -lf_fss -lf_limit -lf_memory -lf_path -lf_pipe -lf_print -lf_signal -lf_status_string -lf_string -lf_thread -lf_type_array -lf_utf
 build_libraries-level -lfll_2 -lfll_1 -lfll_0
 build_libraries-monolithic -lfll
 build_libraries_shared

diff --git a/level_3/fss_basic_list_read/c/fss_basic_list_read.h b/level_3/fss_basic_list_read/c/fss_basic_list_read.h
index 62bbf1a8000ad384bc6b4f2a689169d67cda66da..8c84b09a0bfd46e961d2a2d6787c9dcb6cfcfa6b 100644 (file)
--- a/level_3/fss_basic_list_read/c/fss_basic_list_read.h
+++ b/level_3/fss_basic_list_read/c/fss_basic_list_read.h
@@ -36,7 +36,6 @@
 #include <fll/level_0/signal.h>
 
 // FLL-1 includes.
-#include <fll/level_1/console.h>
 #include <fll/level_1/conversion.h>
 #include <fll/level_1/print.h>
 #include <fll/level_1/string.h>

diff --git a/level_3/fss_basic_list_read/data/build/dependencies b/level_3/fss_basic_list_read/data/build/dependencies
index b94442080ed7bd6c5e81a43618ce8d653f6ff46e..f853089a3ca18a46e5e4ed6b4fbd03c848809bb6 100644 (file)
--- a/level_3/fss_basic_list_read/data/build/dependencies
+++ b/level_3/fss_basic_list_read/data/build/dependencies
@@ -15,7 +15,6 @@ f_fss
 f_pipe
 f_print
 f_signal
-fl_console
 fl_conversion
 fl_fss
 fl_print

diff --git a/level_3/fss_basic_list_read/data/build/settings b/level_3/fss_basic_list_read/data/build/settings
index e4e42f7177518e76834799bdb9d7a0327c95e110..7d9639ef7e9be402dcc0820f72c6054e749b1588 100644 (file)
--- a/level_3/fss_basic_list_read/data/build/settings
+++ b/level_3/fss_basic_list_read/data/build/settings
@@ -21,7 +21,7 @@ build_indexer ar
 build_indexer_arguments rcs
 build_language c
 build_libraries -lc
-build_libraries-individual -lfll_error -lfll_file -lfll_fss -lfll_print -lfll_program -lfl_console -lfl_conversion -lfl_directory -lfl_fss -lfl_print -lfl_string -lf_color -lf_console -lf_conversion -lf_directory -lf_environment -lf_file -lf_fss -lf_memory -lf_path -lf_pipe -lf_print -lf_signal -lf_status_string -lf_string -lf_type_array -lf_utf
+build_libraries-individual -lfll_error -lfll_file -lfll_fss -lfll_print -lfll_program -lfl_conversion -lfl_directory -lfl_fss -lfl_print -lfl_string -lf_color -lf_console -lf_conversion -lf_directory -lf_environment -lf_file -lf_fss -lf_memory -lf_path -lf_pipe -lf_print -lf_signal -lf_status_string -lf_string -lf_type_array -lf_utf
 build_libraries-level -lfll_2 -lfll_1 -lfll_0
 build_libraries-monolithic -lfll
 build_libraries_shared

diff --git a/level_3/fss_basic_list_write/c/fss_basic_list_write.h b/level_3/fss_basic_list_write/c/fss_basic_list_write.h
index ce37b35bec250ef080df38a2687e431864f86f96..aae4f81c8ea4ab2c7bd6e63b8c4ee647ba4e52a9 100644 (file)
--- a/level_3/fss_basic_list_write/c/fss_basic_list_write.h
+++ b/level_3/fss_basic_list_write/c/fss_basic_list_write.h
@@ -30,7 +30,6 @@
 #include <fll/level_0/signal.h>
 
 // FLL-1 includes.
-#include <fll/level_1/console.h>
 #include <fll/level_1/fss_basic_list.h>
 #include <fll/level_1/print.h>
 #include <fll/level_1/string.h>

diff --git a/level_3/fss_basic_list_write/data/build/dependencies b/level_3/fss_basic_list_write/data/build/dependencies
index b94442080ed7bd6c5e81a43618ce8d653f6ff46e..f853089a3ca18a46e5e4ed6b4fbd03c848809bb6 100644 (file)
--- a/level_3/fss_basic_list_write/data/build/dependencies
+++ b/level_3/fss_basic_list_write/data/build/dependencies
@@ -15,7 +15,6 @@ f_fss
 f_pipe
 f_print
 f_signal
-fl_console
 fl_conversion
 fl_fss
 fl_print

diff --git a/level_3/fss_basic_list_write/data/build/settings b/level_3/fss_basic_list_write/data/build/settings
index 63dd3e999c4f392f2216f1bcb41d2373d95f8b2c..80e8fc4fd5c046f601e58e6025578a1b93200c67 100644 (file)
--- a/level_3/fss_basic_list_write/data/build/settings
+++ b/level_3/fss_basic_list_write/data/build/settings
@@ -21,7 +21,7 @@ build_indexer ar
 build_indexer_arguments rcs
 build_language c
 build_libraries -lc
-build_libraries-individual -lfll_error -lfll_file -lfll_fss -lfll_print -lfll_program -lfl_console -lfl_conversion -lfl_directory -lfl_fss -lfl_print -lfl_string -lf_color -lf_console -lf_conversion -lf_directory -lf_environment -lf_file -lf_fss -lf_memory -lf_path -lf_pipe -lf_print -lf_signal -lf_status_string -lf_string -lf_type_array -lf_utf
+build_libraries-individual -lfll_error -lfll_file -lfll_fss -lfll_print -lfll_program -lfl_conversion -lfl_directory -lfl_fss -lfl_print -lfl_string -lf_color -lf_console -lf_conversion -lf_directory -lf_environment -lf_file -lf_fss -lf_memory -lf_path -lf_pipe -lf_print -lf_signal -lf_status_string -lf_string -lf_type_array -lf_utf
 build_libraries-level -lfll_2 -lfll_1 -lfll_0
 build_libraries-monolithic -lfll
 build_libraries_shared

diff --git a/level_3/fss_basic_read/c/fss_basic_read.h b/level_3/fss_basic_read/c/fss_basic_read.h
index a11835dffc52e0750bc0c43df5ddfa88f20e5b72..d079c66274d40eafe7eae67cc6ade6c90b86f604 100644 (file)
--- a/level_3/fss_basic_read/c/fss_basic_read.h
+++ b/level_3/fss_basic_read/c/fss_basic_read.h
@@ -36,7 +36,6 @@
 #include <fll/level_0/signal.h>
 
 // FLL-1 includes.
-#include <fll/level_1/console.h>
 #include <fll/level_1/conversion.h>
 #include <fll/level_1/print.h>
 #include <fll/level_1/string.h>

diff --git a/level_3/fss_basic_read/data/build/dependencies b/level_3/fss_basic_read/data/build/dependencies
index b94442080ed7bd6c5e81a43618ce8d653f6ff46e..f853089a3ca18a46e5e4ed6b4fbd03c848809bb6 100644 (file)
--- a/level_3/fss_basic_read/data/build/dependencies
+++ b/level_3/fss_basic_read/data/build/dependencies
@@ -15,7 +15,6 @@ f_fss
 f_pipe
 f_print
 f_signal
-fl_console
 fl_conversion
 fl_fss
 fl_print

diff --git a/level_3/fss_basic_read/data/build/settings b/level_3/fss_basic_read/data/build/settings
index b16256e4a8b0ac6b1fd605504539cad921cc0b2f..87bee0c98575129e38ffe711f5e3d30e131c2c29 100644 (file)
--- a/level_3/fss_basic_read/data/build/settings
+++ b/level_3/fss_basic_read/data/build/settings
@@ -21,7 +21,7 @@ build_indexer ar
 build_indexer_arguments rcs
 build_language c
 build_libraries -lc
-build_libraries-individual -lfll_error -lfll_file -lfll_fss -lfll_print -lfll_program -lfl_console -lfl_conversion -lfl_directory -lfl_fss -lfl_print -lfl_string -lf_color -lf_console -lf_conversion -lf_directory -lf_environment -lf_file -lf_fss -lf_memory -lf_path -lf_pipe -lf_print -lf_signal -lf_status_string -lf_string -lf_type_array -lf_utf
+build_libraries-individual -lfll_error -lfll_file -lfll_fss -lfll_print -lfll_program -lfl_conversion -lfl_directory -lfl_fss -lfl_print -lfl_string -lf_color -lf_console -lf_conversion -lf_directory -lf_environment -lf_file -lf_fss -lf_memory -lf_path -lf_pipe -lf_print -lf_signal -lf_status_string -lf_string -lf_type_array -lf_utf
 build_libraries-level -lfll_2 -lfll_1 -lfll_0
 build_libraries-monolithic -lfll
 build_libraries_shared

diff --git a/level_3/fss_basic_write/c/fss_basic_write.h b/level_3/fss_basic_write/c/fss_basic_write.h
index 224626484891301094a6d8cca56b002e7d75aca3..f893f8799ed4966cc39979235b0b30c8ea1b6dd2 100644 (file)
--- a/level_3/fss_basic_write/c/fss_basic_write.h
+++ b/level_3/fss_basic_write/c/fss_basic_write.h
@@ -30,7 +30,6 @@
 #include <fll/level_0/signal.h>
 
 // FLL-1 includes.
-#include <fll/level_1/console.h>
 #include <fll/level_1/fss_basic.h>
 #include <fll/level_1/print.h>
 #include <fll/level_1/string.h>

diff --git a/level_3/fss_basic_write/data/build/dependencies b/level_3/fss_basic_write/data/build/dependencies
index b94442080ed7bd6c5e81a43618ce8d653f6ff46e..f853089a3ca18a46e5e4ed6b4fbd03c848809bb6 100644 (file)
--- a/level_3/fss_basic_write/data/build/dependencies
+++ b/level_3/fss_basic_write/data/build/dependencies
@@ -15,7 +15,6 @@ f_fss
 f_pipe
 f_print
 f_signal
-fl_console
 fl_conversion
 fl_fss
 fl_print

diff --git a/level_3/fss_basic_write/data/build/settings b/level_3/fss_basic_write/data/build/settings
index 5d149cc869c7a2c23cc44d9563c70f0a88bb5cca..41e83f2dbdfb0aaff2b826a6a42b1b14551c85af 100644 (file)
--- a/level_3/fss_basic_write/data/build/settings
+++ b/level_3/fss_basic_write/data/build/settings
@@ -21,7 +21,7 @@ build_indexer ar
 build_indexer_arguments rcs
 build_language c
 build_libraries -lc
-build_libraries-individual -lfll_error -lfll_file -lfll_fss -lfll_print -lfll_program -lfl_console -lfl_conversion -lfl_directory -lfl_fss -lfl_print -lfl_string -lf_color -lf_console -lf_conversion -lf_directory -lf_environment -lf_file -lf_fss -lf_memory -lf_path -lf_pipe -lf_print -lf_signal -lf_status_string -lf_string -lf_type_array -lf_utf
+build_libraries-individual -lfll_error -lfll_file -lfll_fss -lfll_print -lfll_program -lfl_conversion -lfl_directory -lfl_fss -lfl_print -lfl_string -lf_color -lf_console -lf_conversion -lf_directory -lf_environment -lf_file -lf_fss -lf_memory -lf_path -lf_pipe -lf_print -lf_signal -lf_status_string -lf_string -lf_type_array -lf_utf
 build_libraries-level -lfll_2 -lfll_1 -lfll_0
 build_libraries-monolithic -lfll
 build_libraries_shared

diff --git a/level_3/fss_embedded_list_read/c/fss_embedded_list_read.h b/level_3/fss_embedded_list_read/c/fss_embedded_list_read.h
index 05b454f1e55b84a54c27653fe6c7c2d386df5e6c..943fbff6801cfce9df434284c5e567f5cb550e8e 100644 (file)
--- a/level_3/fss_embedded_list_read/c/fss_embedded_list_read.h
+++ b/level_3/fss_embedded_list_read/c/fss_embedded_list_read.h
@@ -36,7 +36,6 @@
 #include <fll/level_0/signal.h>
 
 // FLL-1 includes.
-#include <fll/level_1/console.h>
 #include <fll/level_1/conversion.h>
 #include <fll/level_1/print.h>
 #include <fll/level_1/string.h>

diff --git a/level_3/fss_embedded_list_read/data/build/dependencies b/level_3/fss_embedded_list_read/data/build/dependencies
index b94442080ed7bd6c5e81a43618ce8d653f6ff46e..f853089a3ca18a46e5e4ed6b4fbd03c848809bb6 100644 (file)
--- a/level_3/fss_embedded_list_read/data/build/dependencies
+++ b/level_3/fss_embedded_list_read/data/build/dependencies
@@ -15,7 +15,6 @@ f_fss
 f_pipe
 f_print
 f_signal
-fl_console
 fl_conversion
 fl_fss
 fl_print

diff --git a/level_3/fss_embedded_list_read/data/build/settings b/level_3/fss_embedded_list_read/data/build/settings
index d22a180c74302b9d99ec82253abc7d8c46c06b72..9d2b1625d2eccaef557caaee339b6ae6f637f74e 100644 (file)
--- a/level_3/fss_embedded_list_read/data/build/settings
+++ b/level_3/fss_embedded_list_read/data/build/settings
@@ -21,7 +21,7 @@ build_indexer ar
 build_indexer_arguments rcs
 build_language c
 build_libraries -lc
-build_libraries-individual -lfll_error -lfll_file -lfll_fss -lfll_print -lfll_program -lfl_console -lfl_conversion -lfl_directory -lfl_fss -lfl_print -lfl_string -lf_color -lf_console -lf_conversion -lf_directory -lf_environment -lf_file -lf_fss -lf_memory -lf_path -lf_pipe -lf_print -lf_signal -lf_status_string -lf_string -lf_type_array -lf_utf
+build_libraries-individual -lfll_error -lfll_file -lfll_fss -lfll_print -lfll_program -lfl_conversion -lfl_directory -lfl_fss -lfl_print -lfl_string -lf_color -lf_console -lf_conversion -lf_directory -lf_environment -lf_file -lf_fss -lf_memory -lf_path -lf_pipe -lf_print -lf_signal -lf_status_string -lf_string -lf_type_array -lf_utf
 build_libraries-level -lfll_2 -lfll_1 -lfll_0
 build_libraries-monolithic -lfll
 build_libraries_shared

diff --git a/level_3/fss_embedded_list_write/c/fss_embedded_list_write.h b/level_3/fss_embedded_list_write/c/fss_embedded_list_write.h
index 8bc23ad4960aa6c580b8a554a021abc6886f410a..859d8c801c3aeff069e2ba3fb18e579ea07123be 100644 (file)
--- a/level_3/fss_embedded_list_write/c/fss_embedded_list_write.h
+++ b/level_3/fss_embedded_list_write/c/fss_embedded_list_write.h
@@ -30,7 +30,6 @@
 #include <fll/level_0/signal.h>
 
 // FLL-1 includes.
-#include <fll/level_1/console.h>
 #include <fll/level_1/conversion.h>
 #include <fll/level_1/fss_embedded_list.h>
 #include <fll/level_1/print.h>

diff --git a/level_3/fss_embedded_list_write/data/build/dependencies b/level_3/fss_embedded_list_write/data/build/dependencies
index b94442080ed7bd6c5e81a43618ce8d653f6ff46e..f853089a3ca18a46e5e4ed6b4fbd03c848809bb6 100644 (file)
--- a/level_3/fss_embedded_list_write/data/build/dependencies
+++ b/level_3/fss_embedded_list_write/data/build/dependencies
@@ -15,7 +15,6 @@ f_fss
 f_pipe
 f_print
 f_signal
-fl_console
 fl_conversion
 fl_fss
 fl_print

diff --git a/level_3/fss_embedded_list_write/data/build/settings b/level_3/fss_embedded_list_write/data/build/settings
index d9d73474ee93f547ef0155daf2ae06b19ccdb575..ddfefbed294635074a0b7fbcbb1cce9574114bd9 100644 (file)
--- a/level_3/fss_embedded_list_write/data/build/settings
+++ b/level_3/fss_embedded_list_write/data/build/settings
@@ -21,7 +21,7 @@ build_indexer ar
 build_indexer_arguments rcs
 build_language c
 build_libraries -lc
-build_libraries-individual -lfll_error -lfll_file -lfll_fss -lfll_print -lfll_program -lfl_console -lfl_conversion -lfl_directory -lfl_fss -lfl_print -lfl_string -lf_color -lf_console -lf_conversion -lf_directory -lf_environment -lf_file -lf_fss -lf_memory -lf_path -lf_pipe -lf_print -lf_signal -lf_status_string -lf_string -lf_type_array -lf_utf
+build_libraries-individual -lfll_error -lfll_file -lfll_fss -lfll_print -lfll_program -lfl_conversion -lfl_directory -lfl_fss -lfl_print -lfl_string -lf_color -lf_console -lf_conversion -lf_directory -lf_environment -lf_file -lf_fss -lf_memory -lf_path -lf_pipe -lf_print -lf_signal -lf_status_string -lf_string -lf_type_array -lf_utf
 build_libraries-level -lfll_2 -lfll_1 -lfll_0
 build_libraries-monolithic -lfll
 build_libraries_shared

diff --git a/level_3/fss_extended_list_read/c/fss_extended_list_read.h b/level_3/fss_extended_list_read/c/fss_extended_list_read.h
index d4579a3ddd0aa35127ed8b58e7ad2b5aa17d7c84..b20a762eb935d86f02770071fd652945e30bc98e 100644 (file)
--- a/level_3/fss_extended_list_read/c/fss_extended_list_read.h
+++ b/level_3/fss_extended_list_read/c/fss_extended_list_read.h
@@ -36,7 +36,6 @@
 #include <fll/level_0/signal.h>
 
 // FLL-1 includes.
-#include <fll/level_1/console.h>
 #include <fll/level_1/conversion.h>
 #include <fll/level_1/print.h>
 #include <fll/level_1/string.h>

diff --git a/level_3/fss_extended_list_read/data/build/dependencies b/level_3/fss_extended_list_read/data/build/dependencies
index b94442080ed7bd6c5e81a43618ce8d653f6ff46e..f853089a3ca18a46e5e4ed6b4fbd03c848809bb6 100644 (file)
--- a/level_3/fss_extended_list_read/data/build/dependencies
+++ b/level_3/fss_extended_list_read/data/build/dependencies
@@ -15,7 +15,6 @@ f_fss
 f_pipe
 f_print
 f_signal
-fl_console
 fl_conversion
 fl_fss
 fl_print

diff --git a/level_3/fss_extended_list_read/data/build/settings b/level_3/fss_extended_list_read/data/build/settings
index f0d57e7d827bd1eadc121ef414ce3d3c40528302..7c0b22a95a81c433b1c12fef1f5a1033bfb968c1 100644 (file)
--- a/level_3/fss_extended_list_read/data/build/settings
+++ b/level_3/fss_extended_list_read/data/build/settings
@@ -21,7 +21,7 @@ build_indexer ar
 build_indexer_arguments rcs
 build_language c
 build_libraries -lc
-build_libraries-individual -lfll_error -lfll_file -lfll_fss -lfll_print -lfll_program -lfl_console -lfl_conversion -lfl_directory -lfl_fss -lfl_print -lfl_string -lf_color -lf_console -lf_conversion -lf_directory -lf_environment -lf_file -lf_fss -lf_memory -lf_path -lf_pipe -lf_print -lf_signal -lf_status_string -lf_string -lf_type_array -lf_utf
+build_libraries-individual -lfll_error -lfll_file -lfll_fss -lfll_print -lfll_program -lfl_conversion -lfl_directory -lfl_fss -lfl_print -lfl_string -lf_color -lf_console -lf_conversion -lf_directory -lf_environment -lf_file -lf_fss -lf_memory -lf_path -lf_pipe -lf_print -lf_signal -lf_status_string -lf_string -lf_type_array -lf_utf
 build_libraries-level -lfll_2 -lfll_1 -lfll_0
 build_libraries-monolithic -lfll
 build_libraries_shared

diff --git a/level_3/fss_extended_list_write/c/fss_extended_list_write.h b/level_3/fss_extended_list_write/c/fss_extended_list_write.h
index 36691a581314649c1ad6c2e8af319ac879d735dd..75661fc78ce1d2e5d8711c391ff459259f042242 100644 (file)
--- a/level_3/fss_extended_list_write/c/fss_extended_list_write.h
+++ b/level_3/fss_extended_list_write/c/fss_extended_list_write.h
@@ -30,7 +30,6 @@
 #include <fll/level_0/signal.h>
 
 // FLL-1 includes.
-#include <fll/level_1/console.h>
 #include <fll/level_1/conversion.h>
 #include <fll/level_1/fss_extended_list.h>
 #include <fll/level_1/print.h>

diff --git a/level_3/fss_extended_list_write/data/build/dependencies b/level_3/fss_extended_list_write/data/build/dependencies
index b94442080ed7bd6c5e81a43618ce8d653f6ff46e..f853089a3ca18a46e5e4ed6b4fbd03c848809bb6 100644 (file)
--- a/level_3/fss_extended_list_write/data/build/dependencies
+++ b/level_3/fss_extended_list_write/data/build/dependencies
@@ -15,7 +15,6 @@ f_fss
 f_pipe
 f_print
 f_signal
-fl_console
 fl_conversion
 fl_fss
 fl_print

diff --git a/level_3/fss_extended_list_write/data/build/settings b/level_3/fss_extended_list_write/data/build/settings
index 7f7093514e860e85303c15b73ed9a5ec617e67f5..3049dce5792305fe651187ee897075ca1a665d59 100644 (file)
--- a/level_3/fss_extended_list_write/data/build/settings
+++ b/level_3/fss_extended_list_write/data/build/settings
@@ -21,7 +21,7 @@ build_indexer ar
 build_indexer_arguments rcs
 build_language c
 build_libraries -lc
-build_libraries-individual -lfll_error -lfll_file -lfll_fss -lfll_print -lfll_program -lfl_console -lfl_conversion -lfl_directory -lfl_fss -lfl_print -lfl_string -lf_color -lf_console -lf_conversion -lf_directory -lf_environment -lf_file -lf_fss -lf_memory -lf_path -lf_pipe -lf_print -lf_signal -lf_status_string -lf_string -lf_type_array -lf_utf
+build_libraries-individual -lfll_error -lfll_file -lfll_fss -lfll_print -lfll_program -lfl_conversion -lfl_directory -lfl_fss -lfl_print -lfl_string -lf_color -lf_console -lf_conversion -lf_directory -lf_environment -lf_file -lf_fss -lf_memory -lf_path -lf_pipe -lf_print -lf_signal -lf_status_string -lf_string -lf_type_array -lf_utf
 build_libraries-level -lfll_2 -lfll_1 -lfll_0
 build_libraries-monolithic -lfll
 build_libraries_shared

diff --git a/level_3/fss_extended_read/c/fss_extended_read.h b/level_3/fss_extended_read/c/fss_extended_read.h
index 45cf61737906397223682e92ed9f5cb77045ec81..38f489632c2b2dbf456d746fd9291531c56d98c7 100644 (file)
--- a/level_3/fss_extended_read/c/fss_extended_read.h
+++ b/level_3/fss_extended_read/c/fss_extended_read.h
@@ -36,7 +36,6 @@
 #include <fll/level_0/signal.h>
 
 // FLL-1 includes.
-#include <fll/level_1/console.h>
 #include <fll/level_1/conversion.h>
 #include <fll/level_1/print.h>
 #include <fll/level_1/string.h>

diff --git a/level_3/fss_extended_read/data/build/dependencies b/level_3/fss_extended_read/data/build/dependencies
index b94442080ed7bd6c5e81a43618ce8d653f6ff46e..f853089a3ca18a46e5e4ed6b4fbd03c848809bb6 100644 (file)
--- a/level_3/fss_extended_read/data/build/dependencies
+++ b/level_3/fss_extended_read/data/build/dependencies
@@ -15,7 +15,6 @@ f_fss
 f_pipe
 f_print
 f_signal
-fl_console
 fl_conversion
 fl_fss
 fl_print

diff --git a/level_3/fss_extended_read/data/build/settings b/level_3/fss_extended_read/data/build/settings
index 88b2ec0ee5ca4c3946bf011cc9f8a33283c58ea8..fb78ae1d1fa17553789ca5e36156ba83a5518a80 100644 (file)
--- a/level_3/fss_extended_read/data/build/settings
+++ b/level_3/fss_extended_read/data/build/settings
@@ -21,7 +21,7 @@ build_indexer ar
 build_indexer_arguments rcs
 build_language c
 build_libraries -lc
-build_libraries-individual -lfll_error -lfll_file -lfll_fss -lfll_print -lfll_program -lfl_console -lfl_conversion -lfl_directory -lfl_fss -lfl_print -lfl_string -lf_color -lf_console -lf_conversion -lf_directory -lf_environment -lf_file -lf_fss -lf_memory -lf_path -lf_pipe -lf_print -lf_signal -lf_status_string -lf_string -lf_type_array -lf_utf
+build_libraries-individual -lfll_error -lfll_file -lfll_fss -lfll_print -lfll_program -lfl_conversion -lfl_directory -lfl_fss -lfl_print -lfl_string -lf_color -lf_console -lf_conversion -lf_directory -lf_environment -lf_file -lf_fss -lf_memory -lf_path -lf_pipe -lf_print -lf_signal -lf_status_string -lf_string -lf_type_array -lf_utf
 build_libraries-level -lfll_2 -lfll_1 -lfll_0
 build_libraries-monolithic -lfll
 build_libraries_shared

diff --git a/level_3/fss_identify/c/fss_identify.h b/level_3/fss_identify/c/fss_identify.h
index 4ff3d1e0ddc0d9fc8120e1af7dbf1392e6176fcc..61017444b723d9e36872608b9e8ddfe6ea6eacdf 100644 (file)
--- a/level_3/fss_identify/c/fss_identify.h
+++ b/level_3/fss_identify/c/fss_identify.h
@@ -34,7 +34,6 @@
 #include <fll/level_0/signal.h>
 
 // FLL-1 includes.
-#include <fll/level_1/console.h>
 #include <fll/level_1/conversion.h>
 #include <fll/level_1/fss.h>
 #include <fll/level_1/print.h>

diff --git a/level_3/fss_identify/data/build/dependencies b/level_3/fss_identify/data/build/dependencies
index 65a5dd1bd2d77b56a6a2789c3e613c80bea8a153..577c3023d6c12d3d50806decdeaa41766b6ea159 100644 (file)
--- a/level_3/fss_identify/data/build/dependencies
+++ b/level_3/fss_identify/data/build/dependencies
@@ -13,7 +13,6 @@ f_fss
 f_pipe
 f_print
 f_signal
-fl_console
 fl_conversion
 fl_fss
 fl_print

diff --git a/level_3/fss_identify/data/build/settings b/level_3/fss_identify/data/build/settings
index 59fcf5a1ffa9637af5cc1e3e48a81be56bb4ecb6..70e9066ebfbe38668b6171ea8b17224c0964e898 100644 (file)
--- a/level_3/fss_identify/data/build/settings
+++ b/level_3/fss_identify/data/build/settings
@@ -21,7 +21,7 @@ build_indexer ar
 build_indexer_arguments rcs
 build_language c
 build_libraries -lc
-build_libraries-individual -lfll_error -lfll_fss -lfll_print -lfll_program -lfl_console -lfl_conversion -lfl_fss -lfl_print -lfl_string -lf_color -lf_console -lf_conversion -lf_file -lf_fss -lf_memory -lf_path -lf_pipe -lf_print -lf_signal -lf_status_string -lf_string -lf_type_array -lf_utf
+build_libraries-individual -lfll_error -lfll_fss -lfll_print -lfll_program -lfl_conversion -lfl_fss -lfl_print -lfl_string -lf_color -lf_console -lf_conversion -lf_file -lf_fss -lf_memory -lf_pipe -lf_print -lf_signal -lf_status_string -lf_string -lf_type_array -lf_utf
 build_libraries-level -lfll_2 -lfll_1 -lfll_0
 build_libraries-monolithic -lfll
 build_libraries_shared

diff --git a/level_3/fss_payload_read/c/fss_payload_read.h b/level_3/fss_payload_read/c/fss_payload_read.h
index f6bba6ecc9f04670ce751f84853c925b0b8c7961..4defbf63b097b8246c5aedb67569d02839b15331 100644 (file)
--- a/level_3/fss_payload_read/c/fss_payload_read.h
+++ b/level_3/fss_payload_read/c/fss_payload_read.h
@@ -36,7 +36,6 @@
 #include <fll/level_0/signal.h>
 
 // FLL-1 includes.
-#include <fll/level_1/console.h>
 #include <fll/level_1/conversion.h>
 #include <fll/level_1/print.h>
 #include <fll/level_1/string.h>

diff --git a/level_3/fss_payload_read/data/build/dependencies b/level_3/fss_payload_read/data/build/dependencies
index b94442080ed7bd6c5e81a43618ce8d653f6ff46e..f853089a3ca18a46e5e4ed6b4fbd03c848809bb6 100644 (file)
--- a/level_3/fss_payload_read/data/build/dependencies
+++ b/level_3/fss_payload_read/data/build/dependencies
@@ -15,7 +15,6 @@ f_fss
 f_pipe
 f_print
 f_signal
-fl_console
 fl_conversion
 fl_fss
 fl_print

diff --git a/level_3/fss_payload_read/data/build/settings b/level_3/fss_payload_read/data/build/settings
index 2745d427ed3d753d3258ec9dc51b7cfc4e559157..e24608355bb63778f6e1216e0d0ae7574bb968c2 100644 (file)
--- a/level_3/fss_payload_read/data/build/settings
+++ b/level_3/fss_payload_read/data/build/settings
@@ -21,7 +21,7 @@ build_indexer ar
 build_indexer_arguments rcs
 build_language c
 build_libraries -lc
-build_libraries-individual -lfll_error -lfll_file -lfll_fss -lfll_print -lfll_program -lfl_console -lfl_conversion -lfl_directory -lfl_fss -lfl_print -lfl_string -lf_color -lf_console -lf_conversion -lf_directory -lf_environment -lf_file -lf_fss -lf_memory -lf_path -lf_pipe -lf_print -lf_signal -lf_status_string -lf_string -lf_type_array -lf_utf
+build_libraries-individual -lfll_error -lfll_file -lfll_fss -lfll_print -lfll_program -lfl_conversion -lfl_directory -lfl_fss -lfl_print -lfl_string -lf_color -lf_console -lf_conversion -lf_directory -lf_environment -lf_file -lf_fss -lf_memory -lf_path -lf_pipe -lf_print -lf_signal -lf_status_string -lf_string -lf_type_array -lf_utf
 build_libraries-level -lfll_2 -lfll_1 -lfll_0
 build_libraries-monolithic -lfll
 build_libraries_shared

diff --git a/level_3/fss_payload_write/c/fss_payload_write.h b/level_3/fss_payload_write/c/fss_payload_write.h
index 890c29c00a04c0bdcd2fbaf8d950416898f1f67c..ca28e35fe604798906acbb44e93b1f67f76120bd 100644 (file)
--- a/level_3/fss_payload_write/c/fss_payload_write.h
+++ b/level_3/fss_payload_write/c/fss_payload_write.h
@@ -30,7 +30,6 @@
 #include <fll/level_0/signal.h>
 
 // FLL-1 includes.
-#include <fll/level_1/console.h>
 #include <fll/level_1/fss_basic_list.h>
 #include <fll/level_1/print.h>
 #include <fll/level_1/string.h>

diff --git a/level_3/fss_payload_write/data/build/dependencies b/level_3/fss_payload_write/data/build/dependencies
index b94442080ed7bd6c5e81a43618ce8d653f6ff46e..f853089a3ca18a46e5e4ed6b4fbd03c848809bb6 100644 (file)
--- a/level_3/fss_payload_write/data/build/dependencies
+++ b/level_3/fss_payload_write/data/build/dependencies
@@ -15,7 +15,6 @@ f_fss
 f_pipe
 f_print
 f_signal
-fl_console
 fl_conversion
 fl_fss
 fl_print

diff --git a/level_3/fss_payload_write/data/build/settings b/level_3/fss_payload_write/data/build/settings
index 71031c99854d9c10bc4c9530cd5b6f335acbea7f..22089e9732d7f52bcfe7afbbba6d0eda0ce2c0c7 100644 (file)
--- a/level_3/fss_payload_write/data/build/settings
+++ b/level_3/fss_payload_write/data/build/settings
@@ -21,7 +21,7 @@ build_indexer ar
 build_indexer_arguments rcs
 build_language c
 build_libraries -lc
-build_libraries-individual -lfll_error -lfll_file -lfll_fss -lfll_print -lfll_program -lfl_console -lfl_conversion -lfl_directory -lfl_fss -lfl_print -lfl_string -lf_color -lf_console -lf_conversion -lf_directory -lf_environment -lf_file -lf_fss -lf_memory -lf_path -lf_pipe -lf_print -lf_signal -lf_status_string -lf_string -lf_type_array -lf_utf
+build_libraries-individual -lfll_error -lfll_file -lfll_fss -lfll_print -lfll_program -lfl_conversion -lfl_directory -lfl_fss -lfl_print -lfl_string -lf_color -lf_console -lf_conversion -lf_directory -lf_environment -lf_file -lf_fss -lf_memory -lf_path -lf_pipe -lf_print -lf_signal -lf_status_string -lf_string -lf_type_array -lf_utf
 build_libraries-level -lfll_2 -lfll_1 -lfll_0
 build_libraries-monolithic -lfll
 build_libraries_shared

diff --git a/level_3/fss_status_code/c/fss_status_code.h b/level_3/fss_status_code/c/fss_status_code.h
index 1cffaa2bdacfdd60bc172485ab323ff728b1d669..adb5dc6287db258a1c7d4473af2d083a7bda50b4 100644 (file)
--- a/level_3/fss_status_code/c/fss_status_code.h
+++ b/level_3/fss_status_code/c/fss_status_code.h
@@ -31,7 +31,6 @@
 #include <fll/level_0/status_string.h>
 
 // FLL-1 includes.
-#include <fll/level_1/console.h>
 #include <fll/level_1/conversion.h>
 #include <fll/level_1/print.h>
 #include <fll/level_1/string.h>

diff --git a/level_3/fss_status_code/data/build/dependencies b/level_3/fss_status_code/data/build/dependencies
index e03def41ed71b361ad422929349f70b7d6f845de..a1d39558ae1103dad68642dea9448b82bb36b0e8 100644 (file)
--- a/level_3/fss_status_code/data/build/dependencies
+++ b/level_3/fss_status_code/data/build/dependencies
@@ -16,7 +16,6 @@ f_pipe
 f_print
 f_signal
 f_status_string
-fl_console
 fl_conversion
 fl_fss
 fl_print

diff --git a/level_3/fss_status_code/data/build/settings b/level_3/fss_status_code/data/build/settings
index 03273eedef976d832abe9593d3ae86ba1db9d30a..8b3195c8ba80b39ec9799aeda641452ea4a156ee 100644 (file)
--- a/level_3/fss_status_code/data/build/settings
+++ b/level_3/fss_status_code/data/build/settings
@@ -21,7 +21,7 @@ build_indexer ar
 build_indexer_arguments rcs
 build_language c
 build_libraries -lc
-build_libraries-individual -lfll_error -lfll_file -lfll_fss -lfll_fss_status_string -lfll_print -lfll_program -lfll_status_string -lfl_console -lfl_conversion -lfl_directory -lfl_fss -lfl_print -lfl_string -lf_color -lf_console -lf_conversion -lf_directory -lf_environment -lf_file -lf_fss -lf_memory -lf_path -lf_pipe -lf_print -lf_signal -lf_status_string -lf_string -lf_type_array -lf_utf
+build_libraries-individual -lfll_error -lfll_file -lfll_fss -lfll_fss_status_string -lfll_print -lfll_program -lfll_status_string -lfl_conversion -lfl_directory -lfl_fss -lfl_print -lfl_string -lf_color -lf_console -lf_conversion -lf_directory -lf_environment -lf_file -lf_fss -lf_memory -lf_path -lf_pipe -lf_print -lf_signal -lf_status_string -lf_string -lf_type_array -lf_utf
 build_libraries-level -lfll_2 -lfll_1 -lfll_0
 build_libraries-monolithic -lfll
 build_libraries_shared

diff --git a/level_3/iki_read/c/iki_read.h b/level_3/iki_read/c/iki_read.h
index f848894f55b36baa87320645b427a495ac4425c6..71759284e180e8e8ab531d6f9d83c21c4bb0ab51 100644 (file)
--- a/level_3/iki_read/c/iki_read.h
+++ b/level_3/iki_read/c/iki_read.h
@@ -38,7 +38,6 @@
 #include <fll/level_0/signal.h>
 
 // FLL-1 includes.
-#include <fll/level_1/console.h>
 #include <fll/level_1/conversion.h>
 #include <fll/level_1/iki.h>
 #include <fll/level_1/print.h>

diff --git a/level_3/iki_read/data/build/dependencies b/level_3/iki_read/data/build/dependencies
index ab4c42e54e8c885b5de5d64242fffa97bf55d729..04dd76ed01d2a24a85a0858b8b7e4ac74d2cfe7d 100644 (file)
--- a/level_3/iki_read/data/build/dependencies
+++ b/level_3/iki_read/data/build/dependencies
@@ -13,7 +13,6 @@ f_iki
 f_pipe
 f_print
 f_signal
-fl_console
 fl_conversion
 fl_iki
 fl_print

diff --git a/level_3/iki_read/data/build/settings b/level_3/iki_read/data/build/settings
index 33f27fa426b4666763bb627e3763ea980e5e7614..1d4c72e262cda77ed088ac6a2a07d7f5175134b6 100644 (file)
--- a/level_3/iki_read/data/build/settings
+++ b/level_3/iki_read/data/build/settings
@@ -21,7 +21,7 @@ build_indexer ar
 build_indexer_arguments rcs
 build_language c
 build_libraries -lc
-build_libraries-individual -lfll_error -lfll_print -lfll_program -lfl_console -lfl_conversion -lfl_iki -lfl_print -lfl_signal -lfl_string -lf_color -lf_console -lf_conversion -lf_file -lf_iki -lf_memory -lf_path -lf_pipe -lf_print -lf_signal -lf_string -lf_type_array -lf_utf
+build_libraries-individual -lfll_error -lfll_print -lfll_program -lfl_conversion -lfl_iki -lfl_print -lfl_signal -lfl_string -lf_color -lf_console -lf_conversion -lf_file -lf_iki -lf_memory -lf_pipe -lf_print -lf_signal -lf_string -lf_type_array -lf_utf
 build_libraries-level -lfll_2 -lfll_1 -lfll_0
 build_libraries-monolithic -lfll
 build_libraries_shared

diff --git a/level_3/iki_write/c/iki_write.h b/level_3/iki_write/c/iki_write.h
index e9ed4022a698b19e37d1fb8b9cf0385be71d1ccb..d8b8422a97b0fc3a4a3b7724d3c4caf247f4082d 100644 (file)
--- a/level_3/iki_write/c/iki_write.h
+++ b/level_3/iki_write/c/iki_write.h
@@ -38,7 +38,6 @@
 #include <fll/level_0/signal.h>
 
 // FLL-1 includes.
-#include <fll/level_1/console.h>
 #include <fll/level_1/conversion.h>
 #include <fll/level_1/iki.h>
 #include <fll/level_1/print.h>

diff --git a/level_3/iki_write/data/build/dependencies b/level_3/iki_write/data/build/dependencies
index 3fc06d18c99b3dcb97b7c82e547d0d71622881d6..77480d853eb3e5308a7b20a580a95eb7a559b3ce 100644 (file)
--- a/level_3/iki_write/data/build/dependencies
+++ b/level_3/iki_write/data/build/dependencies
@@ -12,7 +12,6 @@ f_iki
 f_pipe
 f_print
 f_signal
-fl_console
 fl_iki
 fl_print
 fl_string

diff --git a/level_3/iki_write/data/build/settings b/level_3/iki_write/data/build/settings
index 8ff5352886e7c32c37ee2b56001504bf894fab69..6f0d78411026837675fa581f8424509cd722f242 100644 (file)
--- a/level_3/iki_write/data/build/settings
+++ b/level_3/iki_write/data/build/settings
@@ -21,7 +21,7 @@ build_indexer ar
 build_indexer_arguments rcs
 build_language c
 build_libraries -lc
-build_libraries-individual -lfll_error -lfll_iki -lfll_print -lfll_program -lfl_console -lfl_iki -lfl_print -lfl_string -lf_color -lf_console -lf_conversion -lf_file -lf_iki -lf_memory -lf_path -lf_pipe -lf_print -lf_signal -lf_string -lf_type_array -lf_utf
+build_libraries-individual -lfll_error -lfll_iki -lfll_print -lfll_program -lfl_iki -lfl_print -lfl_string -lf_color -lf_console -lf_conversion -lf_file -lf_iki -lf_memory -lf_pipe -lf_print -lf_signal -lf_string -lf_type_array -lf_utf
 build_libraries-level -lfll_2 -lfll_1 -lfll_0
 build_libraries-monolithic -lfll
 build_libraries_shared

diff --git a/level_3/status_code/c/status_code.h b/level_3/status_code/c/status_code.h
index 09623cbd5df11e164d89e54f4f1e5192090b66f4..b676f5b5e7912f712f41e2ebca7cc53ffa5d36c3 100644 (file)
--- a/level_3/status_code/c/status_code.h
+++ b/level_3/status_code/c/status_code.h
@@ -31,7 +31,6 @@
 #include <fll/level_0/status_string.h>
 
 // FLL-1 includes.
-#include <fll/level_1/console.h>
 #include <fll/level_1/conversion.h>
 #include <fll/level_1/print.h>
 #include <fll/level_1/string.h>

diff --git a/level_3/status_code/data/build/dependencies b/level_3/status_code/data/build/dependencies
index f0bdd3042ca4ae539c817cf89f90cf06b55da70b..0f3432b5866046579ad69ceae937f09bb38a06ea 100644 (file)
--- a/level_3/status_code/data/build/dependencies
+++ b/level_3/status_code/data/build/dependencies
@@ -13,7 +13,6 @@ f_pipe
 f_print
 f_signal
 f_status_string
-fl_console
 fl_conversion
 fl_print
 fl_string

diff --git a/level_3/status_code/data/build/settings b/level_3/status_code/data/build/settings
index c9d81d44cb668e682e33b5ab2dd512826693d5f7..b0442399518a559ff28c0c4e6eba75a8888d35d7 100644 (file)
--- a/level_3/status_code/data/build/settings
+++ b/level_3/status_code/data/build/settings
@@ -21,7 +21,7 @@ build_indexer ar
 build_indexer_arguments rcs
 build_language c
 build_libraries -lc
-build_libraries-individual -lfll_error -lfll_print -lfll_program -lfll_status_string -lfl_console -lfl_conversion -lfl_print -lfl_string -lf_color -lf_console -lf_conversion -lf_file -lf_memory -lf_path -lf_pipe -lf_print -lf_signal -lf_status_string -lf_string -lf_type_array -lf_utf
+build_libraries-individual -lfll_error -lfll_print -lfll_program -lfll_status_string -lfl_conversion -lfl_print -lfl_string -lf_color -lf_console -lf_conversion -lf_file -lf_memory -lf_pipe -lf_print -lf_signal -lf_status_string -lf_string -lf_type_array -lf_utf
 build_libraries-level -lfll_2 -lfll_1 -lfll_0
 build_libraries-monolithic -lfll
 build_libraries_shared

diff --git a/level_3/utf8/c/utf8.h b/level_3/utf8/c/utf8.h
index df6a933dfe2823b4977e73a46e464c420c9048ed..a5ba1755470986c0b541aa51c430fc233af0a359 100644 (file)
--- a/level_3/utf8/c/utf8.h
+++ b/level_3/utf8/c/utf8.h
@@ -44,7 +44,6 @@
 #include <fll/level_0/signal.h>
 
 // FLL-1 includes.
-#include <fll/level_1/console.h>
 #include <fll/level_1/conversion.h>
 #include <fll/level_1/print.h>
 #include <fll/level_1/string.h>

diff --git a/level_3/utf8/data/build/dependencies b/level_3/utf8/data/build/dependencies
index fa075534070aea21727be3fcc1013b9429cf073b..fd644c4bd56506fb2cfe58d09077cc6fe078cf9f 100644 (file)
--- a/level_3/utf8/data/build/dependencies
+++ b/level_3/utf8/data/build/dependencies
@@ -12,7 +12,6 @@ f_file
 f_pipe
 f_print
 f_signal
-fl_console
 fl_conversion
 fl_print
 fl_string

diff --git a/level_3/utf8/data/build/settings b/level_3/utf8/data/build/settings
index 0686e879629f54ac8f653c446f3708854cd4d363..8262cf1754308d7735e7e1a73dacf5740aadfb53 100644 (file)
--- a/level_3/utf8/data/build/settings
+++ b/level_3/utf8/data/build/settings
@@ -21,7 +21,7 @@ build_indexer ar
 build_indexer_arguments rcs
 build_language c
 build_libraries -lc
-build_libraries-individual -lfll_error -lfll_print -lfll_program -lfl_console -lfl_conversion -lfl_print -lfl_string -lf_color -lf_console -lf_conversion -lf_file -lf_memory -lf_path -lf_pipe -lf_print -lf_signal -lf_string -lf_type_array -lf_utf
+build_libraries-individual -lfll_error -lfll_print -lfll_program -lfl_conversion -lfl_print -lfl_string -lf_color -lf_console -lf_conversion -lf_file -lf_memory -lf_pipe -lf_print -lf_signal -lf_string -lf_type_array -lf_utf
 build_libraries-level -lfll_2 -lfll_1 -lfll_0
 build_libraries-monolithic -lfll
 build_libraries_shared