From 953c7f3c247fc37140756b959b1acf7c48968b60 Mon Sep 17 00:00:00 2001 From: Kevin Day Date: Wed, 15 Jan 2025 22:14:17 -0600 Subject: [PATCH] Cleanup: Remove kt_remove_parameter_isolate_e commented out code. The isolate parameter is not supported and is not planned to be supported. One of the reasons why I decided to write this remove program is because I observed odd bugs with the rm and rmdir programs in a chroot environment when compiling Kevux. The `/proc` might not be mounted and the remove commands fail. Adding support for `/proc` adds more code that requires special user-space paths to exist. This is not an unideal situations. I've decided to not support the `-i`/`--isolate` command because of this reason and because not implementing this simplifies the code. --- documents/readme.remove.txt | 1 - sources/c/program/kevux/tools/remove/main/common.c | 65 ---------------------- .../kevux/tools/remove/main/common/define.h | 42 ++++++-------- .../kevux/tools/remove/main/common/enumeration.h | 1 - .../kevux/tools/remove/main/common/string.c | 2 - .../kevux/tools/remove/main/common/string.h | 6 -- .../kevux/tools/remove/main/print/message.c | 7 --- 7 files changed, 18 insertions(+), 106 deletions(-) diff --git a/documents/readme.remove.txt b/documents/readme.remove.txt index 88bd97c..82e72a6 100644 --- a/documents/readme.remove.txt +++ b/documents/readme.remove.txt @@ -35,7 +35,6 @@ Remove Readme Documentation: The code:"--follow" (code:"-F") parameter alters removal to remove the files pointed to by a symbolic link rather than the link itself. The code:"--force" (code:"-f") parameter to never prompt and ignore non-existent files and arguments. The code:"--group" (code:"-g") parameter accepts two additional parameters that restrict removal to the given group identifier. - The code:"--isolate" (code:"-i") parameter accepts one additional parameter that restricts removal to a single file system. The code:"--link" (code:"-l") parameter is a file type parameter that restricts removal to a symbolic link file. The code:"--mode" (code:"-m") parameter accepts two additional parameters that restrict removal to the given file mode. The code:"--prompt" (code:"-p") parameter accepts one additional parameter that designates operating in interactive mode and prompts the user for input. diff --git a/sources/c/program/kevux/tools/remove/main/common.c b/sources/c/program/kevux/tools/remove/main/common.c index ef64b89..95c768d 100644 --- a/sources/c/program/kevux/tools/remove/main/common.c +++ b/sources/c/program/kevux/tools/remove/main/common.c @@ -504,71 +504,6 @@ extern "C" { main->setting.flag |= kt_remove_main_flag_option_used_d; } - // kt_remove_parameter_isolate_e, needs additional parameters (all, ignore, or root). - // Currently not supported, requires /proc support. - //if (main->program.parameters.array[kt_remove_parameter_isolate_e].result & f_console_result_found_e) { - // main->setting.state.status = F_status_set_error(F_parameter); - // - // kt_remove_print_error_parameter_missing_value_requires_amount(&main->program.error, f_console_symbol_long_normal_s, kt_remove_long_isolate_s, 1); - // - // return; - //} - // - //if (main->program.parameters.array[kt_remove_parameter_isolate_e].result & f_console_result_value_e) { - // total_arguments = main->program.parameters.array[kt_remove_parameter_isolate_e].values.used; - // - // if (main->program.parameters.array[kt_remove_parameter_isolate_e].locations.used != total_arguments) { - // main->setting.state.status = F_status_set_error(F_parameter); - // - // kt_remove_print_error_parameter_missing_value_requires_amount(&main->program.error, f_console_symbol_long_normal_s, kt_remove_long_isolate_s, 1); - // - // return; - // } - // - // index = main->program.parameters.array[kt_remove_parameter_isolate_e].values.array[total_arguments - 1]; - // - // if (f_compare_dynamic(kt_remove_all_s, main->program.parameters.arguments.array[index]) == F_equal_to) { - // main->setting.flag |= kt_remove_main_flag_isolate_all_d; - // - // if (main->setting.flag & kt_remove_main_flag_isolate_ignore_d) { - // main->setting.flag -= kt_remove_main_flag_isolate_ignore_d; - // } - // - // if (main->setting.flag & kt_remove_main_flag_isolate_root_d) { - // main->setting.flag -= kt_remove_main_flag_isolate_root_d; - // } - // } - // else if (f_compare_dynamic(kt_remove_ignore_s, main->program.parameters.arguments.array[index]) == F_equal_to) { - // main->setting.flag |= kt_remove_main_flag_isolate_ignore_d; - // - // if (main->setting.flag & kt_remove_main_flag_isolate_all_d) { - // main->setting.flag -= kt_remove_main_flag_isolate_all_d; - // } - // - // if (main->setting.flag & kt_remove_main_flag_isolate_root_d) { - // main->setting.flag -= kt_remove_main_flag_isolate_root_d; - // } - // } - // else if (f_compare_dynamic(kt_remove_root_s, main->program.parameters.arguments.array[index]) == F_equal_to) { - // main->setting.flag |= kt_remove_main_flag_isolate_root_d; - // - // if (main->setting.flag & kt_remove_main_flag_isolate_all_d) { - // main->setting.flag -= kt_remove_main_flag_isolate_all_d; - // } - // - // if (main->setting.flag & kt_remove_main_flag_isolate_ignore_d) { - // main->setting.flag -= kt_remove_main_flag_isolate_ignore_d; - // } - // } - // else { - // main->setting.state.status = F_status_set_error(F_parameter); - // - // kt_remove_print_error_parameter_unknown_value(&main->program.error, f_console_symbol_long_normal_s, kt_remove_long_isolate_s, main->program.parameters.arguments.array[index]); - // - // return; - // } - //} - // kt_remove_parameter_mode_e, needs additional parameters (modes, match parameters). if (main->program.parameters.array[kt_remove_parameter_mode_e].result & f_console_result_found_e) { main->setting.state.status = F_status_set_error(F_parameter); 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 3b060c1..0d0446f 100644 --- a/sources/c/program/kevux/tools/remove/main/common/define.h +++ b/sources/c/program/kevux/tools/remove/main/common/define.h @@ -207,9 +207,6 @@ extern "C" { * - force: Forcibly delete. * - group: Remove by GID. * - help: Print help. - * - isolate_all: Isolate to a single file system, error on all outside file system files (not implemented, requires /proc support). - * - isolate_ignore: Ignore rather than fail for anything on a different file system (not implemented, requires /proc support). - * - isolate_root: Isolate to a single file system, error on remove on '/' (not implemented, requires /proc support). * - link: Remove by file type: link. * - mode: Remove by mode. * - option_used: This gets set when when certain options are specified to toggle the default match detection boolean during removal of each file. @@ -248,27 +245,24 @@ extern "C" { #define kt_remove_main_flag_force_d 0x2000 #define kt_remove_main_flag_group_d 0x4000 #define kt_remove_main_flag_help_d 0x8000 - #define kt_remove_main_flag_isolate_all_d 0x10000 - #define kt_remove_main_flag_isolate_ignore_d 0x20000 - #define kt_remove_main_flag_isolate_root_d 0x40000 - #define kt_remove_main_flag_link_d 0x80000 - #define kt_remove_main_flag_mode_d 0x100000 - #define kt_remove_main_flag_option_used_d 0x200000 - #define kt_remove_main_flag_prompt_each_d 0x400000 - #define kt_remove_main_flag_prompt_follow_d 0x800000 - #define kt_remove_main_flag_prompt_never_d 0x1000000 - #define kt_remove_main_flag_prompt_once_d 0x2000000 - #define kt_remove_main_flag_recurse_d 0x4000000 - #define kt_remove_main_flag_regular_d 0x8000000 - #define kt_remove_main_flag_same_d 0x10000000 - #define kt_remove_main_flag_simulate_d 0x20000000 - #define kt_remove_main_flag_socket_d 0x40000000 - #define kt_remove_main_flag_tree_d 0x80000000 - #define kt_remove_main_flag_updated_d 0x100000000 - #define kt_remove_main_flag_user_d 0x200000000 - #define kt_remove_main_flag_utc_d 0x400000000 - #define kt_remove_main_flag_version_d 0x800000000 - #define kt_remove_main_flag_version_copyright_help_d 0x800008008 + #define kt_remove_main_flag_link_d 0x10000 + #define kt_remove_main_flag_mode_d 0x20000 + #define kt_remove_main_flag_option_used_d 0x40000 + #define kt_remove_main_flag_prompt_each_d 0x80000 + #define kt_remove_main_flag_prompt_follow_d 0x100000 + #define kt_remove_main_flag_prompt_never_d 0x200000 + #define kt_remove_main_flag_prompt_once_d 0x400000 + #define kt_remove_main_flag_recurse_d 0x800000 + #define kt_remove_main_flag_regular_d 0x1000000 + #define kt_remove_main_flag_same_d 0x2000000 + #define kt_remove_main_flag_simulate_d 0x4000000 + #define kt_remove_main_flag_socket_d 0x8000000 + #define kt_remove_main_flag_tree_d 0x10000000 + #define kt_remove_main_flag_updated_d 0x20000000 + #define kt_remove_main_flag_user_d 0x40000000 + #define kt_remove_main_flag_utc_d 0x80000000 + #define kt_remove_main_flag_version_d 0x100000000 + #define kt_remove_main_flag_version_copyright_help_d 0x100008008 #define kt_remove_main_flag_empty_all_d (kt_remove_main_flag_empty_only_d | kt_remove_main_flag_empty_only_fail_d | kt_remove_main_flag_empty_not_d | kt_remove_main_flag_empty_not_fail_d) #define kt_remove_main_flag_prompt_all_d (kt_remove_main_flag_prompt_each_d | kt_remove_main_flag_prompt_follow_d | kt_remove_main_flag_prompt_never_d | kt_remove_main_flag_prompt_once_d) diff --git a/sources/c/program/kevux/tools/remove/main/common/enumeration.h b/sources/c/program/kevux/tools/remove/main/common/enumeration.h index 8675622..54d630a 100644 --- a/sources/c/program/kevux/tools/remove/main/common/enumeration.h +++ b/sources/c/program/kevux/tools/remove/main/common/enumeration.h @@ -44,7 +44,6 @@ extern "C" { kt_remove_parameter_follow_e, kt_remove_parameter_force_e, kt_remove_parameter_group_e, - //kt_remove_parameter_isolate_e, // Not implemented. kt_remove_parameter_link_e, kt_remove_parameter_local_e, kt_remove_parameter_mode_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 3a8867f..f61ebc3 100644 --- a/sources/c/program/kevux/tools/remove/main/common/string.c +++ b/sources/c/program/kevux/tools/remove/main/common/string.c @@ -106,7 +106,6 @@ extern "C" { const f_string_static_t kt_remove_short_follow_s = macro_f_string_static_t_initialize_1(KT_REMOVE_short_follow_s, 0, KT_REMOVE_short_follow_s_length); const f_string_static_t kt_remove_short_force_s = macro_f_string_static_t_initialize_1(KT_REMOVE_short_force_s, 0, KT_REMOVE_short_force_s_length); const f_string_static_t kt_remove_short_group_s = macro_f_string_static_t_initialize_1(KT_REMOVE_short_group_s, 0, KT_REMOVE_short_group_s_length); - const f_string_static_t kt_remove_short_isolate_s = macro_f_string_static_t_initialize_1(KT_REMOVE_short_isolate_s, 0, KT_REMOVE_short_isolate_s_length); const f_string_static_t kt_remove_short_link_s = macro_f_string_static_t_initialize_1(KT_REMOVE_short_link_s, 0, KT_REMOVE_short_link_s_length); const f_string_static_t kt_remove_short_mode_s = macro_f_string_static_t_initialize_1(KT_REMOVE_short_mode_s, 0, KT_REMOVE_short_mode_s_length); const f_string_static_t kt_remove_short_prompt_s = macro_f_string_static_t_initialize_1(KT_REMOVE_short_prompt_s, 0, KT_REMOVE_short_prompt_s_length); @@ -131,7 +130,6 @@ extern "C" { const f_string_static_t kt_remove_long_follow_s = macro_f_string_static_t_initialize_1(KT_REMOVE_long_follow_s, 0, KT_REMOVE_long_follow_s_length); const f_string_static_t kt_remove_long_force_s = macro_f_string_static_t_initialize_1(KT_REMOVE_long_force_s, 0, KT_REMOVE_long_force_s_length); const f_string_static_t kt_remove_long_group_s = macro_f_string_static_t_initialize_1(KT_REMOVE_long_group_s, 0, KT_REMOVE_long_group_s_length); - const f_string_static_t kt_remove_long_isolate_s = macro_f_string_static_t_initialize_1(KT_REMOVE_long_isolate_s, 0, KT_REMOVE_long_isolate_s_length); const f_string_static_t kt_remove_long_link_s = macro_f_string_static_t_initialize_1(KT_REMOVE_long_link_s, 0, KT_REMOVE_long_link_s_length); const f_string_static_t kt_remove_long_local_s = macro_f_string_static_t_initialize_1(KT_REMOVE_long_local_s, 0, KT_REMOVE_long_local_s_length); const f_string_static_t kt_remove_long_mode_s = macro_f_string_static_t_initialize_1(KT_REMOVE_long_mode_s, 0, KT_REMOVE_long_mode_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 3a17234..5d69f82 100644 --- a/sources/c/program/kevux/tools/remove/main/common/string.h +++ b/sources/c/program/kevux/tools/remove/main/common/string.h @@ -368,7 +368,6 @@ extern "C" { #define KT_REMOVE_short_follow_s "F" #define KT_REMOVE_short_force_s "f" #define KT_REMOVE_short_group_s "g" - #define KT_REMOVE_short_isolate_s "i" #define KT_REMOVE_short_link_s "l" #define KT_REMOVE_short_mode_s "m" #define KT_REMOVE_short_prompt_s "p" @@ -393,7 +392,6 @@ extern "C" { #define KT_REMOVE_long_follow_s "follow" #define KT_REMOVE_long_force_s "force" #define KT_REMOVE_long_group_s "group" - #define KT_REMOVE_long_isolate_s "isolate" #define KT_REMOVE_long_link_s "link" #define KT_REMOVE_long_local_s "local" #define KT_REMOVE_long_mode_s "mode" @@ -420,7 +418,6 @@ extern "C" { #define KT_REMOVE_short_follow_s_length 1 #define KT_REMOVE_short_force_s_length 1 #define KT_REMOVE_short_group_s_length 1 - #define KT_REMOVE_short_isolate_s_length 1 #define KT_REMOVE_short_link_s_length 1 #define KT_REMOVE_short_mode_s_length 1 #define KT_REMOVE_short_prompt_s_length 1 @@ -445,7 +442,6 @@ extern "C" { #define KT_REMOVE_long_follow_s_length 6 #define KT_REMOVE_long_force_s_length 5 #define KT_REMOVE_long_group_s_length 5 - #define KT_REMOVE_long_isolate_s_length 7 #define KT_REMOVE_long_link_s_length 4 #define KT_REMOVE_long_local_s_length 5 #define KT_REMOVE_long_mode_s_length 4 @@ -472,7 +468,6 @@ extern "C" { extern const f_string_static_t kt_remove_short_follow_s; extern const f_string_static_t kt_remove_short_force_s; extern const f_string_static_t kt_remove_short_group_s; - extern const f_string_static_t kt_remove_short_isolate_s; extern const f_string_static_t kt_remove_short_link_s; extern const f_string_static_t kt_remove_short_mode_s; extern const f_string_static_t kt_remove_short_prompt_s; @@ -497,7 +492,6 @@ extern "C" { extern const f_string_static_t kt_remove_long_follow_s; extern const f_string_static_t kt_remove_long_force_s; extern const f_string_static_t kt_remove_long_group_s; - extern const f_string_static_t kt_remove_long_isolate_s; extern const f_string_static_t kt_remove_long_link_s; extern const f_string_static_t kt_remove_long_local_s; extern const f_string_static_t kt_remove_long_mode_s; 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 3534120..cc98529 100644 --- a/sources/c/program/kevux/tools/remove/main/print/message.c +++ b/sources/c/program/kevux/tools/remove/main/print/message.c @@ -36,7 +36,6 @@ extern "C" { fll_program_print_help_option(print, kt_remove_short_follow_s, kt_remove_long_follow_s, f_console_symbol_short_normal_s, f_console_symbol_long_normal_s, " Remove the file being pointed to rather than the symbolic link itself."); fll_program_print_help_option(print, kt_remove_short_force_s, kt_remove_long_force_s, f_console_symbol_short_normal_s, f_console_symbol_long_normal_s, " Forcibly perform remove."); fll_program_print_help_option(print, kt_remove_short_group_s, kt_remove_long_group_s, f_console_symbol_short_normal_s, f_console_symbol_long_normal_s, " Remove by file group ID or name."); - //fll_program_print_help_option(print, kt_remove_short_isolate_s, kt_remove_long_isolate_s, f_console_symbol_short_normal_s, f_console_symbol_long_normal_s, " Isolate remove based on filesystem."); // Not implemented. fll_program_print_help_option(print, kt_remove_short_link_s, kt_remove_long_link_s, f_console_symbol_short_normal_s, f_console_symbol_long_normal_s, " Remove by file type of link."); fll_program_print_help_option(print, kt_remove_short_mode_s, kt_remove_long_mode_s, f_console_symbol_short_normal_s, f_console_symbol_long_normal_s, " Remove by file mode."); fll_program_print_help_option(print, kt_remove_short_prompt_s, kt_remove_long_prompt_s, f_console_symbol_short_normal_s, f_console_symbol_long_normal_s, " Prompt before removing."); @@ -86,12 +85,6 @@ extern "C" { fl_print_format(" - '%[%r%]': Remove directories that are empty.%r", print->to, context.set.notable, kt_remove_only_s, context.set.notable, f_string_eol_s); 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); - // Not being implemented currently, but may be in the future so the basic setup code is remaining. - //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_isolate_s, context.set.notable, f_string_eol_s); - //fl_print_format(" - '%[%r%]': Isolate to a single file system, error on all files outside of the file system.%r", print->to, context.set.notable, kt_remove_all_s, context.set.notable, f_string_eol_s); - //fl_print_format(" - '%[%r%]': Ignore rather than erroring on problems outside the file system.%r", print->to, context.set.notable, kt_remove_ignore_s, context.set.notable, f_string_eol_s); - //fl_print_format(" - '%[%r%]': Isolate to a single file system, error on '/'.%r%r", print->to, context.set.notable, kt_remove_root_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 link that is being followed.%r", print->to, context.set.notable, kt_remove_follow_s, context.set.notable, f_string_eol_s); -- 1.8.3.1