Bugfix: Environment should only be reset when specified, even if empty.

The environment is accidentally always being reset.
This results in no environment in cases where this is unexpected.
This happens in simple things such as maintenance mode boot to bash, cannot find bash because there is no PATH environment variable.

Add example environment entry and rules for testing this.

diff --git a/level_3/controller/c/private-common.h b/level_3/controller/c/private-common.h
index 662fc73938c3f243655b1a9749ddecf7756c1fa2..c5ded775a2aeb593b82c748a32e3ee79859f3a7d 100644 (file)
--- a/level_3/controller/c/private-common.h
+++ b/level_3/controller/c/private-common.h
@@ -782,10 +782,11 @@ extern "C" {
 
   // bitwise codes representing properties on controller_rule_t that have been found in the rule file.
   #define controller_rule_has_control_group 0x1
-  #define controller_rule_has_group         0x2
-  #define controller_rule_has_nice          0x4
-  #define controller_rule_has_scheduler     0x8
-  #define controller_rule_has_user          0x10
+  #define controller_rule_has_environment   0x2
+  #define controller_rule_has_group         0x4
+  #define controller_rule_has_nice          0x8
+  #define controller_rule_has_scheduler     0x10
+  #define controller_rule_has_user          0x20
 
   typedef struct {
     f_status_t status[controller_rule_action_type__enum_size];

diff --git a/level_3/controller/c/private-rule.c b/level_3/controller/c/private-rule.c
index 8a90e0bbdeb1449feb32e80b5089ca34a5f068db..69b373b44e01981eb443cbe520d50cd17370f967 100644 (file)
--- a/level_3/controller/c/private-rule.c
+++ b/level_3/controller/c/private-rule.c
@@ -836,7 +836,7 @@ extern "C" {
 
     const f_string_dynamics_t arguments_none = f_string_dynamics_t_initialize;
 
-    controller_execute_set_t execute_set = macro_controller_execute_set_t_initialize(0, 0, &environment, &signals, 0, fl_execute_as_t_initialize);
+    controller_execute_set_t execute_set = macro_controller_execute_set_t_initialize(0, 0, process->rule.has & controller_rule_has_environment ? &environment : 0, &signals, 0, fl_execute_as_t_initialize);
 
     if (process->rule.affinity.used) {
       execute_set.as.affinity = &process->rule.affinity;
@@ -1168,7 +1168,7 @@ extern "C" {
 
       const f_string_static_t simulated_program = macro_f_string_static_t_initialize(f_string_empty_s, 0);
       const f_string_statics_t simulated_arguments = f_string_statics_t_initialize;
-      fl_execute_parameter_t simulated_parameter = macro_fl_execute_parameter_t_initialize(execute_set->parameter.option, execute_set->parameter.wait, execute_set->parameter.environment, execute_set->parameter.signals, &simulated_program);
+      fl_execute_parameter_t simulated_parameter = macro_fl_execute_parameter_t_initialize(execute_set->parameter.option, execute_set->parameter.wait, process->rule.has & controller_rule_has_environment ? execute_set->parameter.environment : 0, execute_set->parameter.signals, &simulated_program);
 
       status = fll_execute_program(controller_default_program_script, simulated_arguments, &simulated_parameter, &execute_set->as, simulated_parameter.option & fl_execute_parameter_option_return ? (void *) &id_child : (void *) &result);
     }
@@ -1421,7 +1421,7 @@ extern "C" {
 
       const f_string_static_t simulated_program = macro_f_string_static_t_initialize(f_string_empty_s, 0);
       const f_string_statics_t simulated_arguments = f_string_statics_t_initialize;
-      fl_execute_parameter_t simulated_parameter = macro_fl_execute_parameter_t_initialize(execute_set->parameter.option, execute_set->parameter.wait, execute_set->parameter.environment, execute_set->parameter.signals, &simulated_program);
+      fl_execute_parameter_t simulated_parameter = macro_fl_execute_parameter_t_initialize(execute_set->parameter.option, execute_set->parameter.wait, process->rule.has & controller_rule_has_environment ? execute_set->parameter.environment : 0, execute_set->parameter.signals, &simulated_program);
 
       status = fll_execute_program(controller_default_program_script, simulated_arguments, &simulated_parameter, &execute_set->as, simulated_parameter.option & fl_execute_parameter_option_return ? (void *) &id_child : (void *) &result);
     }
@@ -3302,6 +3302,7 @@ extern "C" {
     f_array_length_t j = 0;
     uint8_t type = 0;
     uint8_t action = 0;
+    bool empty_disallow = F_true;
 
     // save the current name item and line number to restore on return.
     const f_array_length_t line_item = cache->action.line_item;
@@ -3354,6 +3355,8 @@ extern "C" {
         continue;
       }
 
+      empty_disallow = F_true;
+
       if (fl_string_dynamic_compare_string(controller_string_affinity_s, cache->action.name_item, controller_string_affinity_length) == F_equal_to) {
         type = controller_rule_setting_type_affinity;
       }
@@ -3368,6 +3371,7 @@ extern "C" {
       }
       else if (fl_string_dynamic_compare_string(controller_string_environment_s, cache->action.name_item, controller_string_environment_length) == F_equal_to) {
         type = controller_rule_setting_type_environment;
+        empty_disallow = F_false;
       }
       else if (fl_string_dynamic_compare_string(controller_string_group_s, cache->action.name_item, controller_string_group_length) == F_equal_to) {
         type = controller_rule_setting_type_group;
@@ -3422,8 +3426,24 @@ extern "C" {
         continue;
       }
 
-      if (!cache->content_actions.array[i].used) {
-        if (global.main->warning.verbosity == f_console_verbosity_debug) {
+      if (cache->content_actions.array[i].used) {
+        range2.start = cache->content_actions.array[i].array[0].start;
+        range2.stop = cache->content_actions.array[i].array[cache->content_actions.array[i].used - 1].stop;
+
+        status = f_string_dynamic_partial_append_nulless(cache->buffer_item, range2, &cache->action.name_action);
+
+        if (F_status_is_error(status)) {
+          controller_rule_error_print(global.main->error, cache->action, F_status_set_fine(status), "f_string_dynamic_partial_append_nulless", F_true, F_false, global.thread);
+        }
+        else {
+          status = f_string_dynamic_terminate_after(&cache->action.name_action);
+
+          if (F_status_is_error(status)) {
+            controller_rule_error_print(global.main->error, cache->action, F_status_set_fine(status), "f_string_dynamic_terminate_after", F_true, F_false, global.thread);
+          }
+        }
+
+        if (F_status_is_error(status)) {
 
           // get the current line number within the settings item.
           cache->action.line_item = line_item;
@@ -3431,54 +3451,41 @@ extern "C" {
 
           cache->action.line_action = ++cache->action.line_item;
 
-          controller_print_lock(global.main->warning.to, global.thread);
+          controller_rule_item_error_print(global.main->error, cache->action, F_false, F_status_set_fine(status), global.thread);
 
-          fl_print_format("%c%[%SEmpty rule setting.%]%c", global.main->warning.to.stream, f_string_eol_s[0], global.main->warning.context, global.main->warning.prefix, global.main->warning.context, f_string_eol_s[0]);
+          if (F_status_set_fine(status) == F_memory_not) {
+            status_return = status;
+            break;
+          }
 
-          controller_rule_error_print_cache(global.main->warning, cache->action, F_false);
+          if (F_status_is_error_not(status_return)) {
+            status_return = status;
+          }
 
-          controller_print_unlock_flush(global.main->warning.to, global.thread);
+          continue;
         }
-
-        continue;
-      }
-
-      range2.start = cache->content_actions.array[i].array[0].start;
-      range2.stop = cache->content_actions.array[i].array[cache->content_actions.array[i].used - 1].stop;
-
-      status = f_string_dynamic_partial_append_nulless(cache->buffer_item, range2, &cache->action.name_action);
-
-      if (F_status_is_error(status)) {
-        controller_rule_error_print(global.main->error, cache->action, F_status_set_fine(status), "f_string_dynamic_partial_append_nulless", F_true, F_false, global.thread);
       }
       else {
-        status = f_string_dynamic_terminate_after(&cache->action.name_action);
+        if (empty_disallow) {
+          if (global.main->warning.verbosity == f_console_verbosity_debug) {
 
-        if (F_status_is_error(status)) {
-          controller_rule_error_print(global.main->error, cache->action, F_status_set_fine(status), "f_string_dynamic_terminate_after", F_true, F_false, global.thread);
-        }
-      }
+            // get the current line number within the settings item.
+            cache->action.line_item = line_item;
+            f_fss_count_lines(cache->buffer_item, cache->object_actions.array[i].start, &cache->action.line_item);
 
-      if (F_status_is_error(status)) {
+            cache->action.line_action = ++cache->action.line_item;
 
-        // get the current line number within the settings item.
-        cache->action.line_item = line_item;
-        f_fss_count_lines(cache->buffer_item, cache->object_actions.array[i].start, &cache->action.line_item);
+            controller_print_lock(global.main->warning.to, global.thread);
 
-        cache->action.line_action = ++cache->action.line_item;
+            fl_print_format("%c%[%SEmpty rule setting.%]%c", global.main->warning.to.stream, f_string_eol_s[0], global.main->warning.context, global.main->warning.prefix, global.main->warning.context, f_string_eol_s[0]);
 
-        controller_rule_item_error_print(global.main->error, cache->action, F_false, F_status_set_fine(status), global.thread);
+            controller_rule_error_print_cache(global.main->warning, cache->action, F_false);
 
-        if (F_status_set_fine(status) == F_memory_not) {
-          status_return = status;
-          break;
-        }
+            controller_print_unlock_flush(global.main->warning.to, global.thread);
+          }
 
-        if (F_status_is_error_not(status_return)) {
-          status_return = status;
+          continue;
         }
-
-        continue;
       }
 
       if (type == controller_rule_setting_type_affinity) {
@@ -4856,6 +4863,8 @@ extern "C" {
           ++setting_values->used;
         } // for
 
+        rule->has |= controller_rule_has_environment;
+
         continue;
       }
 

diff --git a/level_3/controller/data/settings/example/entries/environment.entry b/level_3/controller/data/settings/example/entries/environment.entry
new file mode 100644 (file)
index 0000000..f09fea4
--- /dev/null
+++ b/level_3/controller/data/settings/example/entries/environment.entry
@@ -0,0 +1,6 @@
+# fss-0005
+
+main:
+  start environment default
+  start environment exported
+  start environment empty

diff --git a/level_3/controller/data/settings/example/rules/environment/default.rule b/level_3/controller/data/settings/example/rules/environment/default.rule
new file mode 100644 (file)
index 0000000..642e3e7
--- /dev/null
+++ b/level_3/controller/data/settings/example/rules/environment/default.rule
@@ -0,0 +1,15 @@
+# fss-000d
+
+setting:
+  name "Environment default"
+  script bash
+
+script:
+  start {
+    echo
+    echo "==================================="
+    echo "Environment using default settings."
+    echo "==================================="
+
+    env
+  }

diff --git a/level_3/controller/data/settings/example/rules/environment/empty.rule b/level_3/controller/data/settings/example/rules/environment/empty.rule
new file mode 100644 (file)
index 0000000..c1dba2e
--- /dev/null
+++ b/level_3/controller/data/settings/example/rules/environment/empty.rule
@@ -0,0 +1,16 @@
+# fss-000d
+
+setting:
+  name "Environment set to nothing"
+  environment
+  script bash
+
+script:
+  start {
+    echo
+    echo "============================="
+    echo "Environment allowing nothing."
+    echo "============================="
+
+    env
+  }

diff --git a/level_3/controller/data/settings/example/rules/environment/exported.rule b/level_3/controller/data/settings/example/rules/environment/exported.rule
new file mode 100644 (file)
index 0000000..ede7d2d
--- /dev/null
+++ b/level_3/controller/data/settings/example/rules/environment/exported.rule
@@ -0,0 +1,16 @@
+# fss-000d
+
+setting:
+  name "Environment with PATH"
+  environment PATH
+  script bash
+
+script:
+  start {
+    echo
+    echo "=========================="
+    echo "Environment allowing PATH."
+    echo "=========================="
+
+    env
+  }