Progress: Continue working on completing the remove program.

Remove redundant code and get rid of a lot of the callbacks.
I did further structural investigation and found that I really didn't need most callbacks.

Add special flags to distinguish when file types are being specified and when they are not.
Then when this is set, handle accordingly and print errors.
This reduces the need for custom handling code in each of the other programs like `rm`, `rmdir`, and `unlink`.

Update the settings and flags accordingly.

I have not gotten the time to update the unit tests, which currently now fail.
I also need to review the programs and their replacement counterparts for any problems.

diff --git a/sources/c/program/kevux/tools/remove/main/common.c b/sources/c/program/kevux/tools/remove/main/common.c
index 7f1dde742e155d9c05bbdf97c7a211298b96e125..30c09e5a23fd49c3dd2c21958b518b4ff0819562 100644 (file)
--- a/sources/c/program/kevux/tools/remove/main/common.c
+++ b/sources/c/program/kevux/tools/remove/main/common.c
@@ -21,16 +21,16 @@ extern "C" {
     uint8_t j = 0;
 
     if (main->program.parameters.array[kt_remove_parameter_block_e].result & f_console_result_found_e) {
-      main->setting.flag |= kt_remove_main_flag_block_d | kt_remove_main_flag_option_used_d;
+      main->setting.flag |= kt_remove_main_flag_block_d | kt_remove_main_flag_option_type_d | kt_remove_main_flag_option_used_d;
     }
 
     if (main->program.parameters.array[kt_remove_parameter_character_e].result & f_console_result_found_e) {
-      main->setting.flag |= kt_remove_main_flag_character_d | kt_remove_main_flag_option_used_d;
+      main->setting.flag |= kt_remove_main_flag_character_d | kt_remove_main_flag_option_type_d | kt_remove_main_flag_option_used_d;
     }
 
     if (main->program.parameters.array[kt_remove_parameter_different_e].result & f_console_result_found_e) {
       main->setting.flag &= ~kt_remove_main_flag_same_d;
-      main->setting.flag |= kt_remove_main_flag_different_d | kt_remove_main_flag_option_used_d;
+      main->setting.flag |= kt_remove_main_flag_different_d | kt_remove_main_flag_option_type_d | kt_remove_main_flag_option_used_d;
 
       if (main->program.parameters.array[kt_remove_parameter_same_e].result & f_console_result_found_e) {
         index = main->program.parameters.array[kt_remove_parameter_different_e].locations.used;
@@ -44,11 +44,11 @@ extern "C" {
     }
     else if (main->program.parameters.array[kt_remove_parameter_same_e].result & f_console_result_found_e) {
       main->setting.flag &= ~kt_remove_main_flag_different_d;
-      main->setting.flag |= kt_remove_main_flag_same_d | kt_remove_main_flag_option_used_d;
+      main->setting.flag |= kt_remove_main_flag_same_d | kt_remove_main_flag_option_type_d | kt_remove_main_flag_option_used_d;
     }
 
     if (main->program.parameters.array[kt_remove_parameter_fifo_e].result & f_console_result_found_e) {
-      main->setting.flag |= kt_remove_main_flag_fifo_d | kt_remove_main_flag_option_used_d;
+      main->setting.flag |= kt_remove_main_flag_fifo_d | kt_remove_main_flag_option_type_d | kt_remove_main_flag_option_used_d;
     }
 
     if (main->program.parameters.array[kt_remove_parameter_follow_e].result & f_console_result_found_e) {
@@ -68,7 +68,7 @@ extern "C" {
     }
 
     if (main->program.parameters.array[kt_remove_parameter_directory_e].result & f_console_result_found_e) {
-      main->setting.flag |= kt_remove_main_flag_directory_d | kt_remove_main_flag_option_used_d;
+      main->setting.flag |= kt_remove_main_flag_directory_d | kt_remove_main_flag_option_type_d | kt_remove_main_flag_option_used_d;
     }
 
     if (main->program.parameters.array[kt_remove_parameter_force_e].result & f_console_result_found_e) {
@@ -76,7 +76,7 @@ extern "C" {
     }
 
     if (main->program.parameters.array[kt_remove_parameter_link_e].result & f_console_result_found_e) {
-      main->setting.flag |= kt_remove_main_flag_link_d | kt_remove_main_flag_option_used_d;
+      main->setting.flag |= kt_remove_main_flag_link_d | kt_remove_main_flag_option_type_d | kt_remove_main_flag_option_used_d;
     }
 
     if (main->program.parameters.array[kt_remove_parameter_recurse_e].result & f_console_result_found_e) {
@@ -84,7 +84,7 @@ extern "C" {
     }
 
     if (main->program.parameters.array[kt_remove_parameter_regular_e].result & f_console_result_found_e) {
-      main->setting.flag |= kt_remove_main_flag_regular_d | kt_remove_main_flag_option_used_d;
+      main->setting.flag |= kt_remove_main_flag_regular_d | kt_remove_main_flag_option_type_d | kt_remove_main_flag_option_used_d;
     }
 
     if (main->program.parameters.array[kt_remove_parameter_simulate_e].result & f_console_result_found_e) {
@@ -92,7 +92,7 @@ extern "C" {
     }
 
     if (main->program.parameters.array[kt_remove_parameter_socket_e].result & f_console_result_found_e) {
-      main->setting.flag |= kt_remove_main_flag_socket_d | kt_remove_main_flag_option_used_d;
+      main->setting.flag |= kt_remove_main_flag_socket_d | kt_remove_main_flag_option_type_d | kt_remove_main_flag_option_used_d;
     }
 
     if (main->program.parameters.array[kt_remove_parameter_tree_e].result & f_console_result_found_e) {
@@ -453,7 +453,7 @@ extern "C" {
     }
 
     if (main->program.parameters.array[kt_remove_parameter_unknown_e].result & f_console_result_found_e) {
-      main->setting.flag |= kt_remove_main_flag_unknown_d | kt_remove_main_flag_option_used_d;
+      main->setting.flag |= kt_remove_main_flag_unknown_d | kt_remove_main_flag_option_type_d | kt_remove_main_flag_option_used_d;
     }
 
     if (main->program.parameters.array[kt_remove_parameter_utc_e].result & f_console_result_found_e) {

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 1a077c072cc6b2f281f3fd21dfb1244b2b09a99e..593b01f1a3c0c1f7287d9d7f3250eedd2c81684f 100644 (file)
--- a/sources/c/program/kevux/tools/remove/main/common/define.h
+++ b/sources/c/program/kevux/tools/remove/main/common/define.h
@@ -239,8 +239,10 @@ extern "C" {
  *   - help:                        Print help.
  *   - link:                        Remove by file type: link.
  *   - mode:                        Remove by mode.
- *   - option_used:                 Designates that type match options are in use, overriding the default behavior.
- *   - prompt_all:                  Helper flag representing all prompt flag bits.
+ *   - option_type:                 Designates that type match options are specifically in use, overriding the default behavior (one should also set options_used when setting this).
+ *   - option_type_used:            A helper flag representing option_type and option_used flag bits being set.
+ *   - option_used:                 Designates that custom match options are in use, overriding the default behavior.
+ *   - prompt_all:                  A helper flag representing all prompt flag bits being set.
  *   - prompt_each:                 Operate in interactive mode, prompting for every file.
  *   - prompt_follow:               Operate in interactive mode: prompting for every link that is being followed.
  *   - prompt_never:                Do not operate in interactive mode.
@@ -263,7 +265,7 @@ extern "C" {
 #ifndef _di_kt_remove_main_flag_d_
   #define kt_remove_main_flag_none_d                        0x0
   #define kt_remove_main_flag_accessed_d                    0x1
-  #define kt_remove_main_flag_accessed_changed_updated_d    0x80000005
+  #define kt_remove_main_flag_accessed_changed_updated_d    0x100000005
   #define kt_remove_main_flag_block_d                       0x2
   #define kt_remove_main_flag_changed_d                     0x4
   #define kt_remove_main_flag_character_d                   0x8
@@ -276,34 +278,36 @@ extern "C" {
   #define kt_remove_main_flag_empty_not_d                   0x200
   #define kt_remove_main_flag_empty_not_fail_d              0x400
   #define kt_remove_main_flag_fifo_d                        0x800
-  #define kt_remove_main_flag_file_types_except_directory_d 0x2101080a
+  #define kt_remove_main_flag_file_types_except_directory_d 0x44201080a
   #define kt_remove_main_flag_follow_d                      0x1000
   #define kt_remove_main_flag_force_d                       0x2000
-  #define kt_remove_main_flag_force_simulate_d              0x10002000
+  #define kt_remove_main_flag_force_simulate_d              0x20002000
   #define kt_remove_main_flag_group_d                       0x4000
   #define kt_remove_main_flag_help_d                        0x8000
   #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_all_d                  0x780000
-  #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_remember_d                    0x2000000
-  #define kt_remove_main_flag_root_d                        0x4000000
-  #define kt_remove_main_flag_same_d                        0x8000000
-  #define kt_remove_main_flag_simulate_d                    0x10000000
-  #define kt_remove_main_flag_socket_d                      0x20000000
-  #define kt_remove_main_flag_tree_d                        0x40000000
-  #define kt_remove_main_flag_updated_d                     0x80000000
-  #define kt_remove_main_flag_user_d                        0x100000000
-  #define kt_remove_main_flag_unknown_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      0x800008010
+  #define kt_remove_main_flag_option_type_d                 0x40000
+  #define kt_remove_main_flag_option_type_used_d            0xc0000
+  #define kt_remove_main_flag_option_used_d                 0x80000
+  #define kt_remove_main_flag_prompt_all_d                  0xf00000
+  #define kt_remove_main_flag_prompt_each_d                 0x100000
+  #define kt_remove_main_flag_prompt_follow_d               0x200000
+  #define kt_remove_main_flag_prompt_never_d                0x400000
+  #define kt_remove_main_flag_prompt_once_d                 0x800000
+  #define kt_remove_main_flag_recurse_d                     0x1000000
+  #define kt_remove_main_flag_regular_d                     0x2000000
+  #define kt_remove_main_flag_remember_d                    0x4000000
+  #define kt_remove_main_flag_root_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_unknown_d                     0x400000000
+  #define kt_remove_main_flag_utc_d                         0x800000000
+  #define kt_remove_main_flag_version_d                     0x1000000000
+  #define kt_remove_main_flag_version_copyright_help_d      0x1000008010
 #endif // _di_kt_remove_main_flag_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 62dca4c8f7ded6d02077df8e7bb92109325b9042..ca81329d0f80fbec184fde84883c7f00b9adc34b 100644 (file)
--- a/sources/c/program/kevux/tools/remove/main/common/string.c
+++ b/sources/c/program/kevux/tools/remove/main/common/string.c
@@ -23,6 +23,7 @@ extern "C" {
   const f_string_static_t kt_remove_never_s = macro_f_string_static_t_initialize_1(KT_REMOVE_never_s, 0, KT_REMOVE_never_s_length);
   const f_string_static_t kt_remove_no_s = macro_f_string_static_t_initialize_1(KT_REMOVE_no_s, 0, KT_REMOVE_no_s_length);
   const f_string_static_t kt_remove_not_s = macro_f_string_static_t_initialize_1(KT_REMOVE_not_s, 0, KT_REMOVE_not_s_length);
+  const f_string_static_t kt_remove_not_empty_s = macro_f_string_static_t_initialize_1(KT_REMOVE_not_empty_s, 0, KT_REMOVE_not_empty_s_length);
   const f_string_static_t kt_remove_not_fail_s = macro_f_string_static_t_initialize_1(KT_REMOVE_not_fail_s, 0, KT_REMOVE_not_fail_s_length);
   const f_string_static_t kt_remove_now_s = macro_f_string_static_t_initialize_1(KT_REMOVE_now_s, 0, KT_REMOVE_now_s_length);
   const f_string_static_t kt_remove_once_s = macro_f_string_static_t_initialize_1(KT_REMOVE_once_s, 0, KT_REMOVE_once_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 899cfe3f92da30872084464764df621c67dc503c..e4be189e3772a517a362eb76aff2732ad4218c65 100644 (file)
--- a/sources/c/program/kevux/tools/remove/main/common/string.h
+++ b/sources/c/program/kevux/tools/remove/main/common/string.h
@@ -79,6 +79,7 @@ extern "C" {
   #define KT_REMOVE_never_s     "never"
   #define KT_REMOVE_no_s        "no"
   #define KT_REMOVE_not_s       "not"
+  #define KT_REMOVE_not_empty_s "not empty"
   #define KT_REMOVE_not_fail_s  "not_fail"
   #define KT_REMOVE_now_s       "now"
   #define KT_REMOVE_once_s      "once"
@@ -107,6 +108,7 @@ extern "C" {
   #define KT_REMOVE_never_s_length     5
   #define KT_REMOVE_no_s_length        2
   #define KT_REMOVE_not_s_length       3
+  #define KT_REMOVE_not_empty_s_length 9
   #define KT_REMOVE_not_fail_s_length  8
   #define KT_REMOVE_now_s_length       3
   #define KT_REMOVE_once_s_length      4
@@ -135,6 +137,7 @@ extern "C" {
   extern const f_string_static_t kt_remove_never_s;
   extern const f_string_static_t kt_remove_no_s;
   extern const f_string_static_t kt_remove_not_s;
+  extern const f_string_static_t kt_remove_not_empty_s;
   extern const f_string_static_t kt_remove_not_fail_s;
   extern const f_string_static_t kt_remove_now_s;
   extern const f_string_static_t kt_remove_once_s;

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 aef6031b8fb1792f3ef44200001e4574b100979f..adbd98c9a0211c47ae4cd488896e4c9355f56a44 100644 (file)
--- a/sources/c/program/kevux/tools/remove/main/common/type.h
+++ b/sources/c/program/kevux/tools/remove/main/common/type.h
@@ -172,26 +172,18 @@ extern "C" {
 /**
  * The main program callbacks.
  *
- * print_help:     Print help.
- * process_normal: Process normally (data from parameters and files).
- * process_remove: Process actual removal, returning F_done to designate handled, and F_okay for letting parent continue handling.
+ * print_help: Print help.
  */
 #ifndef _di_kt_remove_callback_t_
   typedef f_status_t (*print_help_call_t)(fl_print_t * const print, const f_color_context_t context);
-  typedef void (*process_normal_call_t)(kt_remove_main_t * const main);
-  typedef f_status_t (*process_remove_call_t)(kt_remove_main_t * const main, const f_string_static_t path, const uint32_t flag_operate);
 
   typedef struct {
     print_help_call_t print_help;
-    process_normal_call_t process_normal;
-    process_remove_call_t process_remove;
   } kt_remove_callback_t;
 
   #define kt_remove_callback_t_initialize \
     { \
       0, \
-      0, \
-      0, \
     }
 #endif // _di_kt_remove_callback_t_
 

diff --git a/sources/c/program/kevux/tools/remove/main/operate.c b/sources/c/program/kevux/tools/remove/main/operate.c
index 9ce6796ccecb2f30f07f041b157856c1bfbb66ad..547c0869f5c47b2df83a91e84fc4f5cb7f735c06 100644 (file)
--- a/sources/c/program/kevux/tools/remove/main/operate.c
+++ b/sources/c/program/kevux/tools/remove/main/operate.c
@@ -4,7 +4,6 @@
 extern "C" {
 #endif
 
-// @fixme nothing is calling this. recurrsion is needed!?
 #ifndef _di_kt_remove_operate_directory_
   f_status_t kt_remove_operate_directory(kt_remove_main_t * const main, const f_string_static_t path, const uint32_t flag_operate) {
 
@@ -70,20 +69,9 @@ extern "C" {
           if (F_status_is_error_not(main->setting.state.status) && main->setting.state.status != F_skip) {
             main->setting.state.status = F_okay;
 
-            if (flag_operate & kt_remove_flag_file_operate_directory_d) {
-              status = main->setting.state.status = kt_remove_operate_directory(main, path, flag_operate);
-            }
-            else {
-              if (main->call.process_remove) {
-                status = main->setting.state.status = main->call.process_remove(main, path, flag_operate);
-
-                if (status == F_done) {
-                  main->setting.state.status = F_okay;
-
-                  return;
-                }
-              }
-            }
+            status = main->setting.state.status = (flag_operate & kt_remove_flag_file_operate_directory_d)
+              ? kt_remove_operate_directory(main, path, flag_operate)
+              : kt_remove_operate_remove(main, path, flag_operate);
           }
         }
       }
@@ -121,18 +109,10 @@ extern "C" {
     if (!kt_remove_operate_shall_remove(flag_operate) || (main->setting.flag & kt_remove_main_flag_simulate_d)) return;
 
     if (F_status_is_error_not(main->setting.state.status) && !(flag_operate & kt_remove_flag_file_operate_processed_d)) {
-      if (main->call.process_remove) {
-        main->setting.state.status = F_okay;
-
-        main->setting.state.status = main->call.process_remove(main, path, flag_operate);
-        if (F_status_is_error(main->setting.state.status)) return;
-
-        if (main->setting.state.status == F_done) {
-          main->setting.state.status = F_okay;
+      main->setting.state.status = F_okay;
 
-          return;
-        }
-      }
+      main->setting.state.status = kt_remove_operate_remove(main, path, flag_operate);
+      if (F_status_is_error(main->setting.state.status)) return;
     }
 
     if (F_status_is_error_not(main->setting.state.status)) {
@@ -393,24 +373,22 @@ extern "C" {
 
     kt_remove_main_t * const main = (kt_remove_main_t *) recurse->state.custom;
 
-    if (main->call.process_remove) {
-      recurse->state.status = F_okay;
+    recurse->state.status = F_okay;
 
-      recurse->state.status = main->call.process_remove(
-        main,
-        path,
-        flag & f_directory_recurse_do_flag_top_after_e
-          ? recurse->state.code
-          : flag & f_directory_recurse_do_flag_directory_e
-            ? (recurse->state.code | kt_remove_flag_file_operate_child_d | kt_remove_flag_file_operate_directory_d) & ~kt_remove_flag_file_operate_parent_d
-            : (recurse->state.code | kt_remove_flag_file_operate_child_d) & ~kt_remove_flag_file_operate_directory_parent_d
-      );
+    recurse->state.status = kt_remove_operate_remove(
+      main,
+      path,
+      flag & f_directory_recurse_do_flag_top_after_e
+        ? recurse->state.code
+        : flag & f_directory_recurse_do_flag_directory_e
+          ? (recurse->state.code | kt_remove_flag_file_operate_child_d | kt_remove_flag_file_operate_directory_d) & ~kt_remove_flag_file_operate_parent_d
+          : (recurse->state.code | kt_remove_flag_file_operate_child_d) & ~kt_remove_flag_file_operate_directory_parent_d
+    );
 
-      if (recurse->state.status == F_done) {
-        recurse->state.status = F_okay;
+    if (recurse->state.status == F_done) {
+      recurse->state.status = F_okay;
 
-        return;
-      }
+      return;
     }
   }
 #endif // _di_kt_remove_operate_recurse_action_
@@ -515,7 +493,7 @@ extern "C" {
 #ifndef _di_kt_remove_operate_shall_remove_
   f_status_t kt_remove_operate_shall_remove(const uint32_t flag) {
 
-    return flag & kt_remove_flag_file_operate_remove_d;
+    return (flag & kt_remove_flag_file_operate_remove_d) && !(flag & kt_remove_flag_file_operate_remove_fail_d) && !(flag & kt_remove_flag_file_operate_remove_not_d);
   }
 #endif // _di_kt_remove_operate_shall_remove_
 

diff --git a/sources/c/program/kevux/tools/remove/main/preprocess.c b/sources/c/program/kevux/tools/remove/main/preprocess.c
index 55d5dcb37f5b52c022cb2b2e85dcb4197905cd65..f7497247f465d18c02428f15db469c3bd3ac7e5d 100644 (file)
--- a/sources/c/program/kevux/tools/remove/main/preprocess.c
+++ b/sources/c/program/kevux/tools/remove/main/preprocess.c
@@ -17,7 +17,7 @@ extern "C" {
 
     if (kt_remove_signal_check(main)) return 0;
 
-    uint32_t flag_out = (main->setting.flag & kt_remove_main_flag_option_used_d) ? 0 : kt_remove_flag_file_operate_remove_d;
+    uint32_t flag_out = (main->setting.flag & kt_remove_main_flag_option_type_used_d) ? 0 : kt_remove_flag_file_operate_remove_d;
 
     kt_remove_operate_memory_check(main, path, &flag_out);
     if (F_status_is_error(main->setting.state.status) || (flag_out & kt_remove_flag_file_operate_processed_d)) return flag_out;
@@ -32,9 +32,7 @@ extern "C" {
       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);
-        }
+        remove_print_warning_file_reason(&main->program.warning, path, kt_remove_print_reason_stat_fail_s);
 
         return 0;
       }
@@ -55,9 +53,7 @@ extern "C" {
     }
 
     if (F_status_is_error(main->setting.state.status)) {
-      if (!(main->setting.flag & kt_remove_main_flag_simulate_d)) {
-        remove_print_warning_file_reason(&main->program.warning, path, kt_remove_print_reason_no_access_s);
-      }
+      remove_print_warning_file_reason(&main->program.warning, path, kt_remove_print_reason_no_access_s);
 
       return 0;
     }
@@ -83,78 +79,32 @@ extern "C" {
     main->setting.state.status = f_file_stat(path, main->setting.flag & kt_remove_main_flag_follow_d, &statistics);
 
     if (F_status_is_error(main->setting.state.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);
-      }
+      remove_print_warning_file_reason(&main->program.warning, path, kt_remove_print_reason_stat_fail_s);
 
       return flag_out;
     }
 
-    if (macro_f_file_type_is_block(statistics.st_mode)) {
-      kt_remove_print_simulate_operate_boolean(&main->program.output, f_file_type_name_block_s, F_true);
+    kt_remove_preprocess_file_type(main, path, macro_f_file_type_is_block(statistics.st_mode), f_file_type_name_block_s, kt_remove_main_flag_block_d, 0x1, &flag_out);
 
-      if (main->setting.flag & kt_remove_main_flag_block_d) {
-        flag_out |= kt_remove_flag_file_operate_remove_d;
-      }
-    }
+    kt_remove_preprocess_file_type(main, path, macro_f_file_type_is_character(statistics.st_mode), f_file_type_name_character_s, kt_remove_main_flag_character_d, 0x1, &flag_out);
 
-    if (macro_f_file_type_is_character(statistics.st_mode)) {
-      kt_remove_print_simulate_operate_boolean(&main->program.output, f_file_type_name_character_s, F_true);
+    kt_remove_preprocess_file_type(main, path, macro_f_file_type_is_directory(statistics.st_mode), f_file_type_name_directory_s, kt_remove_main_flag_directory_d, 0x1, &flag_out);
 
-      if (main->setting.flag & kt_remove_main_flag_character_d) {
-        flag_out |= kt_remove_flag_file_operate_remove_d;
-      }
-    }
+    kt_remove_preprocess_file_type(main, path, macro_f_file_type_is_fifo(statistics.st_mode), f_file_type_name_fifo_s, kt_remove_main_flag_fifo_d, 0x1, &flag_out);
 
-    if (macro_f_file_type_is_directory(statistics.st_mode)) {
-      kt_remove_print_simulate_operate_boolean(&main->program.output, f_file_type_name_directory_s, F_true);
+    kt_remove_preprocess_file_type(main, path, macro_f_file_type_is_link(statistics.st_mode), f_file_type_name_link_s, kt_remove_main_flag_link_d, 0x1, &flag_out);
 
-      flag_out |= kt_remove_flag_file_operate_directory_d;
+    kt_remove_preprocess_file_type(main, path, macro_f_file_type_is_regular(statistics.st_mode), f_file_type_name_regular_s, kt_remove_main_flag_regular_d, 0x3, &flag_out);
 
-      if (main->setting.flag & kt_remove_main_flag_directory_d) {
-        flag_out |= kt_remove_flag_file_operate_remove_d;
-      }
-    }
-
-    if (macro_f_file_type_is_fifo(statistics.st_mode)) {
-      kt_remove_print_simulate_operate_boolean(&main->program.output, f_file_type_name_fifo_s, F_true);
-
-      if (main->setting.flag & kt_remove_main_flag_fifo_d) {
-        flag_out |= kt_remove_flag_file_operate_remove_d;
-      }
-    }
+    kt_remove_preprocess_file_type(main, path, macro_f_file_type_is_socket(statistics.st_mode), f_file_type_name_socket_s, kt_remove_main_flag_socket_d, 0x1, &flag_out);
 
-    if (macro_f_file_type_is_link(statistics.st_mode)) {
-      kt_remove_print_simulate_operate_boolean(&main->program.output, f_file_type_name_link_s, F_true);
+    kt_remove_preprocess_file_type(main, path, macro_f_file_type_is_unknown(statistics.st_mode), f_file_type_name_unknown_s, kt_remove_main_flag_unknown_d, 0x0, &flag_out);
 
-      if (main->setting.flag & kt_remove_main_flag_link_d) {
-        flag_out |= kt_remove_flag_file_operate_remove_d;
-      }
-    }
-
-    if (macro_f_file_type_is_regular(statistics.st_mode)) {
-      kt_remove_print_simulate_operate_boolean(&main->program.output, f_file_type_name_regular_s, F_true);
-
-      if (main->setting.flag & kt_remove_main_flag_regular_d) {
-        flag_out |= kt_remove_flag_file_operate_remove_d;
-      }
-    }
-
-    if (macro_f_file_type_is_socket(statistics.st_mode)) {
-      kt_remove_print_simulate_operate_boolean(&main->program.output, f_file_type_name_socket_s, F_true);
-
-      if (main->setting.flag & kt_remove_main_flag_socket_d) {
-        flag_out |= kt_remove_flag_file_operate_remove_d;
-      }
+    if (macro_f_file_type_is_directory(statistics.st_mode)) {
+      flag_out |= kt_remove_flag_file_operate_directory_d;
     }
 
-    if (main->setting.flag & kt_remove_main_flag_unknown_d) {
-      kt_remove_print_simulate_operate_boolean(&main->program.output, f_file_type_name_unknown_s, F_true);
-
-      if (macro_f_file_type_is_unknown(statistics.st_mode)) {
-        flag_out |= kt_remove_flag_file_operate_remove_d;
-      }
-    }
+    if (!(main->setting.flag & kt_remove_main_flag_simulate_d) && (flag_out & kt_remove_flag_file_operate_remove_fail_d)) return flag_out;
 
     if (main->setting.flag & kt_remove_main_flag_user_d) {
       for (i = 0; i < main->setting.users.used; ++i) {
@@ -276,6 +226,8 @@ extern "C" {
         if (main->setting.flag & kt_remove_main_flag_empty_all_d) {
           if (main->setting.state.status == F_true) {
             if (main->setting.flag & kt_remove_main_flag_empty_not_fail_d) {
+              kt_remove_print_error_file_is_a(&main->program.error, path, kt_remove_empty_s, 0);
+
               flag_out |= kt_remove_flag_file_operate_remove_fail_d;
             }
             else if (main->setting.flag & kt_remove_main_flag_empty_not_d) {
@@ -284,6 +236,8 @@ extern "C" {
           }
           else if (main->setting.state.status == F_false) {
             if (main->setting.flag & kt_remove_main_flag_empty_only_fail_d) {
+              kt_remove_print_error_file_is_a(&main->program.error, path, kt_remove_not_empty_s, 0);
+
               flag_out |= kt_remove_flag_file_operate_remove_fail_d;
             }
             else if (main->setting.flag & kt_remove_main_flag_empty_only_d || !(main->setting.flag & kt_remove_main_flag_recurse_d)) {
@@ -293,6 +247,8 @@ extern "C" {
         }
         else if (main->setting.state.status == F_false) {
           if (!(main->setting.flag & kt_remove_main_flag_recurse_d)) {
+            kt_remove_print_error_file_is_a(&main->program.error, path, kt_remove_not_empty_s, 0);
+
             flag_out |= kt_remove_flag_file_operate_remove_fail_d;
           }
         }
@@ -673,6 +629,30 @@ extern "C" {
   }
 #endif // _di_kt_remove_preprocess_file_dates_
 
+#ifndef _di_kt_remove_preprocess_file_type_
+  void kt_remove_preprocess_file_type(kt_remove_main_t * const main, const f_string_static_t path, const uint32_t is, f_string_static_t name, const uint64_t type, const uint8_t code, uint32_t * const flag_out) {
+
+    if (!main || !flag_out) return;
+
+    if (is) {
+      *flag_out |= kt_remove_flag_file_operate_remove_d;
+
+      if (main->setting.flag & type) {
+        *flag_out |= kt_remove_flag_file_operate_remove_d;
+      }
+      else if (main->setting.flag & kt_remove_main_flag_option_type_d) {
+        kt_remove_print_error_file_is_a(&main->program.error, path, name, code);
+
+        *flag_out |= kt_remove_flag_file_operate_remove_fail_d;
+      }
+    }
+
+    if (is || (main->setting.flag & type)) {
+      kt_remove_print_simulate_operate_boolean(&main->program.output, name, is);
+    }
+  }
+#endif // _di_kt_remove_preprocess_file_type_
+
 #ifndef _di_kt_remove_preprocess_recurse_action_
   void kt_remove_preprocess_recurse_action(f_directory_recurse_do_t * const recurse, const f_string_static_t name, const uint32_t flag) {
 

diff --git a/sources/c/program/kevux/tools/remove/main/preprocess.h b/sources/c/program/kevux/tools/remove/main/preprocess.h
index 394f8112283c4db79ad181bef969ea8e9a04b424..a7de4103474fda4f0a59e3c212c4e9396b9a3cea 100644 (file)
--- a/sources/c/program/kevux/tools/remove/main/preprocess.h
+++ b/sources/c/program/kevux/tools/remove/main/preprocess.h
@@ -103,6 +103,38 @@ extern "C" {
 #endif // _di_kt_remove_preprocess_file_dates_
 
 /**
+ * Perform pre-processing (including simulation) of the file operation, specifically handling file types.
+ *
+ * @param main
+ *   The main program and settings data.
+ *
+ *   Must not be NULL.
+ *
+ *   This alters main.setting.state.status:
+ *     F_yes on date matched.
+ *     F_no on no matches.
+ *     F_parameter (with error bit) if a parameter is invalid.
+ * @param path
+ *   The path to the file to operate on.
+ * @param is
+ *   A boolean designating whether or not this is of a particular type.
+ *   This is expected to be passed something like macro_f_file_type_is_block().
+ * @param name
+ *   The name of the file type being tested.
+ * @param type
+ *   A flag from the kt_remove_main_flag_*_d representing the file type.
+ * @param code
+ *   A code intended to be passed to kt_remove_print_error_file_is_a() as needed.
+ * @param flag_out
+ *   The return flag to modify if needed.
+ *
+ *   Must not be NULL.
+ */
+#ifndef _di_kt_remove_preprocess_file_type_
+  extern void kt_remove_preprocess_file_type(kt_remove_main_t * const main, const f_string_static_t path, const uint32_t is, f_string_static_t name, const uint64_t type, const uint8_t code, uint32_t * const flag_out);
+#endif // _di_kt_remove_preprocess_file_type_
+
+/**
  * Perform directory recursion for a single file operation action.
  *
  * @param recurse

diff --git a/sources/c/program/kevux/tools/remove/main/print/error.c b/sources/c/program/kevux/tools/remove/main/print/error.c
index c6c0716e839510158cf128afad837acc9c99be5f..abfe5e198c5a37096e18b3abe18f1991e02e2d27 100644 (file)
--- a/sources/c/program/kevux/tools/remove/main/print/error.c
+++ b/sources/c/program/kevux/tools/remove/main/print/error.c
@@ -18,6 +18,40 @@ extern "C" {
   }
 #endif // _di_kt_remove_print_error_
 
+#ifndef _di_kt_remove_print_error_file_is_a_
+  f_status_t kt_remove_print_error_file_is_a(fl_print_t * const print, const f_string_static_t path, const f_string_static_t is, const uint8_t code) {
+
+    if (!print || !print->custom) return F_status_set_error(F_output_not);
+    if (print->verbosity < f_console_verbosity_error_e) return F_output_not;
+
+    kt_remove_main_t * const main = (kt_remove_main_t *) print->custom;
+
+    if (main->setting.flag & kt_remove_main_flag_simulate_d) return F_output_not;
+
+    f_file_stream_lock(print->to);
+
+    fl_print_format("%[%QCannot remove '%]", print->to, print->set->error, print->prefix, print->set->error);
+    fl_print_format("%[%Q%]", print->to, print->set->notable, path, print->set->notable);
+    fl_print_format("%[', is ", print->to, print->set->error);
+
+    if (code & 0x1) {
+      fl_print_format("a ", print->to);
+    }
+
+    fl_print_format("%Q", print->to, is);
+
+    if (code & 0x2) {
+      fl_print_format(" file", print->to);
+    }
+
+    fl_print_format(".%]%r", print->to, print->set->error, f_string_eol_s);
+
+    f_file_stream_unlock(print->to);
+
+    return F_okay;
+  }
+#endif // _di_kt_remove_print_error_file_is_a_
+
 #ifndef _di_kt_remove_print_error_file_
   f_status_t kt_remove_print_error_file(fl_print_t * const print, const f_string_t function, const f_string_static_t name, const f_string_static_t operation, const uint8_t type) {
 

diff --git a/sources/c/program/kevux/tools/remove/main/print/error.h b/sources/c/program/kevux/tools/remove/main/print/error.h
index 37705cefe102887f4d61351165bd7142c0a32afa..1a334bb889f2647862bcd0d5e42f8e43063eee92 100644 (file)
--- a/sources/c/program/kevux/tools/remove/main/print/error.h
+++ b/sources/c/program/kevux/tools/remove/main/print/error.h
@@ -67,14 +67,39 @@ extern "C" {
  *   F_output_not on success, but no printing is performed.
  *
  *   F_output_not (with error bit) if setting is NULL.
- *
- * @see fll_error_file_print()
  */
 #ifndef _di_kt_remove_print_error_file_
   extern f_status_t kt_remove_print_error_file(fl_print_t * const print, const f_string_t function, const f_string_static_t name, const f_string_static_t operation, const uint8_t type);
 #endif // _di_kt_remove_print_error_file_
 
 /**
+ * Print error message about not being able to delete a directory due to something the directory is.
+ *
+ * @param print
+ *   The output structure to print to.
+ *
+ *   Must not be NULL.
+ *
+ *   This does not alter print.custom.setting.state.status.
+ * @param path
+ *   The file that cannot be deleted.
+ * @param is
+ *   Designate what the file is.
+ * @param code
+ *   Set to 0x1 to print an ' a' before the 'is' parameter.
+ *   Set to 0x2 to print ' file' after the 'is' parameter.
+ *
+ * @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.
+ */
+#ifndef _di_kt_remove_print_error_file_is_a_
+  extern f_status_t kt_remove_print_error_file_is_a(fl_print_t * const print, const f_string_static_t path, const f_string_static_t is, const uint8_t code);
+#endif // _di_kt_remove_print_error_file_is_a_
+
+/**
  * Print file related error or warning messages, using status from the parameter.
  *
  * This is useful for functions where the main.state.status is not being used, such as with fl_directory_do().
@@ -103,8 +128,6 @@ extern "C" {
  *   F_output_not on success, but no printing is performed.
  *
  *   F_output_not (with error bit) if setting is NULL.
- *
- * @see fll_error_file_print()
  */
 #ifndef _di_kt_remove_print_error_file_status_
   extern f_status_t kt_remove_print_error_file_status(fl_print_t * const print, const f_string_t function, const f_string_static_t name, const f_string_static_t operation, const uint8_t type, const f_status_t status);
@@ -134,8 +157,6 @@ extern "C" {
  *   F_output_not on success, but no printing is performed.
  *
  *   F_output_not (with error bit) if setting is NULL.
- *
- * @see fll_error_print()
  */
 #ifndef _di_kt_remove_print_error_id_
   extern f_status_t kt_remove_print_error_id(fl_print_t * const print, const f_string_t function, const f_string_static_t name_id, const bool is_user);
@@ -164,8 +185,6 @@ extern "C" {
  *   F_output_not on success, but no printing is performed.
  *
  *   F_output_not (with error bit) if setting is NULL.
- *
- * @see fll_error_print()
  */
 #ifndef _di_kt_remove_print_error_status_
   extern f_status_t kt_remove_print_error_status(fl_print_t * const print, const f_string_t function, const f_status_t status);
@@ -203,10 +222,6 @@ extern "C" {
  *   F_output_not on success, but no printing is performed.
  *
  *   F_output_not (with error bit) if setting is NULL.
- *
- * @see f_file_stream_lock()
- * @see f_file_stream_unlock()
- * @see fl_print_format()
  */
 #ifndef _di_kt_remove_print_error_parameter_missing_value_requires_amount_
   extern f_status_t kt_remove_print_error_parameter_missing_value_requires_amount(fl_print_t * const print, const f_string_static_t symbol, const f_string_static_t parameter, const f_number_unsigned_t amount);
@@ -242,10 +257,6 @@ extern "C" {
  *   F_output_not on success, but no printing is performed.
  *
  *   F_output_not (with error bit) if setting is NULL.
- *
- * @see f_file_stream_lock()
- * @see f_file_stream_unlock()
- * @see fl_print_format()
  */
 #ifndef _di_kt_remove_print_error_parameter_missing_value_requires_yesno_
   extern f_status_t kt_remove_print_error_parameter_missing_value_requires_yesno(fl_print_t * const print, const f_string_static_t symbol, const f_string_static_t parameter);
@@ -275,8 +286,6 @@ extern "C" {
  *   F_output_not on success, but no printing is performed.
  *
  *   F_output_not (with error bit) if setting is NULL.
- *
- * @see fll_print_format()
  */
 #ifndef _di_kt_remove_print_error_parameter_no_files_
   extern f_status_t kt_remove_print_error_parameter_no_files(fl_print_t * const print);
@@ -308,8 +317,6 @@ extern "C" {
  *   F_output_not on success, but no printing is performed.
  *
  *   F_output_not (with error bit) if setting is NULL.
- *
- * @see fll_print_format()
  */
 #ifndef _di_kt_remove_print_error_recursion_max_
   extern f_status_t kt_remove_print_error_recursion_max(fl_print_t * const print, const f_string_static_t path);
@@ -347,10 +354,6 @@ extern "C" {
  *   F_output_not on success, but no printing is performed.
  *
  *   F_output_not (with error bit) if setting is NULL.
- *
- * @see f_file_stream_lock()
- * @see f_file_stream_unlock()
- * @see fl_print_format()
  */
 #ifndef _di_kt_remove_print_error_parameter_unknown_value_
   extern f_status_t kt_remove_print_error_parameter_unknown_value(fl_print_t * const print, const f_string_static_t symbol, const f_string_static_t parameter, const f_string_static_t value);

diff --git a/sources/c/program/kevux/tools/remove/main/print/warning.c b/sources/c/program/kevux/tools/remove/main/print/warning.c
index 248616a85be6d8e6887fe1e37cf9e0b9548b3585..063955f23b8b8a007e27f1459c19429dd70ea4bd 100644 (file)
--- a/sources/c/program/kevux/tools/remove/main/print/warning.c
+++ b/sources/c/program/kevux/tools/remove/main/print/warning.c
@@ -12,6 +12,7 @@ extern "C" {
     kt_remove_main_t * const main = (kt_remove_main_t *) print->custom;
 
     if (print->verbosity < f_console_verbosity_verbose_e || (main->setting.flag & kt_remove_main_flag_force_d) && print->verbosity < f_console_verbosity_debug_e) return F_output_not;
+    if (main->setting.flag & kt_remove_main_flag_simulate_d) return F_output_not;
 
     f_file_stream_lock(print->to);
 

diff --git a/sources/c/program/kevux/tools/remove/main/remove.c b/sources/c/program/kevux/tools/remove/main/remove.c
index f9dd16bb00ea29c35b2c1af0518a36ab180168ef..523bca8fd8f59c14822a7825f63212a51f27fb89 100644 (file)
--- a/sources/c/program/kevux/tools/remove/main/remove.c
+++ b/sources/c/program/kevux/tools/remove/main/remove.c
@@ -31,9 +31,7 @@ extern "C" {
       return;
     }
 
-    if (main->call.process_normal) {
-      main->call.process_normal(main);
-    }
+    kt_remove_normal_operate(main);
 
     if (kt_remove_signal_check(main)) {
       fll_program_print_signal_received(&main->program.warning, main->program.signal_received);

diff --git a/sources/c/program/kevux/tools/remove/remove/main.c b/sources/c/program/kevux/tools/remove/remove/main.c
index fee2e6e19f35216de1f9e73562439503341d8011..1b927e4fd19c6bd02c59d81ed554fe9235ec03b8 100644 (file)
--- a/sources/c/program/kevux/tools/remove/remove/main.c
+++ b/sources/c/program/kevux/tools/remove/remove/main.c
@@ -31,8 +31,6 @@ int
   data.setting.program_name_long = &kt_remove_program_name_long_s;
 
   data.call.print_help = &kt_remove_print_message_help;
-  data.call.process_normal = &kt_remove_normal_operate;
-  data.call.process_remove = &kt_remove_operate_remove;
 
   #ifdef _en_kt_default_to_utc_
     data.setting.flag |= kt_remove_flag_utc_d;

diff --git a/sources/c/program/kevux/tools/remove/rm/main.c b/sources/c/program/kevux/tools/remove/rm/main.c
index d48f14777dacadb8b9cc58c8a3c83146cc801240..60a1c66844b3f8a6a641504b3f48b2febbd0d41c 100644 (file)
--- a/sources/c/program/kevux/tools/remove/rm/main.c
+++ b/sources/c/program/kevux/tools/remove/rm/main.c
@@ -25,8 +25,6 @@ int main(const int argc, const f_string_t *argv, const f_string_t *envp) {
   data.setting.program_name_long = &kt_remove_program_name_long_s;
 
   data.call.print_help = &kt_remove_rm_print_message_help;
-  data.call.process_normal = &kt_remove_normal_operate;
-  data.call.process_remove = &kt_remove_rm_operate_remove;
 
   #ifdef _en_kt_default_to_utc_
     data.setting.flag |= kt_remove_flag_utc_d;

diff --git a/sources/c/program/kevux/tools/remove/rm/print.c b/sources/c/program/kevux/tools/remove/rm/print.c
index 0612eb82da9d5c1e5738fe49946e95417cc4c332..a916a3fd5a8d4761ae6dec482bea719e47347783 100644 (file)
--- a/sources/c/program/kevux/tools/remove/rm/print.c
+++ b/sources/c/program/kevux/tools/remove/rm/print.c
@@ -4,42 +4,6 @@
 extern "C" {
 #endif
 
-#ifndef _di_kt_remove_rm_print_error_directory_
-  f_status_t kt_remove_rm_print_error_directory(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;
-
-    f_file_stream_lock(print->to);
-
-    fl_print_format("%[%QCannot remove '%]", print->to, print->set->error, print->prefix, print->set->error);
-    fl_print_format("%[%Q%]", print->to, print->set->notable, path, print->set->notable);
-    fl_print_format("%[', file is a directory.%]%r", print->to, print->set->error, print->set->error, f_string_eol_s);
-
-    f_file_stream_unlock(print->to);
-
-    return F_okay;
-  }
-#endif // _di_kt_remove_rm_print_error_directory_
-
-#ifndef _di_kt_remove_rm_print_error_directory_empty_not_
-  f_status_t kt_remove_rm_print_error_directory_empty_not(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;
-
-    f_file_stream_lock(print->to);
-
-    fl_print_format("%[%QCannot remove '%]", print->to, print->set->error, print->prefix, print->set->error);
-    fl_print_format("%[%Q%]", print->to, print->set->notable, path, print->set->notable);
-    fl_print_format("%[', directory is not empty.%]%r", print->to, print->set->error, print->set->error, f_string_eol_s);
-
-    f_file_stream_unlock(print->to);
-
-    return F_okay;
-  }
-#endif // _di_kt_remove_rm_print_error_directory_empty_not_
-
 #ifndef _di_kt_remove_rm_print_message_help_
   f_status_t kt_remove_rm_print_message_help(fl_print_t * const print, const f_color_context_t context) {
 

diff --git a/sources/c/program/kevux/tools/remove/rm/print.h b/sources/c/program/kevux/tools/remove/rm/print.h
index 6ac0b04221842f0f98474d3015eb0bd60bfeeae4..7fcfe25475eb593c7091cdffaf82f4a32f7b4ac9 100644 (file)
--- a/sources/c/program/kevux/tools/remove/rm/print.h
+++ b/sources/c/program/kevux/tools/remove/rm/print.h
@@ -17,54 +17,6 @@ extern "C" {
 #endif
 
 /**
- * Print error message about not being able to delete a file because that file is a directory.
- *
- * @param print
- *   The output structure to print to.
- *
- *   Must not be NULL.
- *
- *   This does not alter print.custom.setting.state.status.
- * @param path
- *   The file that cannot be deleted.
- *
- * @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 fll_error_print()
- */
-#ifndef _di_kt_remove_rm_print_error_directory_
-  extern f_status_t kt_remove_rm_print_error_directory(fl_print_t * const print, const f_string_static_t path);
-#endif // _di_kt_remove_rm_print_error_directory_
-
-/**
- * Print error message about not being able to delete a file because that file is not an empty directory.
- *
- * @param print
- *   The output structure to print to.
- *
- *   Must not be NULL.
- *
- *   This does not alter print.custom.setting.state.status.
- * @param path
- *   The file that cannot be deleted.
- *
- * @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 fll_error_print()
- */
-#ifndef _di_kt_remove_rm_print_error_directory_empty_not_
-  extern f_status_t kt_remove_rm_print_error_directory_empty_not(fl_print_t * const print, const f_string_static_t path);
-#endif // _di_kt_remove_rm_print_error_directory_empty_not_
-
-/**
  * Print help.
  *
  * @param print

diff --git a/sources/c/program/kevux/tools/remove/rm/rm.c b/sources/c/program/kevux/tools/remove/rm/rm.c
index 138fe5cdf9230467ecd7098874f303a08811f7f9..3d626308ba797ee57cf70765df4264c24b35c32c 100644 (file)
--- a/sources/c/program/kevux/tools/remove/rm/rm.c
+++ b/sources/c/program/kevux/tools/remove/rm/rm.c
@@ -4,32 +4,6 @@
 extern "C" {
 #endif
 
-#ifndef _di_kt_remove_rm_operate_remove_
-  f_status_t kt_remove_rm_operate_remove(kt_remove_main_t * const main, const f_string_static_t path, const uint32_t flag_operate) {
-
-    if (!main) return F_status_set_error(F_parameter);
-
-    if (!flag_operate) return F_status_set_error(F_parameter);
-
-    if (flag_operate & kt_remove_flag_file_operate_directory_d) {
-      if (main->setting.flag & kt_remove_main_flag_directory_d) {
-        if (!(flag_operate & kt_remove_flag_file_operate_empty_d) && (main->setting.flag & kt_remove_main_flag_empty_only_d)) {
-          kt_remove_rm_print_error_directory_empty_not(&main->program.error, path);
-
-          return F_status_set_error(F_no);
-        }
-      }
-      else {
-        kt_remove_rm_print_error_directory(&main->program.error, path);
-
-        return F_status_set_error(F_no);
-      }
-    }
-
-    return kt_remove_operate_remove(main, path, flag_operate);
-  }
-#endif // _di_kt_remove_rm_operate_remove_
-
 #ifndef _di_kt_remove_rm_setting_load_
   void kt_remove_rm_setting_load(const f_console_arguments_t arguments, kt_remove_main_t * const main) {
 
@@ -56,7 +30,7 @@ extern "C" {
     if (F_status_is_error(main->setting.state.status)) return;
 
     if (main->program.parameters.array[kt_remove_rm_parameter_directory_e].result & f_console_result_found_e) {
-      main->setting.flag |= kt_remove_main_flag_directory_d | kt_remove_main_flag_empty_only_d;
+      main->setting.flag |= kt_remove_main_flag_directory_d | kt_remove_main_flag_empty_only_fail_d;
     }
 
     if (main->program.parameters.array[kt_remove_rm_parameter_each_e].result & f_console_result_found_e) {
@@ -82,8 +56,8 @@ extern "C" {
     if ((main->program.parameters.array[kt_remove_rm_parameter_recursive_e].result & f_console_result_found_e) || (main->program.parameters.array[kt_remove_rm_parameter_recursive_alt_e].result & f_console_result_found_e)) {
       main->setting.flag |= kt_remove_main_flag_recurse_d | kt_remove_main_flag_directory_d;
 
-      // Must not have the empty only flag set while recursive.
-      main->setting.flag &= ~kt_remove_main_flag_empty_only_d;
+      // Must not have the empty flags set while recursive.
+      main->setting.flag &= ~kt_remove_main_flag_empty_all_d;
     }
 
     // @todo the kt_remove_main_flag_root_d needs to be implemented in the base remove project.
@@ -202,7 +176,7 @@ extern "C" {
     }
 
     // Make sure all non-directory files are deleted.
-    main->setting.flag |= kt_remove_main_flag_file_types_except_directory_d | kt_remove_main_flag_option_used_d;
+    main->setting.flag |= kt_remove_main_flag_file_types_except_directory_d | kt_remove_main_flag_option_type_d| kt_remove_main_flag_option_used_d;
   }
 #endif // _di_kt_remove_rm_setting_load_
 

diff --git a/sources/c/program/kevux/tools/remove/rm/rm.h b/sources/c/program/kevux/tools/remove/rm/rm.h
index 87f197f0773851099a43abf655ae7e3f783e40ee..752fad2eb7a4b37b676df370a3983edd5dbf3a17 100644 (file)
--- a/sources/c/program/kevux/tools/remove/rm/rm.h
+++ b/sources/c/program/kevux/tools/remove/rm/rm.h
@@ -21,46 +21,6 @@ extern "C" {
 #endif
 
 /**
- * Perform rm program remove operation.
- *
- * This prints error messages as appropriate.
- *
- * @param main
- *   The main program and settings data.
- *
- *   The setting.flag has kt_remove_flag_option_used_d forcibly cleared on the start of this function.
- *
- *   Must not be NULL.
- *
- *   This alters setting.status:
- *     Success from: kt_remove_operate_remove().
- *
- *     F_no (with error bit) on failure and file is not to be removed or cannot be removed.
- *
- *     Errors (with error bit) from: kt_remove_operate_remove().
- *
- *     F_parameter (with error bit) on parameter error.
- * @param path
- *   The file being processed.
- * @param flag_operate
- *   The operate file specific flags from kt_remove_flag_file_operate_*_e.
- *
- * @return
- *   Success from: kt_remove_operate_remove().
- *
- *   F_no (with error bit) on failure and file is not to be removed or cannot be removed.
- *
- *   Errors (with error bit) from: kt_remove_operate_remove().
- *
- *   F_parameter (with error bit) on parameter error.
- *
- * @see kt_remove_operate_remove()
- */
-#ifndef _di_kt_remove_rm_operate_remove_
-  extern f_status_t kt_remove_rm_operate_remove(kt_remove_main_t * const main, const f_string_static_t path, const uint32_t flag_operate);
-#endif // _di_kt_remove_rm_operate_remove_
-
-/**
  * Perform the rm program setting load process.
  *
  * This prints error messages as appropriate.

diff --git a/sources/c/program/kevux/tools/remove/rmdir/main.c b/sources/c/program/kevux/tools/remove/rmdir/main.c
index 80d9188e059086e65f262b2ec85197bac4cb7750..f7022bd316fcde2136768f5c5fadf31c70d44e76 100644 (file)
--- a/sources/c/program/kevux/tools/remove/rmdir/main.c
+++ b/sources/c/program/kevux/tools/remove/rmdir/main.c
@@ -25,8 +25,6 @@ int main(const int argc, const f_string_t *argv, const f_string_t *envp) {
   data.setting.program_name_long = &kt_remove_program_name_long_s;
 
   data.call.print_help = &kt_remove_rmdir_print_message_help;
-  data.call.process_normal = &kt_remove_normal_operate;
-  data.call.process_remove = &kt_remove_rmdir_operate_remove;
 
   #ifdef _en_kt_default_to_utc_
     data.setting.flag |= kt_remove_flag_utc_d;

diff --git a/sources/c/program/kevux/tools/remove/rmdir/print.c b/sources/c/program/kevux/tools/remove/rmdir/print.c
index 9827be03d36a9cf39d0e4f6e049bd098a41ee412..c73d41256a6b0a964fa171cf3c70e45fead81fc4 100644 (file)
--- a/sources/c/program/kevux/tools/remove/rmdir/print.c
+++ b/sources/c/program/kevux/tools/remove/rmdir/print.c
@@ -4,24 +4,6 @@
 extern "C" {
 #endif
 
-#ifndef _di_kt_remove_rmdir_print_error_directory_not_
-  f_status_t kt_remove_rmdir_print_error_directory_not(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;
-
-    f_file_stream_lock(print->to);
-
-    fl_print_format("%[%QCannot remove '%]", print->to, print->set->error, print->prefix, print->set->error);
-    fl_print_format("%[%Q%]", print->to, print->set->notable, path, print->set->notable);
-    fl_print_format("%[', file is not a directory.%]%r", print->to, print->set->error, print->set->error, f_string_eol_s);
-
-    f_file_stream_unlock(print->to);
-
-    return F_okay;
-  }
-#endif // _di_kt_remove_rmdir_print_error_directory_not_
-
 #ifndef _di_kt_remove_rmdir_print_message_help_
   f_status_t kt_remove_rmdir_print_message_help(fl_print_t * const print, const f_color_context_t context) {
 

diff --git a/sources/c/program/kevux/tools/remove/rmdir/print.h b/sources/c/program/kevux/tools/remove/rmdir/print.h
index 52e0a6d66ef572fcfe31d40fcee3ec02b0bca10b..51ccd524ded3aea06e87fe4aeb96424f4b2cfe29 100644 (file)
--- a/sources/c/program/kevux/tools/remove/rmdir/print.h
+++ b/sources/c/program/kevux/tools/remove/rmdir/print.h
@@ -17,30 +17,6 @@ extern "C" {
 #endif
 
 /**
- * Print error message about not being able to delete a file because that file is not a directory.
- *
- * @param print
- *   The output structure to print to.
- *
- *   Must not be NULL.
- *
- *   This does not alter print.custom.setting.state.status.
- * @param path
- *   The file that cannot be deleted.
- *
- * @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 fll_error_print()
- */
-#ifndef _di_kt_remove_rmdir_print_error_directory_not_
-  extern f_status_t kt_remove_rmdir_print_error_directory_not(fl_print_t * const print, const f_string_static_t path);
-#endif // _di_kt_remove_rmdir_print_error_directory_not_
-
-/**
  * Print help.
  *
  * @param print

diff --git a/sources/c/program/kevux/tools/remove/rmdir/rmdir.c b/sources/c/program/kevux/tools/remove/rmdir/rmdir.c
index 010d89384f55c859b2df66ef6f03f469252a3c65..e4fc58ace999ebb0d56e9a0a176b135816625f4b 100644 (file)
--- a/sources/c/program/kevux/tools/remove/rmdir/rmdir.c
+++ b/sources/c/program/kevux/tools/remove/rmdir/rmdir.c
@@ -4,23 +4,6 @@
 extern "C" {
 #endif
 
-#ifndef _di_kt_remove_rmdir_operate_remove_
-  f_status_t kt_remove_rmdir_operate_remove(kt_remove_main_t * const main, const f_string_static_t path, const uint32_t flag_operate) {
-
-    if (!main) return F_status_set_error(F_parameter);
-
-    if (!flag_operate) return F_status_set_error(F_parameter);
-
-    if (flag_operate & kt_remove_flag_file_operate_directory_d) {
-      return kt_remove_operate_remove(main, path, flag_operate);
-    }
-
-    kt_remove_rmdir_print_error_directory_not(&main->program.error, path);
-
-    return F_status_set_error(F_no);
-  }
-#endif // _di_kt_remove_rmdir_operate_remove_
-
 #ifndef _di_kt_remove_rmdir_setting_load_
   void kt_remove_rmdir_setting_load(const f_console_arguments_t arguments, kt_remove_main_t * const main) {
 
@@ -82,7 +65,7 @@ extern "C" {
     }
 
     // Make sure only directoreis are deleted.
-    main->setting.flag |= kt_remove_main_flag_directory_d | kt_remove_main_flag_option_used_d;
+    main->setting.flag |= kt_remove_main_flag_directory_d | kt_remove_main_flag_option_type_d | kt_remove_main_flag_option_used_d;
   }
 #endif // _di_kt_remove_rmdir_setting_load_
 

diff --git a/sources/c/program/kevux/tools/remove/rmdir/rmdir.h b/sources/c/program/kevux/tools/remove/rmdir/rmdir.h
index aff6d3458b133621750506d27a62d546c1dcc9aa..b5d4f1384ad6edefc3cd5cd0374d9f92e6e44c5b 100644 (file)
--- a/sources/c/program/kevux/tools/remove/rmdir/rmdir.h
+++ b/sources/c/program/kevux/tools/remove/rmdir/rmdir.h
@@ -21,46 +21,6 @@ extern "C" {
 #endif
 
 /**
- * Perform rmdir program remove operation.
- *
- * This prints error messages as appropriate.
- *
- * @param main
- *   The main program and settings data.
- *
- *   The setting.flag has kt_remove_flag_option_used_d forcibly cleared on the start of this function.
- *
- *   Must not be NULL.
- *
- *   This alters setting.status:
- *     Success from: kt_remove_operate_remove().
- *
- *     F_no (with error bit) on failure and file is not to be removed or cannot be removed.
- *
- *     Errors (with error bit) from: kt_remove_operate_remove().
- *
- *     F_parameter (with error bit) on parameter error.
- * @param path
- *   The file being processed.
- * @param flag_operate
- *   The operate file specific flags from kt_remove_flag_file_operate_*_e.
- *
- * @return
- *   Success from: kt_remove_operate_remove().
- *
- *   F_no (with error bit) on failure and file is not to be removed or cannot be removed.
- *
- *   Errors (with error bit) from: kt_remove_operate_remove().
- *
- *   F_parameter (with error bit) on parameter error.
- *
- * @see kt_remove_operate_remove()
- */
-#ifndef _di_kt_remove_rmdir_operate_remove_
-  extern f_status_t kt_remove_rmdir_operate_remove(kt_remove_main_t * const main, const f_string_static_t path, const uint32_t flag_operate);
-#endif // _di_kt_remove_rmdir_operate_remove_
-
-/**
  * Perform the rmdir program setting load process.
  *
  * This prints error messages as appropriate.

diff --git a/sources/c/program/kevux/tools/remove/unlink/main.c b/sources/c/program/kevux/tools/remove/unlink/main.c
index a42166e8d54df5178a77e3a3e10ea1f109869934..81e9bd229183023ad11204e09439f29c2bace82d 100644 (file)
--- a/sources/c/program/kevux/tools/remove/unlink/main.c
+++ b/sources/c/program/kevux/tools/remove/unlink/main.c
@@ -25,8 +25,6 @@ int main(const int argc, const f_string_t *argv, const f_string_t *envp) {
   data.setting.program_name_long = &kt_remove_program_name_long_s;
 
   data.call.print_help = &kt_remove_unlink_print_message_help;
-  data.call.process_normal = &kt_remove_normal_operate;
-  data.call.process_remove = &kt_remove_unlink_operate_remove;
 
   #ifdef _en_kt_default_to_utc_
     data.setting.flag |= kt_remove_flag_utc_d;

diff --git a/sources/c/program/kevux/tools/remove/unlink/print.c b/sources/c/program/kevux/tools/remove/unlink/print.c
index 852c5dc1ec4f020886f8162b3649b4552d0efc7d..c409ee70e83f432b2174f7950414e75cca1f73e4 100644 (file)
--- a/sources/c/program/kevux/tools/remove/unlink/print.c
+++ b/sources/c/program/kevux/tools/remove/unlink/print.c
@@ -4,24 +4,6 @@
 extern "C" {
 #endif
 
-#ifndef _di_kt_remove_unlink_print_error_link_not_
-  f_status_t kt_remove_unlink_print_error_link_not(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;
-
-    f_file_stream_lock(print->to);
-
-    fl_print_format("%[%QCannot unlink '%]", print->to, print->set->error, print->prefix, print->set->error);
-    fl_print_format("%[%Q%]", print->to, print->set->notable, path, print->set->notable);
-    fl_print_format("%[', file is not a link.%]%r", print->to, print->set->error, print->set->error, f_string_eol_s);
-
-    f_file_stream_unlock(print->to);
-
-    return F_okay;
-  }
-#endif // _di_kt_remove_unlink_print_error_link_not_
-
 #ifndef _di_kt_remove_unlink_print_message_help_
   f_status_t kt_remove_unlink_print_message_help(fl_print_t * const print, const f_color_context_t context) {
 

diff --git a/sources/c/program/kevux/tools/remove/unlink/print.h b/sources/c/program/kevux/tools/remove/unlink/print.h
index f50767a37f7e8840aef7de9ce0662958bf06ff01..52aed4d434b55ec8a685061e0f72d58a16015806 100644 (file)
--- a/sources/c/program/kevux/tools/remove/unlink/print.h
+++ b/sources/c/program/kevux/tools/remove/unlink/print.h
@@ -17,30 +17,6 @@ extern "C" {
 #endif
 
 /**
- * Print error message about not being able to delete a file because that file is not a link.
- *
- * @param print
- *   The output structure to print to.
- *
- *   Must not be NULL.
- *
- *   This does not alter print.custom.setting.state.status.
- * @param path
- *   The file that cannot be deleted.
- *
- * @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 fll_error_print()
- */
-#ifndef _di_kt_remove_unlink_print_error_link_not_
-  extern f_status_t kt_remove_unlink_print_error_link_not(fl_print_t * const print, const f_string_static_t path);
-#endif // _di_kt_remove_unlink_print_error_link_not_
-
-/**
  * Print help.
  *
  * @param print

diff --git a/sources/c/program/kevux/tools/remove/unlink/unlink.c b/sources/c/program/kevux/tools/remove/unlink/unlink.c
index 393fec52788d49ea03651a744e6600ceaeed1894..05765c63c72661e3ec09217e974fde94854b26b0 100644 (file)
--- a/sources/c/program/kevux/tools/remove/unlink/unlink.c
+++ b/sources/c/program/kevux/tools/remove/unlink/unlink.c
@@ -4,23 +4,6 @@
 extern "C" {
 #endif
 
-#ifndef _di_kt_remove_unlink_operate_remove_
-  f_status_t kt_remove_unlink_operate_remove(kt_remove_main_t * const main, const f_string_static_t path, const uint32_t flag_operate) {
-
-    if (!main) return F_status_set_error(F_parameter);
-
-    if (!flag_operate) return F_status_set_error(F_parameter);
-
-    if (flag_operate & kt_remove_flag_file_operate_link_d) {
-      return kt_remove_operate_remove(main, path, flag_operate);
-    }
-
-    kt_remove_unlink_print_error_link_not(&main->program.error, path);
-
-    return F_status_set_error(F_no);
-  }
-#endif // _di_kt_remove_unlink_operate_remove_
-
 #ifndef _di_kt_remove_unlink_setting_load_
   void kt_remove_unlink_setting_load(const f_console_arguments_t arguments, kt_remove_main_t * const main) {
 
@@ -62,7 +45,7 @@ extern "C" {
     }
 
     // Make sure only links are deleted.
-    main->setting.flag |= kt_remove_main_flag_link_d | kt_remove_main_flag_option_used_d;
+    main->setting.flag |= kt_remove_main_flag_link_d | kt_remove_main_flag_option_type_d | kt_remove_main_flag_option_used_d;
   }
 #endif // _di_kt_remove_unlink_setting_load_
 

diff --git a/sources/c/program/kevux/tools/remove/unlink/unlink.h b/sources/c/program/kevux/tools/remove/unlink/unlink.h
index 9af748345e98f2a656828179c1fab654d14a39a5..7b1219038b3d31028239a77a8a17d017d4c30259 100644 (file)
--- a/sources/c/program/kevux/tools/remove/unlink/unlink.h
+++ b/sources/c/program/kevux/tools/remove/unlink/unlink.h
@@ -21,46 +21,6 @@ extern "C" {
 #endif
 
 /**
- * Perform unlink program remove operation.
- *
- * This prints error messages as appropriate.
- *
- * @param main
- *   The main program and settings data.
- *
- *   The setting.flag has kt_remove_flag_option_used_d forcibly cleared on the start of this function.
- *
- *   Must not be NULL.
- *
- *   This alters setting.status:
- *     Success from: kt_remove_operate_remove().
- *
- *     F_no (with error bit) on failure and file is not to be removed or cannot be removed.
- *
- *     Errors (with error bit) from: kt_remove_operate_remove().
- *
- *     F_parameter (with error bit) on parameter error.
- * @param path
- *   The file being processed.
- * @param flag_operate
- *   The operate file specific flags from kt_remove_flag_file_operate_*_e.
- *
- * @return
- *   Success from: kt_remove_operate_remove().
- *
- *   F_no (with error bit) on failure and file is not to be removed or cannot be removed.
- *
- *   Errors (with error bit) from: kt_remove_operate_remove().
- *
- *   F_parameter (with error bit) on parameter error.
- *
- * @see kt_remove_operate_remove()
- */
-#ifndef _di_kt_remove_unlink_operate_remove_
-  extern f_status_t kt_remove_unlink_operate_remove(kt_remove_main_t * const main, const f_string_static_t path, const uint32_t flag_operate);
-#endif // _di_kt_remove_unlink_operate_remove_
-
-/**
  * Perform the unlink program setting load process.
  *
  * This prints error messages as appropriate.

diff --git a/tests/unit/remove/c/main-test-remove.c b/tests/unit/remove/c/main-test-remove.c
index 66bcd745e660d38ed8cc2b5796a630fc3726be67..ad36ce54b8ba2dc0864a0517dabc50338bb79096 100644 (file)
--- a/tests/unit/remove/c/main-test-remove.c
+++ b/tests/unit/remove/c/main-test-remove.c
@@ -24,7 +24,6 @@ int main_test__remove(const int argc, const f_string_t *argv, const f_string_t *
   data.setting.program_name_long = &kt_remove_program_name_long_s;
 
   data.call.print_help = &kt_remove_print_message_help;
-  data.call.process_normal = &kt_remove_process_normal_operate;
 
   #ifdef _en_kt_default_to_utc_
     data.setting.flag |= kt_remove_flag_utc_d;