Update: With latest FLL changes to fll_program.

diff --git a/data/build/stand_alone/config.h b/data/build/stand_alone/config.h
index c0eb1433b1754fd234d117bf839beaca779a0330..64ca67fb42fbfa68b63f3494b339e07238e7e899 100644 (file)
--- a/data/build/stand_alone/config.h
+++ b/data/build/stand_alone/config.h
@@ -339,6 +339,13 @@
 #define _di_f_directory_recurse_doss_t_
 #define _di_f_directory_remove_
 #define _di_f_directory_remove_custom_
+#define _di_f_directory_stream_close_
+#define _di_f_directory_stream_open_
+#define _di_f_directory_stream_open_id_
+#define _di_f_directory_stream_read_
+#define _di_f_directory_stream_rewind_
+#define _di_f_directory_stream_seek_
+#define _di_f_directory_stream_tell_
 //#define _di_f_directory_s_
 #define _di_f_directory_status_delete_
 #define _di_f_directory_status_destroy_

diff --git a/sources/c/program/controller/main/common.c b/sources/c/program/controller/main/common.c
index 02c3c33255ed57baca6fb43f89c11269c8052810..ee3ccefc3d4d92bf08edcdc9840e632bf5fc7665 100644 (file)
--- a/sources/c/program/controller/main/common.c
+++ b/sources/c/program/controller/main/common.c
@@ -104,19 +104,19 @@ extern "C" {
       return;
     }
 
