From 45265e93ececfdea3bf85220fcbc76c3e9fec1a8 Mon Sep 17 00:00:00 2001 From: Kevin Day Date: Tue, 28 Jan 2025 22:24:47 -0600 Subject: [PATCH] Progress: Continue working on completing the remove program. Implement the prompt simulate message logic. Change the "prompt all" to "prompt each". Move link detection outside of the print function (which it probably should not have been there anyway) and perform the link detection during preprocessing. The simulate function is renamed to preprocess. Add a tree cache structure for building a distinct list of tree paths. I may very likely need to sort this somehow. The tree caching allows for dynamically building the tree list and allowing for the tree removal during a post process step. I am trying to avoid excessive pre-processing loops. I am currently thinking that the simulate can still handle the processing without a pre-process loop that organizes everything before the simulate. There will need to be some sort of logic added to detect and ignore already deleted paths in cases where the same path appears multiple times. --- data/build/stand_alone/configs/remove-config.h | 4 +- sources/c/program/kevux/tools/remove/main/common.c | 2 +- .../kevux/tools/remove/main/common/define.h | 14 ++- .../program/kevux/tools/remove/main/common/print.c | 2 + .../program/kevux/tools/remove/main/common/print.h | 2 + .../kevux/tools/remove/main/common/string.c | 2 +- .../kevux/tools/remove/main/common/string.h | 6 +- .../program/kevux/tools/remove/main/common/type.c | 2 + .../program/kevux/tools/remove/main/common/type.h | 3 + .../c/program/kevux/tools/remove/main/operate.c | 134 ++++++++++++--------- .../c/program/kevux/tools/remove/main/operate.h | 31 +++-- .../kevux/tools/remove/main/print/message.c | 2 +- .../kevux/tools/remove/main/print/simulate.c | 36 +++--- .../kevux/tools/remove/main/print/simulate.h | 40 ++++-- 14 files changed, 177 insertions(+), 103 deletions(-) diff --git a/data/build/stand_alone/configs/remove-config.h b/data/build/stand_alone/configs/remove-config.h index a29a165..5682108 100644 --- a/data/build/stand_alone/configs/remove-config.h +++ b/data/build/stand_alone/configs/remove-config.h @@ -111,7 +111,7 @@ #define _di_f_compare_dynamic_except_trim_ #define _di_f_compare_dynamic_except_trim_string_ #define _di_f_compare_dynamic_partial_ -#define _di_f_compare_dynamic_partial_dynamic_ +//#define _di_f_compare_dynamic_partial_dynamic_ #define _di_f_compare_dynamic_partial_except_ #define _di_f_compare_dynamic_partial_except_dynamic_ #define _di_f_compare_dynamic_partial_except_string_ @@ -880,7 +880,7 @@ #define _di_f_string_dynamic_mash_nulless_ #define _di_f_string_dynamic_mish_ #define _di_f_string_dynamic_mish_nulless_ -#define _di_f_string_dynamic_partial_append_ +//#define _di_f_string_dynamic_partial_append_ #define _di_f_string_dynamic_partial_append_assure_ #define _di_f_string_dynamic_partial_append_assure_nulless_ #define _di_f_string_dynamic_partial_append_nulless_ diff --git a/sources/c/program/kevux/tools/remove/main/common.c b/sources/c/program/kevux/tools/remove/main/common.c index 277115c..cd70e2f 100644 --- a/sources/c/program/kevux/tools/remove/main/common.c +++ b/sources/c/program/kevux/tools/remove/main/common.c @@ -527,7 +527,7 @@ extern "C" { main->setting.flag &= ~kt_remove_main_flag_prompt_all_d; - if (f_compare_dynamic(kt_remove_all_s, main->program.parameters.arguments.array[index]) == F_equal_to) { + if (f_compare_dynamic(kt_remove_each_s, main->program.parameters.arguments.array[index]) == F_equal_to) { main->setting.flag |= kt_remove_main_flag_prompt_each_d; } else if (f_compare_dynamic(kt_remove_follow_s, main->program.parameters.arguments.array[index]) == F_equal_to) { diff --git a/sources/c/program/kevux/tools/remove/main/common/define.h b/sources/c/program/kevux/tools/remove/main/common/define.h index 94ab57e..538b577 100644 --- a/sources/c/program/kevux/tools/remove/main/common/define.h +++ b/sources/c/program/kevux/tools/remove/main/common/define.h @@ -148,6 +148,7 @@ extern "C" { * - directory: Is a directory. * - empty: Is an empty directory. * - follow: Follow the symbolic link. + * - link: The file being operated on is a link or is a followed link. * - parent: This is a parent of a file for some other file operation process. * - recurse: Perform recursively (only on directories). * - remove: Perform remove. @@ -161,12 +162,13 @@ extern "C" { #define kt_remove_flag_file_operate_directory_d 0x2 #define kt_remove_flag_file_operate_empty_d 0x4 #define kt_remove_flag_file_operate_follow_d 0x8 - #define kt_remove_flag_file_operate_parent_d 0x10 - #define kt_remove_flag_file_operate_recurse_d 0x20 - #define kt_remove_flag_file_operate_remove_d 0x40 - #define kt_remove_flag_file_operate_remove_fail_d 0x80 - #define kt_remove_flag_file_operate_remove_not_d 0x100 - #define kt_remove_flag_file_operate_remove_not_fail_d 0x200 + #define kt_remove_flag_file_operate_link_d 0x10 + #define kt_remove_flag_file_operate_parent_d 0x20 + #define kt_remove_flag_file_operate_recurse_d 0x40 + #define kt_remove_flag_file_operate_remove_d 0x80 + #define kt_remove_flag_file_operate_remove_fail_d 0x100 + #define kt_remove_flag_file_operate_remove_not_d 0x200 + #define kt_remove_flag_file_operate_remove_not_fail_d 0x400 #endif // _di_kt_remove_flag_file_operate_d_ /** diff --git a/sources/c/program/kevux/tools/remove/main/common/print.c b/sources/c/program/kevux/tools/remove/main/common/print.c index e3de23c..4233727 100644 --- a/sources/c/program/kevux/tools/remove/main/common/print.c +++ b/sources/c/program/kevux/tools/remove/main/common/print.c @@ -11,8 +11,10 @@ extern "C" { "f_file_mode_from_string", "f_file_mode_to_mode", "f_file_remove", + "f_memory_array_increase", "f_memory_array_increase_by", "f_memory_array_resize", + "f_string_dynamic_partial_append", "f_string_dynamic_seek_to_back", "f_thread_create", "f_utf_is_digit", diff --git a/sources/c/program/kevux/tools/remove/main/common/print.h b/sources/c/program/kevux/tools/remove/main/common/print.h index de67b89..5c2c009 100644 --- a/sources/c/program/kevux/tools/remove/main/common/print.h +++ b/sources/c/program/kevux/tools/remove/main/common/print.h @@ -44,8 +44,10 @@ extern "C" { kt_remove_f_f_file_mode_from_string_e, kt_remove_f_f_file_mode_to_mode_e, kt_remove_f_f_file_remove_e, + kt_remove_f_f_memory_array_increase_e, kt_remove_f_f_memory_array_increase_by_e, kt_remove_f_f_memory_array_resize_e, + kt_remove_f_f_string_dynamic_partial_append_e, kt_remove_f_f_string_dynamic_seek_to_back_e, kt_remove_f_f_thread_create_e, kt_remove_f_f_utf_is_digit_e, diff --git a/sources/c/program/kevux/tools/remove/main/common/string.c b/sources/c/program/kevux/tools/remove/main/common/string.c index 2702cab..c369be8 100644 --- a/sources/c/program/kevux/tools/remove/main/common/string.c +++ b/sources/c/program/kevux/tools/remove/main/common/string.c @@ -13,7 +13,7 @@ extern "C" { #endif // _di_utf8_program_help_parameters_s_ #ifndef _di_kt_remove_s_ - const f_string_static_t kt_remove_all_s = macro_f_string_static_t_initialize_1(KT_REMOVE_all_s, 0, KT_REMOVE_all_s_length); + const f_string_static_t kt_remove_each_s = macro_f_string_static_t_initialize_1(KT_REMOVE_each_s, 0, KT_REMOVE_each_s_length); const f_string_static_t kt_remove_empty_s = macro_f_string_static_t_initialize_1(KT_REMOVE_empty_s, 0, KT_REMOVE_empty_s_length); const f_string_static_t kt_remove_follow_s = macro_f_string_static_t_initialize_1(KT_REMOVE_follow_s, 0, KT_REMOVE_follow_s_length); const f_string_static_t kt_remove_force_s = macro_f_string_static_t_initialize_1(KT_REMOVE_force_s, 0, KT_REMOVE_force_s_length); diff --git a/sources/c/program/kevux/tools/remove/main/common/string.h b/sources/c/program/kevux/tools/remove/main/common/string.h index dc30427..a7e068c 100644 --- a/sources/c/program/kevux/tools/remove/main/common/string.h +++ b/sources/c/program/kevux/tools/remove/main/common/string.h @@ -69,7 +69,7 @@ extern "C" { * kt_remove_*_s: Arbitrary strings. */ #ifndef _di_kt_remove_s_ - #define KT_REMOVE_all_s "all" + #define KT_REMOVE_each_s "each" #define KT_REMOVE_empty_s "empty" #define KT_REMOVE_follow_s "follow" #define KT_REMOVE_force_s "force" @@ -92,7 +92,7 @@ extern "C" { #define KT_REMOVE_yes_s "yes" #define KT_REMOVE_yesterday_s "yesterday" - #define KT_REMOVE_all_s_length 3 + #define KT_REMOVE_each_s_length 4 #define KT_REMOVE_empty_s_length 5 #define KT_REMOVE_follow_s_length 6 #define KT_REMOVE_force_s_length 5 @@ -115,7 +115,7 @@ extern "C" { #define KT_REMOVE_yes_s_length 3 #define KT_REMOVE_yesterday_s_length 9 - extern const f_string_static_t kt_remove_all_s; + extern const f_string_static_t kt_remove_each_s; extern const f_string_static_t kt_remove_empty_s; extern const f_string_static_t kt_remove_follow_s; extern const f_string_static_t kt_remove_force_s; diff --git a/sources/c/program/kevux/tools/remove/main/common/type.c b/sources/c/program/kevux/tools/remove/main/common/type.c index ec0cf6f..cea4e01 100644 --- a/sources/c/program/kevux/tools/remove/main/common/type.c +++ b/sources/c/program/kevux/tools/remove/main/common/type.c @@ -11,7 +11,9 @@ extern "C" { if (!cache) return; f_memory_array_resize(0, sizeof(f_char_t), (void **) &cache->buffer.string, &cache->buffer.used, &cache->buffer.size); + f_memory_arrays_resize(0, sizeof(f_string_dynamic_t), (void **) &cache->files.array, &cache->files.used, &cache->files.size, &f_string_dynamics_delete_callback); + f_memory_arrays_resize(0, sizeof(f_string_dynamic_t), (void **) &cache->tree.array, &cache->tree.used, &cache->tree.size, &f_string_dynamics_delete_callback); } #endif // _di_kt_remove_cache_delete_ diff --git a/sources/c/program/kevux/tools/remove/main/common/type.h b/sources/c/program/kevux/tools/remove/main/common/type.h index 6c19965..4acc34c 100644 --- a/sources/c/program/kevux/tools/remove/main/common/type.h +++ b/sources/c/program/kevux/tools/remove/main/common/type.h @@ -142,17 +142,20 @@ extern "C" { * * buffer: The generic buffer. * files: A collection of files, often used during path recursion like those associated with the tree parameter. + * tree: A collection of files to process as a result of the --tree command. */ #ifndef _di_kt_remove_cache_t_ typedef struct { f_string_dynamic_t buffer; f_string_dynamics_t files; + f_string_dynamics_t tree; } kt_remove_cache_t; #define kt_remove_cache_t_initialize \ { \ f_string_dynamic_t_initialize, \ f_string_dynamics_t_initialize, \ + f_string_dynamics_t_initialize, \ } #endif // _di_kt_remove_cache_t_ diff --git a/sources/c/program/kevux/tools/remove/main/operate.c b/sources/c/program/kevux/tools/remove/main/operate.c index 443de5c..52fa1ef 100644 --- a/sources/c/program/kevux/tools/remove/main/operate.c +++ b/sources/c/program/kevux/tools/remove/main/operate.c @@ -17,7 +17,7 @@ extern "C" { if (kt_remove_signal_check(main)) return; - const uint16_t flag_operate = kt_remove_operate_file_simulate(main, path, 0); + const uint16_t flag_operate = kt_remove_operate_file_preprocess(main, path, 0); if (F_status_is_error(main->setting.state.status)) return; if (!(main->setting.flag & kt_remove_main_flag_simulate_d)) { @@ -38,7 +38,7 @@ extern "C" { #ifndef _di_kt_remove_operate_file_directory_ void kt_remove_operate_file_directory(kt_remove_main_t * const main, const f_string_static_t path, const uint16_t flag_operate) { - if (!(flag_operate & kt_remove_flag_file_operate_remove_d) || flag_operate & kt_remove_flag_file_operate_remove_not_fail_d) { + if (!kt_remove_operate_shall_remove(flag_operate)) { main->setting.state.status = (flag_operate & kt_remove_flag_file_operate_remove_fail_d) ? F_status_set_error(F_no) : F_no; return; @@ -73,11 +73,8 @@ extern "C" { if (main) { recurse->state.status = F_status_set_error(F_parameter); - - return; } - - if (flag == f_directory_recurse_do_flag_list_e) { + else if (flag == f_directory_recurse_do_flag_list_e) { // @todo check all listing to determine if any directory is to be recursed or not. if (recurse->listing.block.used || recurse->listing.character.used || recurse->listing.directory.used || recurse->listing.regular.used || recurse->listing.link.used || recurse->listing.fifo.used || recurse->listing.socket.used || recurse->listing.unknown.used) { if (!(main->setting.recurse.state.code & kt_remove_flag_file_operate_recurse_d)) { @@ -97,31 +94,10 @@ extern "C" { recurse->state.status = F_done; } } - - return; } - - if (flag & f_directory_recurse_do_flag_after_e) { + else if (flag & f_directory_recurse_do_flag_after_e) { kt_remove_operate_file(main, name); recurse->state.status = main->setting.state.status; - - const uint16_t flag_operate = kt_remove_operate_file_simulate(main, name, 0); - if (F_status_is_error(main->setting.state.status)) return; - - if (!(main->setting.flag & kt_remove_main_flag_simulate_d)) { - // @todo needs empty check to see if directory contents are fully removed (because of removal conditions). - - if (flag_operate & kt_remove_flag_file_operate_directory_d) { - kt_remove_operate_file_directory(main, name, flag_operate); - } - else { - kt_remove_operate_file_normal(main, name, flag_operate); - } - - if (F_status_is_error(main->setting.state.status)) return; - } - - return; } } #endif // _di_kt_remove_operate_file_directory_recurse_action_ @@ -186,7 +162,7 @@ extern "C" { #ifndef _di_kt_remove_operate_file_normal_ void kt_remove_operate_file_normal(kt_remove_main_t * const main, const f_string_static_t path, const uint16_t flag_operate) { - if (!(flag_operate & kt_remove_flag_file_operate_remove_d) || flag_operate & kt_remove_flag_file_operate_remove_not_fail_d) { + if (!kt_remove_operate_shall_remove(flag_operate)) { main->setting.state.status = (flag_operate & kt_remove_flag_file_operate_remove_fail_d) ? F_status_set_error(F_no) : F_no; return; @@ -226,8 +202,8 @@ extern "C" { } #endif // _di_kt_remove_operate_file_normal_ -#ifndef _di_kt_remove_operate_file_simulate_ - uint16_t kt_remove_operate_file_simulate(kt_remove_main_t * const main, const f_string_static_t path, const uint16_t flag_operate) { +#ifndef _di_kt_remove_operate_file_preprocess_ + uint16_t kt_remove_operate_file_preprocess(kt_remove_main_t * const main, const f_string_static_t path, const uint16_t flag_operate) { if (!main) return 0; @@ -243,7 +219,27 @@ extern "C" { main->setting.state.status = f_file_exists(path, main->setting.flag & kt_remove_main_flag_follow_d); - kt_remove_print_simulate_operate_file_exists(&main->program.output, path); + uint16_t flag_out = (main->setting.flag & kt_remove_main_flag_option_used_d) ? 0 : kt_remove_flag_file_operate_remove_d; + + if (main->setting.state.status == F_true) { + const f_status_t status = f_file_is(path, F_file_type_link_d, F_false); + + if (F_status_is_error(status)) { + main->setting.state.status = status; + + if (!(main->setting.flag & kt_remove_main_flag_simulate_d)) { + remove_print_warning_file_reason(&main->program.warning, path, kt_remove_print_reason_stat_fail_s); + } + + return 0; + } + + if (status == F_true) { + flag_out |= kt_remove_flag_file_operate_link_d; + } + } + + kt_remove_print_simulate_operate_file_exists(&main->program.output, path, flag_out); if (main->setting.state.status == F_false) { if (!(main->setting.flag & kt_remove_main_flag_simulate_d)) { @@ -270,7 +266,6 @@ extern "C" { if (kt_remove_signal_check(main)) return 0; f_number_unsigned_t i = 0; - uint16_t flag_out = (main->setting.flag & kt_remove_main_flag_option_used_d) ? 0 : kt_remove_flag_file_operate_remove_d; if (main->setting.flag & kt_remove_main_flag_follow_d) { flag_out |= kt_remove_flag_file_operate_follow_d; @@ -443,15 +438,19 @@ extern "C" { kt_remove_print_simulate_operate_boolean(&main->program.output, kt_remove_recurse_s, (main->setting.flag & kt_remove_main_flag_recurse_d) && !(flag_operate & kt_remove_flag_file_operate_parent_d)); } - // @todo not boolean, set prompt of yes/no based on conditions, however, if kt_remove_main_flag_prompt_each_d is set, then its always prompt. - if (main->setting.flag & kt_remove_main_flag_prompt_each_d) { - //kt_remove_print_simulate_operate_boolean(&main->program.output, kt_remove_prompt_s, main->setting.flag & kt_remove_main_flag_prompt_each_d); + if (main->setting.flag & kt_remove_main_flag_prompt_all_d) { + if (main->setting.flag & (kt_remove_main_flag_prompt_each_d | kt_remove_main_flag_prompt_never_d)) { + kt_remove_print_simulate_operate_boolean(&main->program.output, kt_remove_prompt_s, main->setting.flag & kt_remove_main_flag_prompt_each_d); + } + else if (main->setting.flag & kt_remove_main_flag_prompt_follow_d) { + kt_remove_print_simulate_operate_boolean(&main->program.output, kt_remove_prompt_s, (main->setting.flag & kt_remove_main_flag_follow_d) && (flag_out & kt_remove_flag_file_operate_link_d)); + } + else { + kt_remove_print_simulate_operate_prompt_once(&main->program.output, main->setting.files.used > 2 || main->setting.flag & kt_remove_main_flag_recurse_d); + } } - // @todo determine if this path is part of a delete tree path. - //kt_remove_print_simulate_operate_boolean(&main->program.output, kt_remove_tree_s, main->setting.flag & kt_remove_main_flag_tree_d); - - kt_remove_print_simulate_operate_boolean(&main->program.output, kt_remove_remove_s, (flag_out & kt_remove_flag_file_operate_remove_d) && !(flag_out & kt_remove_flag_file_operate_remove_not_fail_d)); + kt_remove_print_simulate_operate_boolean(&main->program.output, kt_remove_remove_s, kt_remove_operate_shall_remove(flag_out)); if (main->setting.process_operate_file_simulate) { main->setting.state.status = F_okay; @@ -466,10 +465,10 @@ extern "C" { } } + // At this point, the remove situation should be known so recurse into parent or child paths as appropriate before returning. if (flag_out & kt_remove_flag_file_operate_directory_d) { main->setting.state.status = F_okay; - // @todo The parent paths (really all paths) need to be added to a set of known paths to help ensure directories duplicate paths in the removal are handled properly. if (main->setting.flag & kt_remove_main_flag_tree_d) { f_range_t range = macro_f_range_t_initialize_2(path.used); @@ -477,25 +476,43 @@ extern "C" { main->setting.state.status = f_string_dynamic_seek_to_back(path, f_string_ascii_slash_forward_s.string[0], &range); if (F_status_is_error_not(main->setting.state.status) && F_status_set_fine(main->setting.state.status) == F_okay && range.stop > range.start) { + --range.stop; - // This does not add the "+1" to the path_length because the trailing slash is not to be included. - const f_number_unsigned_t path_length = range.stop - range.start; - char path_parent_string[path_length + 1]; - const f_string_static_t path_parent = macro_f_string_static_t_initialize_2(path_parent_string, path_length); + for (i = 0; i < main->cache.tree.used; ++i) { + if (f_compare_dynamic_partial_dynamic(main->cache.tree.array[i], path, range) == F_equal_to) break; + } // for - memcpy(path_parent_string, path.string, path_length); - path_parent_string[path_length] = 0; + if (i == main->cache.tree.used) { + main->setting.state.status = f_memory_array_increase(kt_remove_allocation_small_d, sizeof(f_string_dynamic_t), (void **) &main->cache.tree.array, &main->cache.tree.used, &main->cache.tree.size); - f_print_dynamic(f_string_eol_s, main->program.output.to); + if (F_status_is_error(main->setting.state.status)) { + kt_remove_print_error(&main->program.error, macro_kt_remove_f(f_memory_array_increase)); - kt_remove_operate_file_simulate(main, path_parent, kt_remove_flag_file_operate_parent_d); - } - } + return flag_out; + } + + main->cache.tree.array[main->cache.tree.used].used = 0; + + main->setting.state.status = f_string_dynamic_partial_append(path, range, &main->cache.tree.array[main->cache.tree.used]); + + if (F_status_is_error(main->setting.state.status)) { + kt_remove_print_error(&main->program.error, macro_kt_remove_f(f_string_dynamic_partial_append)); + + return flag_out; + } + + ++main->cache.tree.used; - if (F_status_is_error(main->setting.state.status)) { - kt_remove_print_error_file(&main->program.error, macro_kt_remove_f(f_string_dynamic_seek_to_back), path, f_file_operation_process_s, fll_error_file_type_path_e); + f_print_dynamic(f_string_eol_s, main->program.output.to); - return flag_out; + kt_remove_operate_file_preprocess(main, main->cache.tree.array[main->cache.tree.used - 1], kt_remove_flag_file_operate_parent_d); + } + } + else if (F_status_is_error(main->setting.state.status)) { + kt_remove_print_error_file(&main->program.error, macro_kt_remove_f(f_string_dynamic_seek_to_back), path, f_file_operation_process_s, fll_error_file_type_path_e); + + return flag_out; + } } } @@ -510,7 +527,14 @@ extern "C" { return flag_out; } -#endif // _di_kt_remove_operate_file_simulate_ +#endif // _di_kt_remove_operate_file_preprocess_ + +#ifndef _di_kt_remove_operate_shall_remove_ + f_status_t kt_remove_operate_shall_remove(const uint16_t flag) { + + return (flag & kt_remove_flag_file_operate_remove_d) && !(flag & kt_remove_flag_file_operate_remove_not_fail_d); + } +#endif // _di_kt_remove_operate_shall_remove_ #ifdef __cplusplus } // extern "C" diff --git a/sources/c/program/kevux/tools/remove/main/operate.h b/sources/c/program/kevux/tools/remove/main/operate.h index b27d541..e29191b 100644 --- a/sources/c/program/kevux/tools/remove/main/operate.h +++ b/sources/c/program/kevux/tools/remove/main/operate.h @@ -31,7 +31,7 @@ extern "C" { * * Errors (with error bit) from: kt_remove_operate_file_directory(). * Errors (with error bit) from: kt_remove_operate_file_normal(). - * Errors (with error bit) from: kt_remove_operate_file_simulate(). + * Errors (with error bit) from: kt_remove_operate_file_preprocess(). * @param path * The path to the file to operate on. * @@ -43,7 +43,7 @@ extern "C" { * * @see kt_remove_operate_file_directory() * @see kt_remove_operate_file_normal() - * @see kt_remove_operate_file_simulate() + * @see kt_remove_operate_file_preprocess() */ #ifndef _di_kt_remove_operate_file_ extern void kt_remove_operate_file(kt_remove_main_t * const main, const f_string_static_t path); @@ -149,10 +149,7 @@ extern "C" { #endif // _di_kt_remove_operate_file_normal_ /** - * Perform simulation of the file operation. - * - * The simulation process is also intended to be used to determine what to do with the actual file. - * Therefore this should be called even when not simulating. + * Perform pre-processing (including simulation) of the file operation. * * @param main * The main program and settings data. @@ -171,14 +168,28 @@ extern "C" { * The operate file specific flags from kt_remove_flag_file_operate_*_e. * * @return - * The resulting flags determined by the simulation analysis. + * The resulting flags determined by the pre-process. * * @see f_file_link_read() * @see f_file_remove() */ -#ifndef _di_kt_remove_operate_file_simulate_ - extern uint16_t kt_remove_operate_file_simulate(kt_remove_main_t * const main, const f_string_static_t path, const uint16_t flag_operate); -#endif // _di_kt_remove_operate_file_simulate_ +#ifndef _di_kt_remove_operate_file_preprocess_ + extern uint16_t kt_remove_operate_file_preprocess(kt_remove_main_t * const main, const f_string_static_t path, const uint16_t flag_operate); +#endif // _di_kt_remove_operate_file_preprocess_ + +/** + * Determine whether or not a file shall be removed based on the given flag. + * + * @param flag + * The flag to use when determining the shall remove decision. + * + * @return + * F_true on shall remove. + * F_false otherwise. + */ +#ifndef _di_kt_remove_operate_shall_remove_ + extern f_status_t kt_remove_operate_shall_remove(const uint16_t flag); +#endif // _di_kt_remove_operate_shall_remove_ #ifdef __cplusplus } // extern "C" diff --git a/sources/c/program/kevux/tools/remove/main/print/message.c b/sources/c/program/kevux/tools/remove/main/print/message.c index cc98529..7f9b2df 100644 --- a/sources/c/program/kevux/tools/remove/main/print/message.c +++ b/sources/c/program/kevux/tools/remove/main/print/message.c @@ -86,7 +86,7 @@ extern "C" { fl_print_format(" - '%[%r%]': Fail when removing directoies that are empty.%r%r", print->to, context.set.notable, kt_remove_only_fail_s, context.set.notable, f_string_eol_s, f_string_eol_s); fl_print_format(" The parameter '%[%r%r%]' supports the following values:%r", print->to, context.set.notable, f_console_symbol_long_normal_s, kt_remove_long_prompt_s, context.set.notable, f_string_eol_s); - fl_print_format(" - '%[%r%]': Operate in interactive mode, prompting for every file.%r", print->to, context.set.notable, kt_remove_all_s, context.set.notable, f_string_eol_s); + fl_print_format(" - '%[%r%]': Operate in interactive mode, prompting for every file.%r", print->to, context.set.notable, kt_remove_each_s, context.set.notable, f_string_eol_s); fl_print_format(" - '%[%r%]': Operate in interactive mode, prompting for every link that is being followed.%r", print->to, context.set.notable, kt_remove_follow_s, context.set.notable, f_string_eol_s); fl_print_format(" - '%[%r%]': Do not operate in interactive mode.%r", print->to, context.set.notable, kt_remove_never_s, context.set.notable, f_string_eol_s); fl_print_format(" - '%[%r%]': Operate in interactive mode: prompting if removing 3 or more files.%r%r", print->to, context.set.notable, kt_remove_once_s, context.set.notable, f_string_eol_s, f_string_eol_s); diff --git a/sources/c/program/kevux/tools/remove/main/print/simulate.c b/sources/c/program/kevux/tools/remove/main/print/simulate.c index be7edf0..108e7d9 100644 --- a/sources/c/program/kevux/tools/remove/main/print/simulate.c +++ b/sources/c/program/kevux/tools/remove/main/print/simulate.c @@ -29,6 +29,19 @@ extern "C" { } #endif // _di_kt_remove_print_simulate_operate_ +#ifndef _di_kt_remove_print_simulate_operate_boolean_ + void kt_remove_print_simulate_operate_boolean(fl_print_t * const print, const f_string_static_t name, const bool yes) { + + if (!print || !print->custom) return; + + kt_remove_main_t * const main = (kt_remove_main_t *) print->custom; + + if (!(main->setting.flag & kt_remove_main_flag_simulate_d)) return; + + fll_print_format(" %r %r%r", main->program.output.to, name, yes ? kt_remove_yes_s : kt_remove_no_s, f_string_eol_s); + } +#endif // _di_kt_remove_print_simulate_operate_boolean_ + #ifndef _di_kt_remove_print_simulate_operate_file_ void kt_remove_print_simulate_operate_file(fl_print_t * const print, const f_string_static_t path) { @@ -43,7 +56,7 @@ extern "C" { #endif // _di_kt_remove_print_simulate_operate_file_ #ifndef _di_kt_remove_print_simulate_operate_file_exists_ - void kt_remove_print_simulate_operate_file_exists(fl_print_t * const print, const f_string_static_t path) { + void kt_remove_print_simulate_operate_file_exists(fl_print_t * const print, const f_string_static_t path, const uint16_t flag) { if (!print || !print->custom) return; @@ -57,19 +70,10 @@ extern "C" { return; } - f_status_t status = f_file_is(path, F_file_type_link_d, F_false); - - - if (F_status_is_error(status) && F_status_set_fine(status) != F_file_found_not) { - fl_print_format(" file_read_failure %ui%r", main->program.output.to, F_status_set_fine(status), f_string_eol_s); - - return; - } - - if (status == F_true) { + if (flag & kt_remove_flag_file_operate_link_d) { main->cache.buffer.used = 0; - status = f_file_link_read(path, F_false, &main->cache.buffer); + const f_status_t status = f_file_link_read(path, F_false, &main->cache.buffer); if (F_status_is_error(status)) { fl_print_format(" link_read_failure %ui%r", main->program.output.to, F_status_set_fine(status), f_string_eol_s); @@ -446,8 +450,8 @@ extern "C" { } #endif // _di_kt_remove_print_simulate_operate_file_stat_ -#ifndef _di_kt_remove_print_simulate_operate_boolean_ - void kt_remove_print_simulate_operate_boolean(fl_print_t * const print, const f_string_static_t name, const bool yes) { +#ifndef _di_kt_remove_print_simulate_operate_prompt_once_ + void kt_remove_print_simulate_operate_prompt_once(fl_print_t * const print, const bool yes) { if (!print || !print->custom) return; @@ -455,9 +459,9 @@ extern "C" { if (!(main->setting.flag & kt_remove_main_flag_simulate_d)) return; - fll_print_format(" %r %r%r", main->program.output.to, name, yes ? kt_remove_yes_s : kt_remove_no_s, f_string_eol_s); + fll_print_format(" %r %r%r", main->program.output.to, kt_remove_prompt_s, yes ? kt_remove_once_s : kt_remove_no_s, f_string_eol_s); } -#endif // _di_kt_remove_print_simulate_operate_boolean_ +#endif // _di_kt_remove_print_simulate_operate_prompt_once_ #ifdef __cplusplus } // extern "C" diff --git a/sources/c/program/kevux/tools/remove/main/print/simulate.h b/sources/c/program/kevux/tools/remove/main/print/simulate.h index 2892fe6..ad34e0c 100644 --- a/sources/c/program/kevux/tools/remove/main/print/simulate.h +++ b/sources/c/program/kevux/tools/remove/main/print/simulate.h @@ -35,6 +35,29 @@ extern "C" { #endif // _di_kt_remove_print_simulate_operate_ /** + * Print a boolean message for some named parameter regarding the simulation. + * + * This does nothing if the simulate flag (kt_remove_flag_simulate_d) is not set. + * + * @param print + * The output structure to print to. + * + * This locks, uses, and unlocks the file stream. + * + * Must not be NULL. + * + * This does not alter print.custom.setting.state.status. + * @param name + * The name to be associated with the boolean value. + * @param yes + * If TRUE, then print "yes". + * If FALSE, then print "no". + */ +#ifndef _di_kt_remove_print_simulate_operate_boolean_ + extern void kt_remove_print_simulate_operate_boolean(fl_print_t * const print, const f_string_static_t name, const bool yes); +#endif // _di_kt_remove_print_simulate_operate_boolean_ + +/** * Simulate operate on a single file. * * This does nothing if the simulate flag (kt_remove_flag_simulate_d) is not set. @@ -69,9 +92,12 @@ extern "C" { * This does not alter print.custom.setting.state.status. * @param path * The path to the file to operate on. + * @param flag + * The file operate flags associated with the file. + * The kt_remove_flag_file_operate_link_d is of specific interest here. */ #ifndef _di_kt_remove_print_simulate_operate_file_exists_ - extern void kt_remove_print_simulate_operate_file_exists(fl_print_t * const print, const f_string_static_t path); + extern void kt_remove_print_simulate_operate_file_exists(fl_print_t * const print, const f_string_static_t path, const uint16_t flag); #endif // _di_kt_remove_print_simulate_operate_file_exists_ /** @@ -95,7 +121,7 @@ extern "C" { #endif // _di_kt_remove_print_simulate_operate_file_stat_ /** - * Print a boolean message for some named parameter regarding the simulation. + * Print a message for some prompt parameter is set to once regarding the simulation. * * This does nothing if the simulate flag (kt_remove_flag_simulate_d) is not set. * @@ -107,15 +133,13 @@ extern "C" { * Must not be NULL. * * This does not alter print.custom.setting.state.status. - * @param name - * The name printed to be assocaited with the boolean value. * @param yes - * If TRUE, then print "yes". + * If TRUE, then print "once". * If FALSE, then print "no". */ -#ifndef _di_kt_remove_print_simulate_operate_boolean_ - extern void kt_remove_print_simulate_operate_boolean(fl_print_t * const print, const f_string_static_t name, const bool yes); -#endif // _di_kt_remove_print_simulate_operate_boolean_ +#ifndef _di_kt_remove_print_simulate_operate_prompt_once_ + extern void kt_remove_print_simulate_operate_prompt_once(fl_print_t * const print, const bool yes); +#endif // _di_kt_remove_print_simulate_operate_prompt_once_ #ifdef __cplusplus } // extern "C" -- 1.8.3.1