From fb8774ab378c3d3f4a96844c7e41b1c42d1f01d8 Mon Sep 17 00:00:00 2001 From: Kevin Day Date: Thu, 4 Jul 2024 19:28:00 -0500 Subject: [PATCH] Bugfix: New line is not being printed because sequence is missing. The new line parameter is present but the replacement sequence is missing. This results in the new line not printing. Add the missing '%r' replacement sequence. Remove the new line parameter in cases where the new line should not be printed. --- level_3/controller/c/entry/private-entry.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/level_3/controller/c/entry/private-entry.c b/level_3/controller/c/entry/private-entry.c index 29a8bf9..7188b69 100644 --- a/level_3/controller/c/entry/private-entry.c +++ b/level_3/controller/c/entry/private-entry.c @@ -407,7 +407,7 @@ extern "C" { fl_print_format("%[%Q%]", global.main->error.to.stream, global.main->error.notable, action->parameters.array[1], global.main->error.notable); fl_print_format("%[' must be a base path name, such as '%]", global.main->error.to.stream, global.main->error.context, global.main->error.context); fl_print_format("%[%Q%]", global.main->error.to.stream, global.main->error.notable, cache->buffer_path, global.main->error.notable); - fl_print_format("%['.%]", global.main->error.to.stream, global.main->error.context, global.main->error.context, f_string_eol_s); + fl_print_format("%['.%]%r", global.main->error.to.stream, global.main->error.context, global.main->error.context, f_string_eol_s); funlockfile(global.main->error.to.stream); } @@ -463,7 +463,7 @@ extern "C" { fl_print_format("%[%r%]", global.main->error.to.stream, global.main->error.notable, controller_wait_s, global.main->error.notable); fl_print_format("%[' but instead has '%]", global.main->error.to.stream, global.main->error.context, global.main->error.context); fl_print_format("%[%Q%]", global.main->error.to.stream, global.main->error.notable, action->parameters.array[j], global.main->error.notable); - fl_print_format("%['.%]", global.main->error.to.stream, global.main->error.context, global.main->error.context, f_string_eol_s); + fl_print_format("%['.%]%r", global.main->error.to.stream, global.main->error.context, global.main->error.context, f_string_eol_s); funlockfile(global.main->error.to.stream); } @@ -483,7 +483,7 @@ extern "C" { fl_print_format("%r%[%QThe %r item action may not specify the reserved item '%]", global.main->error.to.stream, f_string_eol_s, global.main->error.context, global.main->error.prefix, is_entry ? controller_entry_s : controller_exit_s, global.main->error.context); fl_print_format("%[%r%]", global.main->error.to.stream, global.main->error.notable, controller_main_s, global.main->error.notable); - fl_print_format("%['.%]", global.main->error.to.stream, global.main->error.context, global.main->error.context, f_string_eol_s); + fl_print_format("%['.%]%r", global.main->error.to.stream, global.main->error.context, global.main->error.context, f_string_eol_s); funlockfile(global.main->error.to.stream); } @@ -518,7 +518,7 @@ extern "C" { fl_print_format("%[%r%]", global.main->error.to.stream, global.main->error.notable, controller_stop_s, global.main->error.notable); fl_print_format("%[' but instead has '%]", global.main->error.to.stream, global.main->error.context, global.main->error.context); fl_print_format("%[%Q%]", global.main->error.to.stream, global.main->error.notable, action->parameters.array[0], global.main->error.notable); - fl_print_format("%['.%]", global.main->error.to.stream, global.main->error.context, global.main->error.context, f_string_eol_s); + fl_print_format("%['.%]%r", global.main->error.to.stream, global.main->error.context, global.main->error.context, f_string_eol_s); funlockfile(global.main->error.to.stream); } @@ -553,7 +553,7 @@ extern "C" { fl_print_format("%r%[%QThe %r item action parameter '%]", global.main->error.to.stream, f_string_eol_s, global.main->error.context, global.main->error.prefix, is_entry ? controller_entry_s : controller_exit_s, global.main->error.context); fl_print_format("%[%Q%]", global.main->error.to.stream, global.main->error.notable, action->parameters.array[1], global.main->error.notable); - fl_print_format("%[' is not a valid supported number.%]", global.main->error.to.stream, global.main->error.context, global.main->error.context, f_string_eol_s); + fl_print_format("%[' is not a valid supported number.%]%r", global.main->error.to.stream, global.main->error.context, global.main->error.context, f_string_eol_s); funlockfile(global.main->error.to.stream); } @@ -579,7 +579,7 @@ extern "C" { fl_print_format("%[%r%]", global.main->error.to.stream, global.main->error.notable, controller_wait_s, global.main->error.notable); fl_print_format("%[' but instead has '%]", global.main->error.to.stream, global.main->error.context, global.main->error.context); fl_print_format("%[%Q%]", global.main->error.to.stream, global.main->error.notable, action->parameters.array[0], global.main->error.notable); - fl_print_format("%['.%]", global.main->error.to.stream, global.main->error.context, global.main->error.context, f_string_eol_s); + fl_print_format("%['.%]%r", global.main->error.to.stream, global.main->error.context, global.main->error.context, f_string_eol_s); funlockfile(global.main->error.to.stream); } @@ -2302,7 +2302,7 @@ extern "C" { fl_print_format("%r%[%QThe %r setting '%]", global.main->error.to.stream, f_string_eol_s, global.main->error.context, global.main->error.prefix, is_entry ? controller_entry_s : controller_exit_s, global.main->error.context); fl_print_format("%[%/Q%]", global.main->error.to.stream, global.main->error.notable, cache->buffer_file, cache->content_actions.array[i].array[1], global.main->error.notable); - fl_print_format("%[' is not a valid supported number.%]", global.main->error.to.stream, global.main->error.context, global.main->error.context, f_string_eol_s); + fl_print_format("%[' is not a valid supported number.%]%r", global.main->error.to.stream, global.main->error.context, global.main->error.context, f_string_eol_s); funlockfile(global.main->error.to.stream); } @@ -2372,7 +2372,7 @@ extern "C" { string = &f_string_empty_s; } - fl_print_format(" %[%r%]", global.main->output.to.stream, global.main->context.set.important, controller_mode_s, global.main->context.set.important, f_string_eol_s); + fl_print_format(" %[%r%]", global.main->output.to.stream, global.main->context.set.important, controller_mode_s, global.main->context.set.important); if (string->used) { fl_print_format(" %r", global.main->output.to.stream, *string); @@ -2392,7 +2392,7 @@ extern "C" { string = &f_string_empty_s; } - fl_print_format(" %[%r%]", global.main->output.to.stream, global.main->context.set.important, controller_session_s, global.main->context.set.important, f_string_eol_s); + fl_print_format(" %[%r%]", global.main->output.to.stream, global.main->context.set.important, controller_session_s, global.main->context.set.important); if (string->used) { fl_print_format(" %r", global.main->output.to.stream, *string, f_string_eol_s); @@ -2412,7 +2412,7 @@ extern "C" { string = &f_string_empty_s; } - fl_print_format(" %[%r%]", global.main->output.to.stream, global.main->context.set.important, controller_show_s, global.main->context.set.important, f_string_eol_s); + fl_print_format(" %[%r%]", global.main->output.to.stream, global.main->context.set.important, controller_show_s, global.main->context.set.important); if (string->used) { fl_print_format(" %r", global.main->output.to.stream, *string, f_string_eol_s); -- 1.8.3.1