-    if (main->program.parameters.array[f_console_standard_parameter_help_e].result & f_console_result_found_e) {
+    if (main->program.parameters.array[f_console_standard_parameter_help_e].result & f_console_result_found_d) {
       main->setting.flag |= controller_main_flag_help_d;
 
       return;
     }
 
-    if (main->program.parameters.array[f_console_standard_parameter_version_e].result & f_console_result_found_e) {
+    if (main->program.parameters.array[f_console_standard_parameter_version_e].result & f_console_result_found_d) {
       main->setting.flag |= controller_main_flag_version_d;
 
       return;
     }
 
-    if (main->program.parameters.array[f_console_standard_parameter_copyright_e].result & f_console_result_found_e) {
+    if (main->program.parameters.array[f_console_standard_parameter_copyright_e].result & f_console_result_found_d) {
       main->setting.flag |= controller_main_flag_copyright_d;
 
       return;
@@ -164,7 +164,7 @@ extern "C" {
 
       for (index = 0; index < 4; ++index) {
 
-        if (main->program.parameters.array[codes[index]].result & f_console_result_found_e) {
+        if (main->program.parameters.array[codes[index]].result & f_console_result_found_d) {
           if (main->program.parameters.array[codes[index]].locations.used != main->program.parameters.array[codes[index]].values.used) {
             main->setting.state.status = F_status_set_error(F_parameter);
 
@@ -173,7 +173,7 @@ extern "C" {
             continue;
           }
         }
-        else if (main->program.parameters.array[codes[index]].result & f_console_result_value_e) {
+        else if (main->program.parameters.array[codes[index]].result & f_console_result_value_d) {
           if (flags[index]) main->setting.flag |= flags[index];
         }
       } // for
@@ -212,7 +212,7 @@ extern "C" {
       };
 
       for (index = 0; index < 3; ++index) {
-        if (main->program.parameters.array[codes[index]].result & f_console_result_found_e) main->setting.flag |= flags[index];
+        if (main->program.parameters.array[codes[index]].result & f_console_result_found_d) main->setting.flag |= flags[index];
       } // for
     }
 
@@ -311,8 +311,8 @@ extern "C" {
       }
     }
 
-    if (main->program.parameters.array[controller_parameter_interruptible_e].result & f_console_result_found_e) {
-      if (main->program.parameters.array[controller_parameter_uninterruptible_e].result & f_console_result_found_e) {
+    if (main->program.parameters.array[controller_parameter_interruptible_e].result & f_console_result_found_d) {
+      if (main->program.parameters.array[controller_parameter_uninterruptible_e].result & f_console_result_found_d) {
         if (main->program.parameters.array[controller_parameter_interruptible_e].location < main->program.parameters.array[controller_parameter_uninterruptible_e].location) {
           main->setting.flag &= ~controller_main_flag_interruptible_d;
         }
@@ -324,7 +324,7 @@ extern "C" {
         main->setting.flag |= controller_main_flag_interruptible_d;
       }
     }
-    else if (main->program.parameters.array[controller_parameter_uninterruptible_e].result & f_console_result_found_e) {
+    else if (main->program.parameters.array[controller_parameter_uninterruptible_e].result & f_console_result_found_d) {
       main->setting.flag &= ~controller_main_flag_interruptible_d;
     }
   }

diff --git a/sources/c/program/controller/main/common/enumeration.h b/sources/c/program/controller/main/common/enumeration.h
index 929164fa3d54dfbb4669131d6689f3792b729129..babc01a91f1d24c1194434726a082346c3672739 100644 (file)
--- a/sources/c/program/controller/main/common/enumeration.h
+++ b/sources/c/program/controller/main/common/enumeration.h
@@ -36,15 +36,15 @@ extern "C" {
     { \
       macro_fll_program_console_parameter_standard_initialize, \
       \
-      macro_f_console_parameter_t_initialize_3(controller_short_cgroup_s,          controller_long_cgroup_s,          1, f_console_flag_normal_e), \
-      macro_f_console_parameter_t_initialize_3(controller_short_daemon_s,          controller_long_daemon_s,          0, f_console_flag_normal_e), \
-      macro_f_console_parameter_t_initialize_3(controller_short_interruptible_s,   controller_long_interruptible_s,   0, f_console_flag_normal_e), \
-      macro_f_console_parameter_t_initialize_3(controller_short_pid_s,             controller_long_pid_s,             1, f_console_flag_normal_e), \
-      macro_f_console_parameter_t_initialize_3(controller_short_settings_s,        controller_long_settings_s,        1, f_console_flag_normal_e), \
-      macro_f_console_parameter_t_initialize_3(controller_short_simulate_s,        controller_long_simulate_s,        0, f_console_flag_normal_e), \
-      macro_f_console_parameter_t_initialize_3(controller_short_socket_s,          controller_long_socket_s,          1, f_console_flag_normal_e), \
-      macro_f_console_parameter_t_initialize_3(controller_short_uninterruptible_s, controller_long_uninterruptible_s, 0, f_console_flag_normal_e), \
-      macro_f_console_parameter_t_initialize_3(controller_short_validate_s,        controller_long_validate_s,        0, f_console_flag_normal_e), \
+      macro_f_console_parameter_t_initialize_3(controller_short_cgroup_s,          controller_long_cgroup_s,          1, f_console_flag_normal_d), \
+      macro_f_console_parameter_t_initialize_3(controller_short_daemon_s,          controller_long_daemon_s,          0, f_console_flag_normal_d), \
+      macro_f_console_parameter_t_initialize_3(controller_short_interruptible_s,   controller_long_interruptible_s,   0, f_console_flag_normal_d), \
+      macro_f_console_parameter_t_initialize_3(controller_short_pid_s,             controller_long_pid_s,             1, f_console_flag_normal_d), \
+      macro_f_console_parameter_t_initialize_3(controller_short_settings_s,        controller_long_settings_s,        1, f_console_flag_normal_d), \
+      macro_f_console_parameter_t_initialize_3(controller_short_simulate_s,        controller_long_simulate_s,        0, f_console_flag_normal_d), \
+      macro_f_console_parameter_t_initialize_3(controller_short_socket_s,          controller_long_socket_s,          1, f_console_flag_normal_d), \
+      macro_f_console_parameter_t_initialize_3(controller_short_uninterruptible_s, controller_long_uninterruptible_s, 0, f_console_flag_normal_d), \
+      macro_f_console_parameter_t_initialize_3(controller_short_validate_s,        controller_long_validate_s,        0, f_console_flag_normal_d), \
     }
 
   #define controller_parameter_total_d (f_console_parameter_state_type_total_d + 9)

diff --git a/sources/c/program/controller/main/rule/expand.c b/sources/c/program/controller/main/rule/expand.c
index bbf71895c4fff778da76ccda2bcff1c90d5fa67c..166e13019181c5f3f51742d387a9b249c231eed5 100644 (file)
--- a/sources/c/program/controller/main/rule/expand.c
+++ b/sources/c/program/controller/main/rule/expand.c
@@ -288,7 +288,7 @@ extern "C" {
 
         if (f_compare_dynamic_partial_string(options[i].string, source, options[i].used, content) == F_equal_to) {
           if (values[i]) {
-            if (parameters->array[codes[i]].result & f_console_result_value_e) {
+            if (parameters->array[codes[i]].result & f_console_result_value_d) {
               const f_number_unsigned_t index = parameters->array[codes[i]].values.array[parameters->array[codes[i]].values.used - 1];
 
               status = f_memory_array_increase_by(symbols[i].used + expands[i].used + f_string_ascii_space_s.used + argv[index].used + 1, sizeof(f_char_t), (void **) &destination->string, &destination->used, &destination->size);
@@ -313,7 +313,7 @@ extern "C" {
             }
           }
           else {
-            if (parameters->array[codes[i]].result & f_console_result_found_e) {
+            if (parameters->array[codes[i]].result & f_console_result_found_d) {
               if (F_status_is_error_not(status)) {
                 status = f_memory_array_increase_by(symbols[i].used + expands[i].used + 1, sizeof(f_char_t), (void **) &destination->string, &destination->used, &destination->size);
               }
@@ -344,7 +344,7 @@ extern "C" {
           memcpy(buffer_string + options[i].used, controller_parameter_map_option_s.string, sizeof(f_char_t) * controller_parameter_map_option_s.used);
 
           if (f_compare_dynamic_partial_string(buffer.string, source, buffer.used, content) == F_equal_to) {
-            if (values[i] && parameters->array[codes[i]].result & f_console_result_value_e || !values[i] && (parameters->array[codes[i]].result & f_console_result_found_e)) {
+            if (values[i] && parameters->array[codes[i]].result & f_console_result_value_d || !values[i] && (parameters->array[codes[i]].result & f_console_result_found_d)) {
               status = f_memory_array_increase_by(symbols[i].used + expands[i].used + 1, sizeof(f_char_t), (void **) &destination->string, &destination->used, &destination->size);
 
               if (F_status_is_error_not(status)) {
@@ -373,7 +373,7 @@ extern "C" {
           memcpy(buffer_string + options[i].used, controller_parameter_map_value_s.string, sizeof(f_char_t) * controller_parameter_map_value_s.used);
 
           if (f_compare_dynamic_partial_string(buffer.string, source, buffer.used, content) == F_equal_to) {
-            if (parameters->array[codes[i]].result & f_console_result_value_e) {
+            if (parameters->array[codes[i]].result & f_console_result_value_d) {
               const f_number_unsigned_t index = parameters->array[codes[i]].values.array[parameters->array[codes[i]].values.used - 1];
 
               status = f_string_dynamic_append(argv[index], destination);