From: Kevin Day Date: Fri, 24 Jul 2020 02:26:42 +0000 (-0500) Subject: Update: print the canonical path, if available, but fallback to the provided path... X-Git-Tag: 0.5.0~53 X-Git-Url: https://git.kevux.org/?a=commitdiff_plain;h=cb658e9f6c56a8460aae0eca2e92cfdd4d6414ed;p=fll Update: print the canonical path, if available, but fallback to the provided path if not. The line number is printed on error, so a person can always look at the source settings to determine what the provided path is. Providing the generated canonical path makes it clear what the generated path is. --- diff --git a/level_3/fake/c/private-make.c b/level_3/fake/c/private-make.c index f27e196..50c65ad 100644 --- a/level_3/fake/c/private-make.c +++ b/level_3/fake/c/private-make.c @@ -1443,7 +1443,7 @@ extern "C" { if (operation == fake_make_operation_type_to) { *status = fake_make_assure_inside_project(data, arguments.array[0], data_make); if (F_status_is_error(*status)) { - fake_print_error_fakefile_section_operation_path_outside(data, F_status_set_fine(*status), "fake_make_assure_inside_project", arguments.array[0].string); + fake_print_error_fakefile_section_operation_path_outside(data, F_status_set_fine(*status), "fake_make_assure_inside_project", data_make->path_cache.used ? data_make->path_cache.string : arguments.array[0].string); if (F_status_set_fine(*status) == F_false) { *status = F_status_set_error(F_failure); @@ -2096,7 +2096,7 @@ extern "C" { *status = fake_make_assure_inside_project(data, arguments.array[1], data_make); if (F_status_is_error(*status)) { - fake_print_error_fakefile_section_operation_path_outside(data, F_status_set_fine(*status), "fake_make_assure_inside_project", arguments.array[1].string); + fake_print_error_fakefile_section_operation_path_outside(data, F_status_set_fine(*status), "fake_make_assure_inside_project", data_make->path_cache.used ? data_make->path_cache.string : arguments.array[1].string); if (F_status_set_fine(*status) == F_false) { *status = F_status_set_error(F_failure);