From b3d664d183da9b5ac7336ce6c2eeb29e8f2b49bc Mon Sep 17 00:00:00 2001 From: Kevin Day Date: Mon, 23 Jan 2023 23:32:01 -0600 Subject: [PATCH] Bugfix: Fakefile processing with color context is producing extra spaces when unquoted. Do not generate a new argument when calling fake_make_operate_expand_context(). The color context should combine with existing arguments. This does not handle the last context argument and more work is likely needed to handle that one. Remove the not quoted check that always generates a new argument. --- level_3/fake/c/main/private-make-operate.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/level_3/fake/c/main/private-make-operate.c b/level_3/fake/c/main/private-make-operate.c index 363cc21..cb74472 100644 --- a/level_3/fake/c/main/private-make-operate.c +++ b/level_3/fake/c/main/private-make-operate.c @@ -616,7 +616,6 @@ extern "C" { break; } - } *status = f_string_dynamic_append_nulless(reserved_value[k]->array[l], &data_make->cache_arguments.array[data_make->cache_arguments.used]); @@ -781,7 +780,7 @@ extern "C" { } } - if (!(content.array[i].start == iki_data->variable.array[0].start && content.array[i].stop == iki_data->variable.array[0].stop && !quotes.array[i]) || !quotes.array[i] || i + 1 == content.used) { + if (!(content.array[i].start == iki_data->variable.array[0].start && content.array[i].stop == iki_data->variable.array[0].stop && !quotes.array[i]) || i + 1 == content.used) { ++data_make->cache_arguments.used; *status = f_string_dynamics_increase(fake_default_allocation_small_d, &data_make->cache_arguments); @@ -1169,10 +1168,6 @@ extern "C" { if (F_status_is_error_not(status)) { status = f_string_dynamic_append_nulless(*context, &data_make->cache_arguments.array[data_make->cache_arguments.used]); - - if (F_status_is_error_not(status)) { - ++data_make->cache_arguments.used; - } } } -- 1.8.3.1