From 308ad98a65b27bf03745fa91b2002ccdc9297618 Mon Sep 17 00:00:00 2001 From: Kevin Day Date: Thu, 8 May 2025 21:30:34 -0500 Subject: [PATCH] Bugfix: Use fl_directory_create() instead of f_directory_create(). The `fl_directory_create()` instead of `f_directory_create()` should be used to create the directory tree. --- level_3/fake/c/main/build/library.c | 9 ++------- level_3/fake/c/main/build/library.h | 2 ++ level_3/fake/c/main/build/object.c | 9 ++------- level_3/fake/c/main/build/object.h | 2 ++ level_3/fake/c/main/build/print/error.c | 12 ------------ level_3/fake/c/main/build/print/error.h | 24 ------------------------ 6 files changed, 8 insertions(+), 50 deletions(-) diff --git a/level_3/fake/c/main/build/library.c b/level_3/fake/c/main/build/library.c index c9ce735..eb0d2ef 100644 --- a/level_3/fake/c/main/build/library.c +++ b/level_3/fake/c/main/build/library.c @@ -728,15 +728,10 @@ extern "C" { } if (main->setting.state.status == F_file_found_not) { - main->setting.state.status = f_directory_create(main->cache_argument, mode.directory); + main->setting.state.status = fl_directory_create(main->cache_argument, mode.directory); if (F_status_is_error(main->setting.state.status)) { - if (F_status_set_fine(main->setting.state.status) == F_file_found_not) { - fake_build_print_error_cannot_create_due_to_parent(&main->program.message, main->cache_argument); - } - else { - fake_print_error_file(&main->program.error, macro_fake_f(f_directory_create), main->cache_argument, f_file_operation_create_s, fll_error_file_type_directory_e); - } + fake_print_error_file(&main->program.error, macro_fake_f(fl_directory_create), main->cache_argument, f_file_operation_create_s, fll_error_file_type_directory_e); return 0; } diff --git a/level_3/fake/c/main/build/library.h b/level_3/fake/c/main/build/library.h index 647f908..f42f967 100644 --- a/level_3/fake/c/main/build/library.h +++ b/level_3/fake/c/main/build/library.h @@ -172,6 +172,7 @@ extern "C" { * Errors (with error bit) from: f_file_name_directory() * Errors (with error bit) from: f_string_dynamic_append_assure() * Errors (with error bit) from: f_string_dynamic_prepend() + * Errors (with error bit) from: fl_directory_create() * Errors (with error bit) from: fll_execute_arguments_add() * * Errors (with error bit) from: fake_build_get_file_name_without_extension() @@ -194,6 +195,7 @@ extern "C" { * @see f_file_name_directory() * @see f_string_dynamic_append_assure() * @see f_string_dynamic_prepend() + * @see fl_directory_create() * @see fll_execute_arguments_add() * * @see fake_build_get_file_name_without_extension() diff --git a/level_3/fake/c/main/build/object.c b/level_3/fake/c/main/build/object.c index ae57d9d..13f7480 100644 --- a/level_3/fake/c/main/build/object.c +++ b/level_3/fake/c/main/build/object.c @@ -140,15 +140,10 @@ extern "C" { } if (main->setting.state.status == F_file_found_not) { - main->setting.state.status = f_directory_create(main->cache_argument, mode.directory); + main->setting.state.status = fl_directory_create(main->cache_argument, mode.directory); if (F_status_is_error(main->setting.state.status)) { - if (F_status_set_fine(main->setting.state.status) == F_file_found_not) { - fake_build_print_error_cannot_create_due_to_parent(&main->program.message, main->cache_argument); - } - else { - fake_print_error_file(&main->program.error, macro_fake_f(f_directory_create), main->cache_argument, f_file_operation_create_s, fll_error_file_type_directory_e); - } + fake_print_error_file(&main->program.error, macro_fake_f(fl_directory_create), main->cache_argument, f_file_operation_create_s, fll_error_file_type_directory_e); return 0; } diff --git a/level_3/fake/c/main/build/object.h b/level_3/fake/c/main/build/object.h index 7d02118..8062ca7 100644 --- a/level_3/fake/c/main/build/object.h +++ b/level_3/fake/c/main/build/object.h @@ -63,6 +63,7 @@ extern "C" { * This alters data.main->setting.state.status: * F_okay on success. * + * Errors (with error bit) from: fl_directory_create(). * Errors (with error bit) from: fll_execute_arguments_add(). * * Errors (with error bit) from: fake_build_arguments_standard_add(). @@ -82,6 +83,7 @@ extern "C" { * The return code of the execution process. * This generally is only needed when F_child is returned, where this holds the return status of the child process. * + * @see fl_directory_create() * @see fll_execute_arguments_add() * * @see fake_build_arguments_standard_add() diff --git a/level_3/fake/c/main/build/print/error.c b/level_3/fake/c/main/build/print/error.c index 7002408..19d31fa 100644 --- a/level_3/fake/c/main/build/print/error.c +++ b/level_3/fake/c/main/build/print/error.c @@ -4,18 +4,6 @@ extern "C" { #endif -#ifndef _di_fake_build_print_error_cannot_create_due_to_parent_ - f_status_t fake_build_print_error_cannot_create_due_to_parent(fl_print_t * const print, const f_string_static_t path) { - - if (!print) return F_status_set_error(F_output_not); - if (print->verbosity < f_console_verbosity_error_e) return F_output_not; - - fake_print_context_wrapped_variable(print, "The path ", path, " could not be created, a parent directory is invalid or does not exist"); - - return F_okay; - } -#endif // _di_fake_build_print_error_cannot_create_due_to_parent_ - #ifndef _di_fake_build_print_error_exist_not_directory_ f_status_t fake_build_print_error_exist_not_directory(fl_print_t * const print, const f_string_static_t path) { diff --git a/level_3/fake/c/main/build/print/error.h b/level_3/fake/c/main/build/print/error.h index 1cb6dc9..82e97f6 100644 --- a/level_3/fake/c/main/build/print/error.h +++ b/level_3/fake/c/main/build/print/error.h @@ -36,30 +36,6 @@ extern "C" { * * @see fake_print_context_wrapped_variable() */ -#ifndef _di_fake_build_print_error_cannot_create_due_to_parent_ - extern f_status_t fake_build_print_error_cannot_create_due_to_parent(fl_print_t * const print, const f_string_static_t path); -#endif // _di_fake_build_print_error_cannot_create_due_to_parent_ - -/** - * Print error message about not creating path due to a parent directory not existing or is otherwise invalid. - * - * @param print - * The output structure to print to. - * - * This requires print.custom to be fake_main_t. - * - * This does not alter print.custom.setting.state.status. - * @param path - * The path that cannot be created. - * - * @return - * F_okay on success. - * F_output_not on success, but no printing is performed. - * - * F_output_not (with error bit) if setting is NULL. - * - * @see fake_print_context_wrapped_variable() - */ #ifndef _di_fake_build_print_error_exist_not_directory_ extern f_status_t fake_build_print_error_exist_not_directory(fl_print_t * const print, const f_string_static_t path); #endif // _di_fake_build_print_error_exist_not_directory_ -- 1.8.3.1