Feature: level-1: fl_program

The version function is used between all programs in this project.
Move that functionality into its own library: fl_program.

diff --git a/build/level_1/settings b/build/level_1/settings
index 8a430b13c27b15510dae133f4ff997f1eca66a26..9a938c80771b0baff58a3eafea8755ee42935b13 100644 (file)
--- a/build/level_1/settings
+++ b/build/level_1/settings
@@ -10,9 +10,9 @@ version_micro 2
 build_compiler gcc
 build_linker ar
 build_libraries -lc -lfll_0
-build_sources_library colors.c console.c directory.c errors.c file.c fss.c fss_basic.c fss_basic_list.c fss_extended.c serialized.c strings.c
+build_sources_library colors.c console.c directory.c errors.c file.c fss.c fss_basic.c fss_basic_list.c fss_extended.c program.c serialized.c strings.c
 build_sources_program 
-build_sources_headers colors.h console.h directory.h errors.h file.h fss.h fss_basic.h fss_basic_list.h fss_errors.h fss_extended.h fss_macro.h serialized.h strings.h
+build_sources_headers colors.h console.h directory.h errors.h file.h fss.h fss_basic.h fss_basic_list.h fss_errors.h fss_extended.h fss_macro.h program.h serialized.h strings.h
 build_shared yes
 build_static yes
 

diff --git a/level_1/fl_program/c/program.c b/level_1/fl_program/c/program.c
new file mode 100644 (file)
index 0000000..520a3d1
--- /dev/null
+++ b/level_1/fl_program/c/program.c
@@ -0,0 +1,17 @@
+#include <level_1/program.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifndef _di_fl_program_print_version_
+  f_return_status fl_program_print_version(const f_string version) {
+    printf("%s\n", version);
+
+    return f_none;
+  }
+#endif // _di_fl_program_print_version_
+
+#ifdef __cplusplus
+} // extern "C"
+#endif

diff --git a/level_1/fl_program/c/program.h b/level_1/fl_program/c/program.h
new file mode 100644 (file)
index 0000000..51e289c
--- /dev/null
+++ b/level_1/fl_program/c/program.h
@@ -0,0 +1,43 @@
+/**
+ * FLL - Level 1
+ *
+ * Project: Program
+ * API Version: 0.5
+ * Licenses: lgplv2.1
+ *
+ * Provide functions commonly used by FLL based programs.
+ */
+#ifndef _FL_program_h
+#define _FL_program_h
+
+// libc include
+#include <stdio.h>
+
+// fll-0 includes
+#include <level_0/errors.h>
+#include <level_0/strings.h>
+#include <level_0/types.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifndef _di_fl_program_print_version_
+  /**
+   * Print version.
+   *
+   * @param version
+   *   The version number to print.
+   *
+   * @return
+   *   f_none on success.
+   *   Error bit is set on error.
+   */
+  extern f_return_status fl_program_print_version(const f_string version);
+#endif // _di_fl_program_print_version_
+
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
+#endif // _FL_program_h

diff --git a/level_1/fl_program/data/build/dependencies b/level_1/fl_program/data/build/dependencies
new file mode 100644 (file)
index 0000000..90e12bc
--- /dev/null
+++ b/level_1/fl_program/data/build/dependencies
@@ -0,0 +1,3 @@
+f_types
+f_errors
+f_strings

diff --git a/level_1/fl_program/data/build/settings b/level_1/fl_program/data/build/settings
new file mode 100644 (file)
index 0000000..1719a54
--- /dev/null
+++ b/level_1/fl_program/data/build/settings
@@ -0,0 +1,23 @@
+# fss-0000
+
+project_name fl_program
+project_level 1
+
+version_major 0
+version_minor 5
+version_micro 0
+
+build_compiler gcc
+build_linker ar
+build_libraries -lc
+build_sources_library program.c
+build_sources_program
+build_sources_headers program.h
+build_shared yes
+build_static yes
+
+flags_all -z now
+flags_shared
+flags_static
+flags_library -fPIC
+flags_program -fPIE

diff --git a/level_3/firewall/c/firewall.c b/level_3/firewall/c/firewall.c
index 3f5569f0091f1c3212c9ba293d511e33a22173b2..16a7658a4a1d356f95fb28a410d0e6436ed1724a 100644 (file)
--- a/level_3/firewall/c/firewall.c
+++ b/level_3/firewall/c/firewall.c
@@ -11,15 +11,6 @@
 extern "C" {
 #endif
 
-// version printed may be used by scripts, so this will only print the version number and a newline, no extra information or colors
-#ifndef _di_firewall_print_version_
-  f_return_status firewall_print_version(const firewall_data data) {
-    printf("%s\n", firewall_version);
-
-    return f_none;
-  }
-#endif // _firewall_print_version_
-
 #ifndef _di_firewall_print_help_
   f_return_status firewall_print_help(const firewall_data data) {
     printf("\n");
@@ -164,7 +155,7 @@ extern "C" {
       firewall_print_help(*data);
     }
     else if (data->parameters[firewall_parameter_version].result == f_console_result_found) {
-      firewall_print_version(*data);
+      fl_program_print_version(firewall_version);
     }
     else {
       // now determine which command was placed first

diff --git a/level_3/firewall/c/firewall.h b/level_3/firewall/c/firewall.h
index a2fc99176c6c93bc008c3f6887cf5621b32b4103..7c134ba36476087732187972660fca4502967de3 100644 (file)
--- a/level_3/firewall/c/firewall.h
+++ b/level_3/firewall/c/firewall.h
@@ -29,6 +29,7 @@
 #include <level_1/console.h>
 #include <level_1/directory.h>
 #include <level_1/file.h>
+#include <level_1/program.h>
 #include <level_1/strings.h>
 
 // fll-2 includes
@@ -296,13 +297,6 @@ extern "C" {
     }
 #endif // _di_firewall_data_
 
-#ifndef _di_firewall_print_version_
-  /**
-   * Print version.
-   */
-  extern f_return_status firewall_print_version(const firewall_data data);
-#endif // _di_firewall_print_version_
-
 #ifndef _di_firewall_print_help_
   /**
    * Print help.

diff --git a/level_3/firewall/data/build/dependencies b/level_3/firewall/data/build/dependencies
index 3d9fca4c01b1f7358a5e875c28dff4d1a336ac45..55693f49feeb67168b0df22b5e54acf344e14c84 100644 (file)
--- a/level_3/firewall/data/build/dependencies
+++ b/level_3/firewall/data/build/dependencies
@@ -1,17 +1,18 @@
-f_types
+f_console
 f_errors
-f_strings
+f_fss
 f_memory
 f_pipe
 f_print
-f_console
-f_fss
-fl_console
-fl_file
-fl_strings
+f_strings
+f_types
 fl_colors
+fl_console
 fl_directory
+fl_file
 fl_fss
+fl_program
+fl_strings
 fll_colors
-fll_fss
 fll_execute
+fll_fss

diff --git a/level_3/firewall/data/build/settings b/level_3/firewall/data/build/settings
index 375aaa9ec9b5da64ec65b711678697c8ff2abdc7..18f3d976ee736378c6422ff51154fd04f3c16070 100644 (file)
--- a/level_3/firewall/data/build/settings
+++ b/level_3/firewall/data/build/settings
@@ -9,7 +9,7 @@ version_micro 2
 
 build_compiler gcc
 build_linker ar
-build_libraries -lfll_colors -lfll_fss -lfll_execute -lfl_directory -lfl_colors -lfl_strings -lfl_file -lfl_console -lfl_fss -lf_pipe -lf_file -lf_print -lf_conversion -lf_console -lf_memory -lc
+build_libraries -lfll_colors -lfll_fss -lfll_execute -lfl_directory -lfl_colors -lfl_strings -lfl_file -lfl_console -lfl_fss -lfl_program -lf_pipe -lf_file -lf_print -lf_conversion -lf_console -lf_memory -lc
 build_sources_library firewall.c private-firewall.c
 build_sources_program main.c
 build_sources_headers firewall.h

diff --git a/level_3/fss_basic_list_read/c/fss_basic_list_read.c b/level_3/fss_basic_list_read/c/fss_basic_list_read.c
index 4c1d541041d17aac5d9509acf2ebf42b93f331c1..141d9d1f17934ff79ac0558e86cffd0a256235a8 100644 (file)
--- a/level_3/fss_basic_list_read/c/fss_basic_list_read.c
+++ b/level_3/fss_basic_list_read/c/fss_basic_list_read.c
@@ -4,15 +4,6 @@
 extern "C" {
 #endif
 
-// version printed may be used by scripts, so this will only print the version number and a newline, no extra information or colors
-#ifndef _di_fss_basic_list_read_print_version_
-  f_return_status fss_basic_list_read_print_version(const fss_basic_list_read_data data) {
-    printf("%s\n", fss_basic_list_read_version);
-
-    return f_none;
-  }
-#endif // _fss_basic_list_read_print_version_
-
 #ifndef _di_fss_basic_list_read_print_help_
   f_return_status fss_basic_list_read_print_help(const fss_basic_list_read_data data) {
     printf("\n");
@@ -173,7 +164,7 @@ extern "C" {
       fss_basic_list_read_print_help(*data);
     }
     else if (data->parameters[fss_basic_list_read_parameter_version].result == f_console_result_found) {
-      fss_basic_list_read_print_version(*data);
+      fl_program_print_version(fss_basic_list_read_version);
     }
     else if (data->remaining.used > 0 || data->process_pipe) {
       f_string_length counter = 0;

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 413253d83ff5f558967da0ea10ee1f01c00ecceb..280d94bf4dd9ed73da6b74b284ad5dde376239b3 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
@@ -30,6 +30,7 @@
 #include <level_1/console.h>
 #include <level_1/directory.h>
 #include <level_1/file.h>
+#include <level_1/program.h>
 #include <level_1/strings.h>
 
 // fll-2 includes
@@ -126,13 +127,6 @@ extern "C" {
     }
 #endif // _di_fss_basic_list_read_data_
 
-#ifndef _di_fss_basic_list_read_print_version_
-  /**
-   * Print version.
-   */
-  extern f_return_status fss_basic_list_read_print_version(const fss_basic_list_read_data data);
-#endif // _di_fss_basic_list_read_print_version_
-
 #ifndef _di_fss_basic_list_read_print_help_
   /**
    * Print help.

diff --git a/level_3/fss_basic_list_read/data/build/dependencies b/level_3/fss_basic_list_read/data/build/dependencies
index 3d9fca4c01b1f7358a5e875c28dff4d1a336ac45..55693f49feeb67168b0df22b5e54acf344e14c84 100644 (file)
--- a/level_3/fss_basic_list_read/data/build/dependencies
+++ b/level_3/fss_basic_list_read/data/build/dependencies
@@ -1,17 +1,18 @@
-f_types
+f_console
 f_errors
-f_strings
+f_fss
 f_memory
 f_pipe
 f_print
-f_console
-f_fss
-fl_console
-fl_file
-fl_strings
+f_strings
+f_types
 fl_colors
+fl_console
 fl_directory
+fl_file
 fl_fss
+fl_program
+fl_strings
 fll_colors
-fll_fss
 fll_execute
+fll_fss

diff --git a/level_3/fss_basic_list_read/data/build/settings b/level_3/fss_basic_list_read/data/build/settings
index 3c878e8e4fa862a5864378e6746b543ce4921c8f..2c0b92bc2cf2969f41b2e5ce2141c49d83eefd7a 100644 (file)
--- a/level_3/fss_basic_list_read/data/build/settings
+++ b/level_3/fss_basic_list_read/data/build/settings
@@ -9,7 +9,7 @@ version_micro 2
 
 build_compiler gcc
 build_linker ar
-build_libraries -lfll_colors -lfll_fss -lfll_execute -lfl_directory -lfl_colors -lfl_strings -lfl_file -lfl_console -lfl_fss -lf_pipe -lf_file -lf_print -lf_conversion -lf_console -lf_memory -lc
+build_libraries -lfll_colors -lfll_fss -lfll_execute -lfl_directory -lfl_colors -lfl_strings -lfl_file -lfl_console -lfl_program -lfl_fss -lf_pipe -lf_file -lf_print -lf_conversion -lf_console -lf_memory -lc
 build_sources_library fss_basic_list_read.c
 build_sources_program main.c
 build_sources_headers fss_basic_list_read.h

diff --git a/level_3/fss_basic_list_write/c/fss_basic_list_write.c b/level_3/fss_basic_list_write/c/fss_basic_list_write.c
index 0f728f2a954f44daa9f3f9f80b3e8216988d4976..2a53f1b952c845f83e9cdd1dee3e90de3d3130f3 100644 (file)
--- a/level_3/fss_basic_list_write/c/fss_basic_list_write.c
+++ b/level_3/fss_basic_list_write/c/fss_basic_list_write.c
@@ -4,15 +4,6 @@
 extern "C" {
 #endif
 
-// version printed may be used by scripts, so this will only print the version number and a newline, no extra information or colors
-#ifndef _di_fss_basic_list_write_print_version_
-  f_return_status fss_basic_list_write_print_version(const fss_basic_list_write_data data) {
-    printf("%s\n", fss_basic_list_write_version);
-
-    return f_none;
-  }
-#endif // _fss_basic_list_write_print_version_
-
 #ifndef _di_fss_basic_list_write_print_help_
   f_return_status fss_basic_list_write_print_help(const fss_basic_list_write_data data) {
     printf("\n");
@@ -145,7 +136,7 @@ extern "C" {
       fss_basic_list_write_print_help(*data);
     }
     else if (data->parameters[fss_basic_list_write_parameter_version].result == f_console_result_found) {
-      fss_basic_list_write_print_version(*data);
+      fl_program_print_version(fss_basic_list_write_version);
     }
     else {
       f_array_length counter = 0;

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 8557debe7fcaf6802d6432f87ad530bf2b18e702..cfdb9297b09d4ac25eddf4e68f0b5f5019e048ad 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
@@ -27,6 +27,7 @@
 #include <level_1/errors.h>
 #include <level_1/file.h>
 #include <level_1/fss_basic_list.h>
+#include <level_1/program.h>
 #include <level_1/strings.h>
 
 // fll-2 includes
@@ -102,13 +103,6 @@ extern "C" {
     }
 #endif // _di_fss_basic_list_write_data_
 
-#ifndef _di_fss_basic_list_write_print_version_
-  /**
-   * Print version.
-   */
-  extern f_return_status fss_basic_list_write_print_version(const fss_basic_list_write_data data);
-#endif // _di_fss_basic_list_write_print_version_
-
 #ifndef _di_fss_basic_list_write_print_help_
   /**
    * Print help.

diff --git a/level_3/fss_basic_list_write/data/build/dependencies b/level_3/fss_basic_list_write/data/build/dependencies
index 3d9fca4c01b1f7358a5e875c28dff4d1a336ac45..55693f49feeb67168b0df22b5e54acf344e14c84 100644 (file)
--- a/level_3/fss_basic_list_write/data/build/dependencies
+++ b/level_3/fss_basic_list_write/data/build/dependencies
@@ -1,17 +1,18 @@
-f_types
+f_console
 f_errors
-f_strings
+f_fss
 f_memory
 f_pipe
 f_print
-f_console
-f_fss
-fl_console
-fl_file
-fl_strings
+f_strings
+f_types
 fl_colors
+fl_console
 fl_directory
+fl_file
 fl_fss
+fl_program
+fl_strings
 fll_colors
-fll_fss
 fll_execute
+fll_fss

diff --git a/level_3/fss_basic_list_write/data/build/settings b/level_3/fss_basic_list_write/data/build/settings
index e2110178bd472207e6966e4e143b48a6f4d804dd..d520c8e6913e0485dd81d52db5055f3ace867fd3 100644 (file)
--- a/level_3/fss_basic_list_write/data/build/settings
+++ b/level_3/fss_basic_list_write/data/build/settings
@@ -9,7 +9,7 @@ version_micro 2
 
 build_compiler gcc
 build_linker ar
-build_libraries -lfll_colors -lfll_fss  -lfl_fss -lfl_file -lfl_errors -lfl_colors -lfl_console -lf_file -lf_print -lf_pipe -lf_conversion -lf_console -lf_memory -lc
+build_libraries -lfll_colors -lfll_fss  -lfl_fss -lfl_file -lfl_errors -lfl_colors -lfl_console -lfl_program -lf_file -lf_print -lf_pipe -lf_conversion -lf_console -lf_memory -lc
 build_sources_library fss_basic_list_write.c
 build_sources_program main.c
 build_sources_headers fss_basic_list_write.h

diff --git a/level_3/fss_basic_read/c/fss_basic_read.c b/level_3/fss_basic_read/c/fss_basic_read.c
index 313fac342bf7c9341056e14df9e72208f7c5733b..5f88489ce2725c955a08c6c9dfbbd7df48c5de22 100644 (file)
--- a/level_3/fss_basic_read/c/fss_basic_read.c
+++ b/level_3/fss_basic_read/c/fss_basic_read.c
@@ -4,15 +4,6 @@
 extern "C" {
 #endif
 
-// version printed may be used by scripts, so this will only print the version number and a newline, no extra information or colors
-#ifndef _di_fss_basic_read_print_version_
-  f_return_status fss_basic_read_print_version(const fss_basic_read_data data) {
-    printf("%s\n", fss_basic_read_version);
-
-    return f_none;
-  }
-#endif // _fss_basic_read_print_version_
-
 #ifndef _di_fss_basic_read_print_help_
   f_return_status fss_basic_read_print_help(const fss_basic_read_data data) {
     printf("\n");
@@ -159,7 +150,7 @@ extern "C" {
       fss_basic_read_print_help(*data);
     }
     else if (data->parameters[fss_basic_read_parameter_version].result == f_console_result_found) {
-      fss_basic_read_print_version(*data);
+      fl_program_print_version(fss_basic_read_version);
     }
     else if (data->remaining.used > 0 || data->process_pipe) {
       f_string_length counter = 0;

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 3ae81f81127fe871f32be2dd101505c813683ee5..b258b9d276686d5deea6c927e717784140f13241 100644 (file)
--- a/level_3/fss_basic_read/c/fss_basic_read.h
+++ b/level_3/fss_basic_read/c/fss_basic_read.h
@@ -30,6 +30,7 @@
 #include <level_1/console.h>
 #include <level_1/directory.h>
 #include <level_1/file.h>
+#include <level_1/program.h>
 #include <level_1/strings.h>
 
 // fll-2 includes
@@ -118,13 +119,6 @@ extern "C" {
     }
 #endif // _di_fss_basic_read_data_
 
-#ifndef _di_fss_basic_read_print_version_
-  /**
-   * Print version.
-   */
-  extern f_return_status fss_basic_read_print_version(const fss_basic_read_data data);
-#endif // _di_fss_basic_read_print_version_
-
 #ifndef _di_fss_basic_read_print_help_
   /**
    * Print help.

diff --git a/level_3/fss_basic_read/data/build/dependencies b/level_3/fss_basic_read/data/build/dependencies
index 3d9fca4c01b1f7358a5e875c28dff4d1a336ac45..55693f49feeb67168b0df22b5e54acf344e14c84 100644 (file)
--- a/level_3/fss_basic_read/data/build/dependencies
+++ b/level_3/fss_basic_read/data/build/dependencies
@@ -1,17 +1,18 @@
-f_types
+f_console
 f_errors
-f_strings
+f_fss
 f_memory
 f_pipe
 f_print
-f_console
-f_fss
-fl_console
-fl_file
-fl_strings
+f_strings
+f_types
 fl_colors
+fl_console
 fl_directory
+fl_file
 fl_fss
+fl_program
+fl_strings
 fll_colors
-fll_fss
 fll_execute
+fll_fss

diff --git a/level_3/fss_basic_read/data/build/settings b/level_3/fss_basic_read/data/build/settings
index ca3b0ed5216b73316504a23aa935977f6d47f9fa..22071f2eb8722717e9afc1959a19ee37d46ea826 100644 (file)
--- a/level_3/fss_basic_read/data/build/settings
+++ b/level_3/fss_basic_read/data/build/settings
@@ -9,7 +9,7 @@ version_micro 2
 
 build_compiler gcc
 build_linker ar
-build_libraries -lfll_colors -lfll_fss -lfll_execute -lfl_directory -lfl_colors -lfl_strings -lfl_file -lfl_console -lfl_fss -lf_print -lf_file -lf_pipe -lf_conversion -lf_console -lf_memory -lc
+build_libraries -lfll_colors -lfll_fss -lfll_execute -lfl_directory -lfl_colors -lfl_strings -lfl_file -lfl_console -lfl_program -lfl_fss -lf_print -lf_file -lf_pipe -lf_conversion -lf_console -lf_memory -lc
 build_sources_library fss_basic_read.c
 build_sources_program main.c
 build_sources_headers fss_basic_read.h

diff --git a/level_3/fss_basic_write/c/fss_basic_write.c b/level_3/fss_basic_write/c/fss_basic_write.c
index 3dee73010d1752e12c4248e9efb4801f192a2484..8607d53a39cb9e8009995b50a93dde8aaae35ff4 100644 (file)
--- a/level_3/fss_basic_write/c/fss_basic_write.c
+++ b/level_3/fss_basic_write/c/fss_basic_write.c
@@ -4,15 +4,6 @@
 extern "C" {
 #endif
 
-// version printed may be used by scripts, so this will only print the version number and a newline, no extra information or colors
-#ifndef _di_fss_basic_write_print_version_
-  f_return_status fss_basic_write_print_version(const fss_basic_write_data data) {
-    printf("%s\n", fss_basic_write_version);
-
-    return f_none;
-  }
-#endif // _fss_basic_write_print_version_
-
 #ifndef _di_fss_basic_write_print_help_
   f_return_status fss_basic_write_print_help(const fss_basic_write_data data) {
     printf("\n");
@@ -145,7 +136,7 @@ extern "C" {
       fss_basic_write_print_help(*data);
     }
     else if (data->parameters[fss_basic_write_parameter_version].result == f_console_result_found) {
-      fss_basic_write_print_version(*data);
+      fl_program_print_version(fss_basic_write_version);
     }
     else {
       f_array_length counter = 0;

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 5bcca415f24cbf043f9a29178559cb6cc6d7bad8..268be2c1ace4818b608c9aa368a1778afef04b51 100644 (file)
--- a/level_3/fss_basic_write/c/fss_basic_write.h
+++ b/level_3/fss_basic_write/c/fss_basic_write.h
@@ -26,6 +26,7 @@
 #include <level_1/console.h>
 #include <level_1/errors.h>
 #include <level_1/file.h>
+#include <level_1/program.h>
 #include <level_1/strings.h>
 
 // fll-2 includes
@@ -101,13 +102,6 @@ extern "C" {
     }
 #endif // _di_fss_basic_write_data_
 
-#ifndef _di_fss_basic_write_print_version_
-  /**
-   * Print version.
-   */
-  extern f_return_status fss_basic_write_print_version(const fss_basic_write_data data);
-#endif // _di_fss_basic_write_print_version_
-
 #ifndef _di_fss_basic_write_print_help_
   /**
    * Print help.

diff --git a/level_3/fss_basic_write/data/build/dependencies b/level_3/fss_basic_write/data/build/dependencies
index 3d9fca4c01b1f7358a5e875c28dff4d1a336ac45..55693f49feeb67168b0df22b5e54acf344e14c84 100644 (file)
--- a/level_3/fss_basic_write/data/build/dependencies
+++ b/level_3/fss_basic_write/data/build/dependencies
@@ -1,17 +1,18 @@
-f_types
+f_console
 f_errors
-f_strings
+f_fss
 f_memory
 f_pipe
 f_print
-f_console
-f_fss
-fl_console
-fl_file
-fl_strings
+f_strings
+f_types
 fl_colors
+fl_console
 fl_directory
+fl_file
 fl_fss
+fl_program
+fl_strings
 fll_colors
-fll_fss
 fll_execute
+fll_fss

diff --git a/level_3/fss_basic_write/data/build/settings b/level_3/fss_basic_write/data/build/settings
index 350a4b1f0c7677ac824fef3b7d4b7dce10f4a92f..b481bf3da3e42e9bafde24552951a7083204011b 100644 (file)
--- a/level_3/fss_basic_write/data/build/settings
+++ b/level_3/fss_basic_write/data/build/settings
@@ -9,7 +9,7 @@ version_micro 2
 
 build_compiler gcc
 build_linker ar
-build_libraries -lfll_colors -lfll_fss -lfl_fss -lfl_file -lfl_errors -lfl_colors -lfl_console -lf_file -lf_print -lf_pipe -lf_conversion -lf_console -lf_memory -lc
+build_libraries -lfll_colors -lfll_fss -lfl_fss -lfl_file -lfl_errors -lfl_colors -lfl_console -lfl_program -lf_file -lf_print -lf_pipe -lf_conversion -lf_console -lf_memory -lc
 build_sources_library fss_basic_write.c
 build_sources_program main.c
 build_sources_headers fss_basic_write.h

diff --git a/level_3/fss_extended_read/c/fss_extended_read.c b/level_3/fss_extended_read/c/fss_extended_read.c
index 8f3452ccae95b3ad3c1eddf9b66e87cc9a9e2ca5..c03314c01b0f062e3c2ad0017936fb43ec2a30e8 100644 (file)
--- a/level_3/fss_extended_read/c/fss_extended_read.c
+++ b/level_3/fss_extended_read/c/fss_extended_read.c
@@ -4,15 +4,6 @@
 extern "C" {
 #endif
 
-// version printed may be used by scripts, so this will only print the version number and a newline, no extra information or colors
-#ifndef _di_fss_extended_read_print_version_
-  f_return_status fss_extended_read_print_version(const fss_extended_read_data data) {
-    printf("%s\n", fss_extended_read_version);
-
-    return f_none;
-  }
-#endif // _fss_extended_read_print_version_
-
 #ifndef _di_fss_extended_read_print_help_
   f_return_status fss_extended_read_print_help(const fss_extended_read_data data) {
     printf("\n");
@@ -166,7 +157,7 @@ extern "C" {
       fss_extended_read_print_help(*data);
     }
     else if (data->parameters[fss_extended_read_parameter_version].result == f_console_result_found) {
-      fss_extended_read_print_version(*data);
+      fl_program_print_version(fss_extended_read_version);
     }
     else if (data->remaining.used > 0 || data->process_pipe) {
       f_string_length counter = 0;

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 6ea6bf304b7d7f2542a3f083d8c0cb9b7f55a25f..4d77c53503df2fd4ad298d0974f9e4c219c3c29a 100644 (file)
--- a/level_3/fss_extended_read/c/fss_extended_read.h
+++ b/level_3/fss_extended_read/c/fss_extended_read.h
@@ -30,6 +30,7 @@
 #include <level_1/console.h>
 #include <level_1/directory.h>
 #include <level_1/file.h>
+#include <level_1/program.h>
 #include <level_1/strings.h>
 
 // fll-2 includes
@@ -122,13 +123,6 @@ extern "C" {
     }
 #endif // _di_fss_extended_read_data_
 
-#ifndef _di_fss_extended_read_print_version_
-  /**
-   * Print version.
-   */
-  extern f_return_status fss_extended_read_print_version(const fss_extended_read_data data);
-#endif // _di_fss_extended_read_print_version_
-
 #ifndef _di_fss_extended_read_print_help_
   /**
    * Print help.

diff --git a/level_3/fss_extended_read/data/build/dependencies b/level_3/fss_extended_read/data/build/dependencies
index 3d9fca4c01b1f7358a5e875c28dff4d1a336ac45..55693f49feeb67168b0df22b5e54acf344e14c84 100644 (file)
--- a/level_3/fss_extended_read/data/build/dependencies
+++ b/level_3/fss_extended_read/data/build/dependencies
@@ -1,17 +1,18 @@
-f_types
+f_console
 f_errors
-f_strings
+f_fss
 f_memory
 f_pipe
 f_print
-f_console
-f_fss
-fl_console
-fl_file
-fl_strings
+f_strings
+f_types
 fl_colors
+fl_console
 fl_directory
+fl_file
 fl_fss
+fl_program
+fl_strings
 fll_colors
-fll_fss
 fll_execute
+fll_fss

diff --git a/level_3/fss_extended_read/data/build/settings b/level_3/fss_extended_read/data/build/settings
index eac4c6d88f0d95a63967be61d69ace799461380b..ee9a21985e45378697d5c25f766de39971e014c1 100644 (file)
--- a/level_3/fss_extended_read/data/build/settings
+++ b/level_3/fss_extended_read/data/build/settings
@@ -9,7 +9,7 @@ version_micro 2
 
 build_compiler gcc
 build_linker ar
-build_libraries -lfll_colors -lfll_fss -lfll_execute -lfl_directory -lfl_colors -lfl_strings -lfl_file -lfl_console -lfl_fss -lf_pipe -lf_file -lf_print -lf_conversion -lf_console -lf_memory -lc
+build_libraries -lfll_colors -lfll_fss -lfll_execute -lfl_directory -lfl_colors -lfl_strings -lfl_file -lfl_console -lfl_program -lfl_fss -lf_pipe -lf_file -lf_print -lf_conversion -lf_console -lf_memory -lc
 build_sources_library fss_extended_read.c
 build_sources_program main.c
 build_sources_headers fss_extended_read.h

diff --git a/level_3/fss_extended_write/c/fss_extended_write.c b/level_3/fss_extended_write/c/fss_extended_write.c
index 0ad4afd4c06a2a0486e6045e73592c8147877700..08013ea59a08f98bd61ba079ed55663cd3fd94db 100644 (file)
--- a/level_3/fss_extended_write/c/fss_extended_write.c
+++ b/level_3/fss_extended_write/c/fss_extended_write.c
@@ -4,15 +4,6 @@
 extern "C" {
 #endif
 
-// version printed may be used by scripts, so this will only print the version number and a newline, no extra information or colors
-#ifndef _di_fss_extended_write_print_version_
-  f_return_status fss_extended_write_print_version(const fss_extended_write_data data) {
-    printf("%s\n", fss_extended_write_version);
-
-    return f_none;
-  }
-#endif // _fss_extended_write_print_version_
-
 #ifndef _di_fss_extended_write_print_help_
   f_return_status fss_extended_write_print_help(const fss_extended_write_data data) {
     printf("\n");
@@ -152,7 +143,7 @@ extern "C" {
       fss_extended_write_print_help(*data);
     }
     else if (data->parameters[fss_extended_write_parameter_version].result == f_console_result_found) {
-      fss_extended_write_print_version(*data);
+      fl_program_print_version(fss_extended_write_version);
     }
     else {
       f_array_length counter = 0;

diff --git a/level_3/fss_extended_write/c/fss_extended_write.h b/level_3/fss_extended_write/c/fss_extended_write.h
index f8e2cbcdf066644fac09be30e40df679436b0bb3..68f9049c17483eaa4a4c0cd7744f4e75cc279a8e 100644 (file)
--- a/level_3/fss_extended_write/c/fss_extended_write.h
+++ b/level_3/fss_extended_write/c/fss_extended_write.h
@@ -27,6 +27,7 @@
 #include <level_1/errors.h>
 #include <level_1/file.h>
 #include <level_1/fss_extended.h>
+#include <level_1/program.h>
 #include <level_1/strings.h>
 
 // fll-2 includes
@@ -106,13 +107,6 @@ extern "C" {
     }
 #endif // _di_fss_extended_write_data_
 
-#ifndef _di_fss_extended_write_print_version_
-  /**
-   * Print version.
-   */
-  extern f_return_status fss_extended_write_print_version(const fss_extended_write_data data);
-#endif // _di_fss_extended_write_print_version_
-
 #ifndef _di_fss_extended_write_print_help_
   /**
    * Print help.

diff --git a/level_3/fss_extended_write/data/build/dependencies b/level_3/fss_extended_write/data/build/dependencies
index 3d9fca4c01b1f7358a5e875c28dff4d1a336ac45..55693f49feeb67168b0df22b5e54acf344e14c84 100644 (file)
--- a/level_3/fss_extended_write/data/build/dependencies
+++ b/level_3/fss_extended_write/data/build/dependencies
@@ -1,17 +1,18 @@
-f_types
+f_console
 f_errors
-f_strings
+f_fss
 f_memory
 f_pipe
 f_print
-f_console
-f_fss
-fl_console
-fl_file
-fl_strings
+f_strings
+f_types
 fl_colors
+fl_console
 fl_directory
+fl_file
 fl_fss
+fl_program
+fl_strings
 fll_colors
-fll_fss
 fll_execute
+fll_fss

diff --git a/level_3/fss_extended_write/data/build/settings b/level_3/fss_extended_write/data/build/settings
index fcc6a4d4511e16edf5b3d66b24a8775a2c88e86f..a3fba1c750b46f90bc0f2e22949b9d5549a220c8 100644 (file)
--- a/level_3/fss_extended_write/data/build/settings
+++ b/level_3/fss_extended_write/data/build/settings
@@ -9,7 +9,7 @@ version_micro 2
 
 build_compiler gcc
 build_linker ar
-build_libraries -lfll_colors -lfll_fss -lfl_fss -lfl_file -lfl_errors -lfl_colors -lfl_console -lf_file -lf_print -lf_pipe -lf_conversion -lf_console -lf_memory -lc
+build_libraries -lfll_colors -lfll_fss -lfl_fss -lfl_file -lfl_errors -lfl_colors -lfl_console -lfl_program -lf_file -lf_print -lf_pipe -lf_conversion -lf_console -lf_memory -lc
 build_sources_library fss_extended_write.c
 build_sources_program main.c
 build_sources_headers fss_extended_write.h

diff --git a/level_3/fss_return_code/c/fss_return_code.c b/level_3/fss_return_code/c/fss_return_code.c
index 941f2e392f6263f4d0b1dda9f4aa6c870481621e..66ec08d480bec00974e56a61f649c315a93bcfbf 100644 (file)
--- a/level_3/fss_return_code/c/fss_return_code.c
+++ b/level_3/fss_return_code/c/fss_return_code.c
@@ -4,15 +4,6 @@
 extern "C" {
 #endif
 
-// version printed may be used by scripts, so this will only print the version number and a newline, no extra information or colors
-#ifndef _di_fss_return_code_print_version_
-  f_return_status fss_return_code_print_version(const fss_return_code_data data) {
-    printf("%s\n", fss_return_code_version);
-
-    return f_none;
-  }
-#endif // _fss_return_code_print_version_
-
 #ifndef _di_fss_return_code_print_help_
   f_return_status fss_return_code_print_help(const fss_return_code_data data) {
     printf("\n");
@@ -157,7 +148,7 @@ extern "C" {
       fss_return_code_print_help(*data);
     }
     else if (data->parameters[fss_return_code_parameter_version].result == f_console_result_found) {
-      fss_return_code_print_version(*data);
+      fl_program_print_version(fss_return_code_version);
     }
     else if (data->parameters[fss_return_code_parameter_is_error].result == f_console_result_found && data->remaining.used > 0) {
       f_array_length counter = 0;

diff --git a/level_3/fss_return_code/c/fss_return_code.h b/level_3/fss_return_code/c/fss_return_code.h
index 0359e66d1b796324be34b794502388e78f3c1fec..1551925e1d2d40b1fb5080f8bb254f07b73e0341 100644 (file)
--- a/level_3/fss_return_code/c/fss_return_code.h
+++ b/level_3/fss_return_code/c/fss_return_code.h
@@ -25,6 +25,7 @@
 #include <level_1/colors.h>
 #include <level_1/console.h>
 #include <level_1/errors.h>
+#include <level_1/program.h>
 #include <level_1/strings.h>
 
 // fll-2 includes
@@ -104,13 +105,6 @@ extern "C" {
     }
 #endif // _di_fss_return_code_data_
 
-#ifndef _di_fss_return_code_print_version_
-  /**
-   * Print version.
-   */
-  extern f_return_status fss_return_code_print_version(const fss_return_code_data data);
-#endif // _di_fss_return_code_print_version_
-
 #ifndef _di_fss_return_code_print_help_
   /**
    * Print help.

diff --git a/level_3/fss_return_code/data/build/dependencies b/level_3/fss_return_code/data/build/dependencies
index 048095bb8425f1e6628cc06582895a384a75ff13..55693f49feeb67168b0df22b5e54acf344e14c84 100644 (file)
--- a/level_3/fss_return_code/data/build/dependencies
+++ b/level_3/fss_return_code/data/build/dependencies
@@ -1,14 +1,18 @@
-f_types
+f_console
 f_errors
-f_strings
+f_fss
+f_memory
 f_pipe
 f_print
-f_console
-f_fss
+f_strings
+f_types
+fl_colors
 fl_console
+fl_directory
 fl_file
-fl_strings
-fl_colors
 fl_fss
+fl_program
+fl_strings
 fll_colors
+fll_execute
 fll_fss

diff --git a/level_3/fss_return_code/data/build/settings b/level_3/fss_return_code/data/build/settings
index c80146801eeaf596a878a1adf3601aa85da1ecb1..42ad0051609569110a3ab669de1aadda0a74d861 100644 (file)
--- a/level_3/fss_return_code/data/build/settings
+++ b/level_3/fss_return_code/data/build/settings
@@ -9,7 +9,7 @@ version_micro 2
 
 build_compiler gcc
 build_linker ar
-build_libraries -lfll_colors -lfll_fss -lfl_fss -lfl_errors -lfl_colors -lfl_console -lf_print -lf_pipe -lf_conversion -lf_console -lf_memory -lc
+build_libraries -lfll_colors -lfll_fss -lfl_fss -lfl_errors -lfl_colors -lfl_console -lfl_program -lf_print -lf_pipe -lf_conversion -lf_console -lf_memory -lc
 build_sources_library fss_return_code.c
 build_sources_program main.c
 build_sources_headers fss_return_code.h

diff --git a/level_3/init/data/build/dependencies b/level_3/init/data/build/dependencies
index 3d9fca4c01b1f7358a5e875c28dff4d1a336ac45..55693f49feeb67168b0df22b5e54acf344e14c84 100644 (file)
--- a/level_3/init/data/build/dependencies
+++ b/level_3/init/data/build/dependencies
@@ -1,17 +1,18 @@
-f_types
+f_console
 f_errors
-f_strings
+f_fss
 f_memory
 f_pipe
 f_print
-f_console
-f_fss
-fl_console
-fl_file
-fl_strings
+f_strings
+f_types
 fl_colors
+fl_console
 fl_directory
+fl_file
 fl_fss
+fl_program
+fl_strings
 fll_colors
-fll_fss
 fll_execute
+fll_fss

diff --git a/level_3/init/data/build/settings b/level_3/init/data/build/settings
index 01d0835fcc6cc4b09004c5497adbc9b4d56fc588..9b1f009bdcd65b2fbbeaab946d9619b46b5c7590 100644 (file)
--- a/level_3/init/data/build/settings
+++ b/level_3/init/data/build/settings
@@ -9,7 +9,7 @@ version_micro 2
 
 build_compiler gcc
 build_linker ar
-build_libraries -lfll_colors -lfll_fss -lfll_execute -lfl_directory -lfl_colors -lfl_strings -lfl_file -lfl_console -lfl_fss -lf_pipe -lf_file -lf_print -lf_conversion -lf_console -lf_memory -lc
+build_libraries -lfll_colors -lfll_fss -lfll_execute -lfl_directory -lfl_colors -lfl_strings -lfl_file -lfl_console -lfl_program -lfl_fss -lf_pipe -lf_file -lf_print -lf_conversion -lf_console -lf_memory -lc
 build_sources_library init.c private-init.c
 build_sources_program main.c
 build_sources_headers init.h

diff --git a/level_3/return_code/c/return_code.c b/level_3/return_code/c/return_code.c
index b0533605dc19b626a932f4dbc767456ec4f8580b..3b326722f24bc9e0169075776dc9f71e7c0b05d8 100644 (file)
--- a/level_3/return_code/c/return_code.c
+++ b/level_3/return_code/c/return_code.c
@@ -4,15 +4,6 @@
 extern "C" {
 #endif
 
-// version printed may be used by scripts, so this will only print the version number and a newline, no extra information or colors
-#ifndef _di_return_code_print_version_
-  f_return_status return_code_print_version(const return_code_data data) {
-    printf("%s\n", return_code_version);
-
-    return f_none;
-  }
-#endif // _return_code_print_version_
-
 #ifndef _di_return_code_print_help_
   f_return_status return_code_print_help(const return_code_data data) {
     printf("\n");
@@ -157,7 +148,7 @@ extern "C" {
       return_code_print_help(*data);
     }
     else if (data->parameters[return_code_parameter_version].result == f_console_result_found) {
-      return_code_print_version(*data);
+      fl_program_print_version(return_code_version);
     }
     else if (data->parameters[return_code_parameter_is_error].result == f_console_result_found && data->remaining.used > 0) {
       f_array_length counter = 0;

diff --git a/level_3/return_code/c/return_code.h b/level_3/return_code/c/return_code.h
index aa229519cc71953d7e22a11fea72d4503afcaa52..0539c75149ae1a6b0d70c570c771329b2c07e438 100644 (file)
--- a/level_3/return_code/c/return_code.h
+++ b/level_3/return_code/c/return_code.h
@@ -23,6 +23,7 @@
 #include <level_1/colors.h>
 #include <level_1/console.h>
 #include <level_1/errors.h>
+#include <level_1/program.h>
 #include <level_1/strings.h>
 
 // fll-2 includes
@@ -101,13 +102,6 @@ extern "C" {
     }
 #endif // _di_return_code_data_
 
-#ifndef _di_return_code_print_version_
-  /**
-   * Print version.
-   */
-  extern f_return_status return_code_print_version(const return_code_data data);
-#endif // _di_return_code_print_version_
-
 #ifndef _di_return_code_print_help_
   /**
    * Print help.

diff --git a/level_3/return_code/data/build/dependencies b/level_3/return_code/data/build/dependencies
index 716419203e43d944bb04399296a2a3c301e9b61e..e50a1edb706e42f701bd2f7bca972e0785216d7b 100644 (file)
--- a/level_3/return_code/data/build/dependencies
+++ b/level_3/return_code/data/build/dependencies
@@ -1,11 +1,12 @@
-f_types
+f_console
 f_errors
-f_strings
 f_pipe
 f_print
-f_console
+f_strings
+f_types
+fl_colors
 fl_console
 fl_file
+fl_program
 fl_strings
-fl_colors
 fll_colors

diff --git a/level_3/return_code/data/build/settings b/level_3/return_code/data/build/settings
index 4c4e3c925f655a01b651f091b314733f8e3f024c..1da13610f7317c4fdb9de844b016d3fc1bef7638 100644 (file)
--- a/level_3/return_code/data/build/settings
+++ b/level_3/return_code/data/build/settings
@@ -9,7 +9,7 @@ version_micro 2
 
 build_compiler gcc
 build_linker ar
-build_libraries -lfll_colors -lfl_errors -lfl_colors -lfl_console -lf_print -lf_pipe -lf_conversion -lf_console -lf_memory -lc
+build_libraries -lfll_colors -lfl_errors -lfl_colors -lfl_console -lfl_program -lf_print -lf_pipe -lf_conversion -lf_console -lf_memory -lc
 build_sources_library return_code.c
 build_sources_program main.c
 build_sources_headers return_code.h