Fix the `--force` flag, which essentially means that it must ignore missing files.
Update the help documentation regarding this.
The file stat printing function is very redundant and should be combined into the simulate function.
I noticed that the date based pre-processing is only in the printing and is not yet toggling the flags.
Begin moving this over.
I decided to make a separate function to handle this given its size.
Reset the `!(^)` check back to a `==`.
The compiler should be able to determine the most efficient operation and using plain `==` is just more readable.
Add some additional help messages describing how the `<` and `>` characters must be quoted to prevent them being used as redirect characters.
Is `stop_year` not being used when it should be?
Plan on investigating this.
Be more consistent with the parameter handling strings in the program unit tests.
Add the unit tests for `--force`.
build_sources_program test-remove.c
build_sources_program test-remove-print_help.c test-remove-print_version.c
build_sources_program test-remove-file_mode.c test-remove-file_type.c
+build_sources_program test-remove-force.c
build_sources_program test-remove-group.c
build_sources_program test-remove-directory_no_args.c test-remove-directory_recurse_simple.c test-remove-directory_tree_simple.c
build_sources_program test-remove-regular_no_args.c
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)) {
- remove_print_warning_file_reason(&main->program.warning, path, kt_remove_print_reason_not_found_s);
+
+ if (main->setting.flag & kt_remove_main_flag_force_d) {
+ kt_remove_print_simulate_operate_boolean(&main->program.output, kt_remove_force_s, F_true);
+ }
+ else {
+ if (!(main->setting.flag & kt_remove_main_flag_simulate_d)) {
+ remove_print_warning_file_reason(&main->program.warning, path, kt_remove_print_reason_not_found_s);
+ }
}
return 0;
f_number_unsigned_t i = 0;
+ // @todo move all file stat print commands inside this.
struct stat statistics;
memset(&statistics, 0, sizeof(struct stat));
if (main->setting.modes.array[i].mode ^ mode) break;
}
else if (main->setting.modes.array[i].type == kt_remove_flag_mode_same_d) {
- if (!(main->setting.modes.array[i].mode ^ mode)) break;
+ if (main->setting.modes.array[i].mode == mode) break;
}
else if (main->setting.modes.array[i].type == kt_remove_flag_mode_similar_d) {
if (main->setting.modes.array[i].mode & mode) break;
}
}
+ kt_remove_preprocess_file_dates(main, path, flag_operate, statistics, &flag_out);
+ if (F_status_is_error(main->setting.state.status)) return flag_out;
+
if (flag_out & kt_remove_flag_file_operate_directory_d) {
flag_out |= kt_remove_flag_file_operate_recurse_d;
kt_remove_operate_memory_check(main, path, &flag_out);
if (F_status_is_error(main->setting.state.status)) return flag_out;
- if (main->setting.flag & kt_remove_main_flag_force_d) {
- kt_remove_print_simulate_operate_boolean(&main->program.output, kt_remove_force_s, F_true);
-
- flag_out |= kt_remove_flag_file_operate_remove_d;
- }
-
if (flag_out & kt_remove_flag_file_operate_directory_d) {
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));
}
}
#endif // _di_kt_remove_preprocess_file_recurse_action_
+#ifndef _di_kt_remove_preprocess_file_dates_
+ void kt_remove_preprocess_file_dates(kt_remove_main_t * const main, const f_string_static_t path, const uint16_t flag_operate, const struct stat statistics, uint16_t * const flag_out) {
+
+ if (!main) return;
+
+ if (!flag_out) {
+ main->setting.state.status = F_status_set_error(F_parameter);
+
+ return;
+ }
+
+ // @todo this is copied from the print function and needs to be updated.
+ f_number_unsigned_t i = 0;
+ f_number_unsigned_t j = 0;
+
+ kt_remove_dates_t * const dates[] = {
+ &main->setting.accessed,
+ &main->setting.changed,
+ &main->setting.updated,
+ };
+
+ f_time_spec_t times[] = {
+ statistics.st_atim,
+ statistics.st_ctim,
+ statistics.st_mtim,
+ };
+
+ const f_string_static_t * const names[] = {
+ &kt_remove_long_accessed_s,
+ &kt_remove_long_changed_s,
+ &kt_remove_long_updated_s,
+ };
+
+ f_status_t result = F_okay;
+ f_string_static_t name_type = f_string_empty_s;
+ f_number_unsigned_t match_year = 0;
+ f_number_unsigned_t match_second = 0;
+ f_number_unsigned_t start_year = 0;
+ f_number_unsigned_t start_second = 0;
+ //f_number_unsigned_t stop_year = 0;
+ f_number_unsigned_t stop_second = 0;
+
+ for (j = 0; j < 3; ++j) {
+
+ for (i = 0; i < dates[j]->used; ++i) {
+
+ if (kt_remove_signal_check(main)) return;
+
+ match_year = kt_remove_time_year_unix_epoch_d + (times[j].tv_sec / kt_remove_time_seconds_in_year_d);
+ match_second = times[j].tv_sec % kt_remove_time_seconds_in_year_d;
+
+ start_year = dates[j]->array[i].start_year + (dates[j]->array[i].start_second / kt_remove_time_seconds_in_year_d);
+ start_second = dates[j]->array[i].start_second % kt_remove_time_seconds_in_year_d;
+
+ name_type = f_string_empty_s;
+ result = F_okay;
+
+ if (dates[j]->array[i].type == kt_remove_flag_date_today_d || dates[j]->array[i].type == kt_remove_flag_date_tomorrow_d || dates[j]->array[i].type == kt_remove_flag_date_yesterday_d) {
+ //stop_year = dates[j]->array[i].stop_year + (dates[j]->array[i].stop_second / kt_remove_time_seconds_in_year_d);
+ stop_second = dates[j]->array[i].stop_second % kt_remove_time_seconds_in_year_d;
+
+ if (dates[j]->array[i].operation == kt_remove_flag_date_equal_d) {
+ name_type = kt_remove_date_symbol_equal_s;
+ result = F_false;
+
+ if (match_year == start_year) {
+ if (match_second > start_second && match_second < stop_second) {
+ result = F_true;
+ }
+ else if (match_second == start_second && times[j].tv_nsec >= dates[j]->array[i].start_nanosecond && times[j].tv_nsec < dates[j]->array[i].stop_nanosecond) {
+ result = F_true;
+ }
+ }
+ }
+ else if (dates[j]->array[i].operation == kt_remove_flag_date_less_d) {
+ name_type = kt_remove_date_symbol_less_s;
+ result = F_false;
+
+ if (match_year < start_year) {
+ result = F_true;
+ }
+ else if (match_year == start_year) {
+ if (match_second < start_second) {
+ result = F_true;
+ }
+ else if (match_second == start_second && times[j].tv_nsec < dates[j]->array[i].start_nanosecond) {
+ result = F_true;
+ }
+ }
+ }
+ else if (dates[j]->array[i].operation == kt_remove_flag_date_less_equal_d) {
+ name_type = kt_remove_date_symbol_less_equal_s;
+ result = F_false;
+
+ if (match_year < start_year) {
+ result = F_true;
+ }
+ else if (match_year == start_year) {
+ if (match_second < stop_second) {
+ result = F_true;
+ }
+ else if (match_second == stop_second && times[j].tv_nsec < dates[j]->array[i].stop_nanosecond) {
+ result = F_true;
+ }
+ }
+ }
+ else if (dates[j]->array[i].operation == kt_remove_flag_date_more_d) {
+ name_type = kt_remove_date_symbol_more_s;
+ result = F_false;
+
+ if (match_year > start_year) {
+ result = F_true;
+ }
+ else if (match_year == start_year) {
+ if (match_second > stop_second) {
+ result = F_true;
+ }
+ else if (match_second == stop_second && times[j].tv_nsec >= dates[j]->array[i].stop_nanosecond) {
+ result = F_true;
+ }
+ }
+ }
+ else if (dates[j]->array[i].operation == kt_remove_flag_date_more_equal_d) {
+ name_type = kt_remove_date_symbol_more_equal_s;
+ result = F_false;
+
+ if (match_year > start_year) {
+ result = F_true;
+ }
+ else if (match_year == start_year) {
+ if (match_second > start_second) {
+ result = F_true;
+ }
+ else if (match_second == start_second && times[j].tv_nsec >= dates[j]->array[i].start_nanosecond) {
+ result = F_true;
+ }
+ }
+ }
+ else if (dates[j]->array[i].operation == kt_remove_flag_date_not_d) {
+ name_type = kt_remove_date_symbol_not_s;
+ result = F_true;
+
+ if (match_year == start_year) {
+ if (match_second > start_second && match_second < stop_second) {
+ result = F_false;
+ }
+ else if (match_second == start_second && times[j].tv_nsec >= dates[j]->array[i].start_nanosecond && times[j].tv_nsec < dates[j]->array[i].stop_nanosecond) {
+ result = F_false;
+ }
+ }
+ }
+ }
+ else if (dates[j]->array[i].operation == kt_remove_flag_date_equal_d) {
+ name_type = kt_remove_date_symbol_equal_s;
+
+ if (match_year == start_year && match_second == start_second && times[j].tv_nsec == dates[j]->array[i].start_nanosecond) {
+ result = F_true;
+ }
+ else {
+ result = F_false;
+ }
+ }
+ else if (dates[j]->array[i].operation == kt_remove_flag_date_less_d) {
+ name_type = kt_remove_date_symbol_less_s;
+ result = F_false;
+
+ if (match_year < start_year) {
+ result = F_true;
+ }
+ else if (match_year == start_year) {
+ if (match_second < start_second) {
+ result = F_true;
+ }
+ else if (match_second == start_second && times[j].tv_nsec < dates[j]->array[i].start_nanosecond) {
+ result = F_true;
+ }
+ }
+ }
+ else if (dates[j]->array[i].operation == kt_remove_flag_date_less_equal_d) {
+ name_type = kt_remove_date_symbol_less_equal_s;
+ result = F_false;
+
+ if (match_year < start_year) {
+ result = F_true;
+ }
+ else if (match_year == start_year) {
+ if (match_second < start_second) {
+ result = F_true;
+ }
+ else if (match_second == start_second && times[j].tv_nsec <= dates[j]->array[i].start_nanosecond) {
+ result = F_true;
+ }
+ }
+ }
+ else if (dates[j]->array[i].operation == kt_remove_flag_date_more_d) {
+ name_type = kt_remove_date_symbol_more_s;
+ result = F_false;
+
+ if (match_year > start_year) {
+ result = F_true;
+ }
+ else if (match_year == start_year) {
+ if (match_second > start_second) {
+ result = F_true;
+ }
+ else if (match_second == start_second && times[j].tv_nsec > dates[j]->array[i].start_nanosecond) {
+ result = F_true;
+ }
+ }
+ }
+ else if (dates[j]->array[i].operation == kt_remove_flag_date_more_equal_d) {
+ name_type = kt_remove_date_symbol_more_equal_s;
+ result = F_false;
+
+ if (match_year > start_year) {
+ result = F_true;
+ }
+ else if (match_year == start_year) {
+ if (match_second > start_second) {
+ result = F_true;
+ }
+ else if (match_second == start_second && times[j].tv_nsec >= dates[j]->array[i].start_nanosecond) {
+ result = F_true;
+ }
+ }
+ }
+ else if (dates[j]->array[i].operation == kt_remove_flag_date_not_d) {
+ name_type = kt_remove_date_symbol_not_s;
+
+ if (match_year != start_year || match_second != start_second || times[j].tv_nsec != dates[j]->array[i].start_nanosecond) {
+ result = F_true;
+ }
+ else {
+ result = F_false;
+ }
+ }
+
+ if (name_type.used) {
+ // @todo this should set the flag_out
+ //fll_print_format(" %Q %Q ", print->to, *names[j], result ? kt_remove_yes_s : kt_remove_no_s);
+ //fll_print_format("%u::%un 0:%un %Q ", print->to, match_year, (f_number_unsigned_t) times[j].tv_sec, (f_number_unsigned_t) times[j].tv_nsec, name_type);
+ //fll_print_format("%u::%un 0:%un%r", print->to, dates[j]->array[i].start_year, dates[j]->array[i].start_second, dates[j]->array[i].start_nanosecond, f_string_eol_s);
+
+ break;
+ }
+ } // for
+ } // for
+ }
+#endif // _di_kt_remove_preprocess_file_dates_
+
#ifdef __cplusplus
} // extern "C"
#endif
* F_okay on success.
* F_data_not on success but file is an empty string.
*
- * Errors (with error bit) from: f_file_link_read().
- * Errors (with error bit) from: f_file_remove().
+ * Errors (with error bit) from: f_directory_empty().
+ * Errors (with error bit) from: f_file_exists().
+ * Errors (with error bit) from: f_file_is().
+ * Errors (with error bit) from: f_file_stat().
+ * Errors (with error bit) from: kt_remove_preprocess_file_dates().
* @param path
* The path to the file to operate on.
* @param flag_operate
* @return
* The resulting flags determined by the pre-process.
*
- * @see f_file_link_read()
- * @see f_file_remove()
+ * @see f_directory_empty()
+ * @see f_file_exists()
+ * @see f_file_is()
+ * @see f_file_stat()
+ * @see kt_remove_preprocess_file_dates()
*/
#ifndef _di_kt_remove_preprocess_file_
extern uint16_t kt_remove_preprocess_file(kt_remove_main_t * const main, const f_string_static_t path, const uint16_t flag_operate);
* Errors (with error bit) from: fl_directory_do()
*
* @see f_directory_recurse_do_delete()
- * @see f_file_remove()
* @see fl_directory_do()
*/
#ifndef _di_kt_remove_preprocess_file_recurse_
extern void kt_remove_preprocess_file_recurse_action(f_directory_recurse_do_t * const recurse, const f_string_static_t name, const uint32_t flag);
#endif // _di_kt_remove_preprocess_file_recurse_action_
+/**
+ * Perform pre-processing (including simulation) of the file operation, specifically handling dates.
+ *
+ * @param main
+ * The main program and settings data.
+ *
+ * Must not be NULL.
+ *
+ * This alters main.setting.state.status:
+ * F_okay on success.
+ * F_data_not on success but file is an empty string.
+ * @param path
+ * The path to the file to operate on.
+ * @param flag_operate
+ * The operate file specific flags from kt_remove_flag_file_operate_*_e.
+ * @param statistics
+ * The already loaded file statistics.
+ * @param flag_out
+ * The resulting flags determined by the pre-process.
+ *
+ * Must not be NULL.
+ *
+ * @return
+ * The resulting flags determined by the pre-process.
+ */
+#ifndef _di_kt_remove_preprocess_file_dates_
+ void kt_remove_preprocess_file_dates(kt_remove_main_t * const main, const f_string_static_t path, const uint16_t flag_operate, const struct stat statistics, uint16_t * const flag_out);
+#endif // _di_kt_remove_preprocess_file_dates_
+
#ifdef __cplusplus
} // extern "C"
#endif
fll_program_print_help_option(print, kt_remove_short_empty_s, kt_remove_long_empty_s, f_console_symbol_short_normal_s, f_console_symbol_long_normal_s, " Remove directory by a specific empty or not empty state.");
fll_program_print_help_option(print, kt_remove_short_fifo_s, kt_remove_long_fifo_s, f_console_symbol_short_normal_s, f_console_symbol_long_normal_s, " Remove by file type of FIFO.");
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_force_s, kt_remove_long_force_s, f_console_symbol_short_normal_s, f_console_symbol_long_normal_s, " Ignore non-existent files and never prompt.");
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_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.");
fl_print_format(" - '%[%r%]'", print->to, context.set.notable, kt_remove_date_symbol_not_s, context.set.notable);
fl_print_format(" or '%[%r%]': Date match using a not equal to operation.%r%r", print->to, context.set.notable, kt_remove_date_word_not_s, context.set.notable, f_string_eol_s, f_string_eol_s);
+ fl_print_format(" Parameters with the '%[%r%]' and ", print->to, context.set.notable, kt_remove_date_symbol_less_s, context.set.notable);
+ fl_print_format("'%[%r%]'", print->to, context.set.notable, kt_remove_date_symbol_more_s, context.set.notable);
+ fl_print_format(" characters will need to be quoted to prevent unintended redirecting.%r%r", print->to, f_string_eol_s, f_string_eol_s);
+
fl_print_format(" When the second value to the date related parameters must be a date.%r%r", print->to, f_string_eol_s, f_string_eol_s);
fl_print_format(" Valid dates for the date related parameters must be any of the following:%r", print->to, f_string_eol_s);
f_number_unsigned_t match_second = 0;
f_number_unsigned_t start_year = 0;
f_number_unsigned_t start_second = 0;
- f_number_unsigned_t stop_year = 0;
+ //f_number_unsigned_t stop_year = 0; // @todo figure out if stop year is needed, the check below may not end up be being processed.
f_number_unsigned_t stop_second = 0;
for (j = 0; j < 3; ++j) {
result = F_okay;
if (dates[j]->array[i].type == kt_remove_flag_date_today_d || dates[j]->array[i].type == kt_remove_flag_date_tomorrow_d || dates[j]->array[i].type == kt_remove_flag_date_yesterday_d) {
- stop_year = dates[j]->array[i].stop_year + (dates[j]->array[i].stop_second / kt_remove_time_seconds_in_year_d);
+ //stop_year = dates[j]->array[i].stop_year + (dates[j]->array[i].stop_second / kt_remove_time_seconds_in_year_d);
stop_second = dates[j]->array[i].stop_second % kt_remove_time_seconds_in_year_d;
if (dates[j]->array[i].operation == kt_remove_flag_date_equal_d) {
}
{
- const f_string_t argv[] = { "mocked_main", file.string, "+V", 0 };
+ const f_string_t argv[] = { "mocked_main", file.string, "+" F_console_standard_short_verbose_s, 0 };
memset(&statistics, 0, sizeof(struct stat));
statistics.st_mode = F_file_mode_all_d | F_file_type_directory_d; // Should result in kt_remove_flag_file_operate_remove_d.
}
{
- const f_string_t argv[] = { "mocked_main", file.string, "+D", 0 };
+ const f_string_t argv[] = { "mocked_main", file.string, "+" F_console_standard_short_debug_s, 0 };
memset(&statistics, 0, sizeof(struct stat));
statistics.st_mode = F_file_mode_all_d | F_file_type_directory_d; // Should result in kt_remove_flag_file_operate_remove_d.
}
{
- const f_string_t argv[] = { "mocked_main", file.string, "+V", 0 };
+ const f_string_t argv[] = { "mocked_main", file.string, "+" F_console_standard_short_verbose_s, 0 };
memset(&statistics, 0, sizeof(struct stat));
statistics.st_mode = F_file_mode_all_d | F_file_type_directory_d; // Should result in kt_remove_flag_file_operate_remove_d.
}
{
- const f_string_t argv[] = { "mocked_main", file.string, "+D", 0 };
+ const f_string_t argv[] = { "mocked_main", file.string, "+" F_console_standard_short_debug_s, 0 };
memset(&statistics, 0, sizeof(struct stat));
statistics.st_mode = F_file_mode_all_d | F_file_type_directory_d; // Should result in kt_remove_flag_file_operate_remove_d.
}
{
- const f_string_t argv[] = { "mocked_main", file.string, "+V", 0 };
+ const f_string_t argv[] = { "mocked_main", file.string, "+" F_console_standard_short_verbose_s, 0 };
will_return(__wrap_f_file_exists, F_false);
}
{
- const f_string_t argv[] = { "mocked_main", file.string, "+D", 0 };
+ const f_string_t argv[] = { "mocked_main", file.string, "+" F_console_standard_short_debug_s, 0 };
will_return(__wrap_f_file_exists, F_false);
}
{
- const f_string_t argv[] = { "mocked_main", file.string, "+V", 0 };
+ const f_string_t argv[] = { "mocked_main", file.string, "+" F_console_standard_short_verbose_s, 0 };
memset(&statistics, 0, sizeof(struct stat));
statistics.st_mode = F_file_mode_all_d | F_file_type_directory_d; // Should result in kt_remove_flag_file_operate_remove_d.
}
{
- const f_string_t argv[] = { "mocked_main", file.string, "+D", 0 };
+ const f_string_t argv[] = { "mocked_main", file.string, "+" F_console_standard_short_debug_s, 0 };
memset(&statistics, 0, sizeof(struct stat));
statistics.st_mode = F_file_mode_all_d | F_file_type_directory_d; // Should result in kt_remove_flag_file_operate_remove_d.
}
{
- const f_string_t argv[] = { "mocked_main", file.string, "+V", 0 };
+ const f_string_t argv[] = { "mocked_main", file.string, "+" F_console_standard_short_verbose_s, 0 };
memset(&statistics, 0, sizeof(struct stat));
statistics.st_mode = F_file_mode_all_d | F_file_type_directory_d; // Should result in kt_remove_flag_file_operate_remove_d.
}
{
- const f_string_t argv[] = { "mocked_main", file.string, "+D", 0 };
+ const f_string_t argv[] = { "mocked_main", file.string, "+" F_console_standard_short_debug_s, 0 };
memset(&statistics, 0, sizeof(struct stat));
statistics.st_mode = F_file_mode_all_d | F_file_type_directory_d; // Should result in kt_remove_flag_file_operate_remove_d.
}
{
- const f_string_t argv[] = { "mocked_main", file.string, "also/remove", "+V", 0 };
+ const f_string_t argv[] = { "mocked_main", file.string, "also/remove", "+" F_console_standard_short_verbose_s, 0 };
memset(&statistics, 0, sizeof(struct stat));
statistics.st_mode = F_file_mode_all_d | F_file_type_directory_d; // Should result in kt_remove_flag_file_operate_remove_d.
}
{
- const f_string_t argv[] = { "mocked_main", file.string, "also/remove", "+D", 0 };
+ const f_string_t argv[] = { "mocked_main", file.string, "also/remove", "+" F_console_standard_short_debug_s, 0 };
memset(&statistics, 0, sizeof(struct stat));
statistics.st_mode = F_file_mode_all_d | F_file_type_directory_d; // Should result in kt_remove_flag_file_operate_remove_d.
}
{
- const f_string_t argv[] = { "mocked_main", file.string, "also/remove", "+V", 0 };
+ const f_string_t argv[] = { "mocked_main", file.string, "also/remove", "+" F_console_standard_short_verbose_s, 0 };
memset(&statistics, 0, sizeof(struct stat));
statistics.st_mode = F_file_mode_all_d | F_file_type_directory_d; // Should result in kt_remove_flag_file_operate_remove_d.
}
{
- const f_string_t argv[] = { "mocked_main", file.string, "also/remove", "+D", 0 };
+ const f_string_t argv[] = { "mocked_main", file.string, "also/remove", "+" F_console_standard_short_debug_s, 0 };
memset(&statistics, 0, sizeof(struct stat));
statistics.st_mode = F_file_mode_all_d | F_file_type_directory_d; // Should result in kt_remove_flag_file_operate_remove_d.
}
{
- const f_string_t argv[] = { "mocked_main", file.string, "also/remove", "+V", 0 };
+ const f_string_t argv[] = { "mocked_main", file.string, "also/remove", "+" F_console_standard_short_verbose_s, 0 };
memset(&statistics, 0, sizeof(struct stat));
statistics.st_mode = F_file_mode_all_d | F_file_type_directory_d; // Should result in kt_remove_flag_file_operate_remove_d.
}
{
- const f_string_t argv[] = { "mocked_main", file.string, "also/remove", "+D", 0 };
+ const f_string_t argv[] = { "mocked_main", file.string, "also/remove", "+" F_console_standard_short_debug_s, 0 };
memset(&statistics, 0, sizeof(struct stat));
statistics.st_mode = F_file_mode_all_d | F_file_type_directory_d; // Should result in kt_remove_flag_file_operate_remove_d.
}
{
- const f_string_t argv[] = { "mocked_main", file.string, "also/remove", "+V", 0 };
+ const f_string_t argv[] = { "mocked_main", file.string, "also/remove", "+" F_console_standard_short_verbose_s, 0 };
will_return(__wrap_f_file_exists, F_false);
will_return(__wrap_f_file_exists, F_false);
}
{
- const f_string_t argv[] = { "mocked_main", file.string, "also/remove", "+D", 0 };
+ const f_string_t argv[] = { "mocked_main", file.string, "also/remove", "+" F_console_standard_short_debug_s, 0 };
will_return(__wrap_f_file_exists, F_false);
will_return(__wrap_f_file_exists, F_false);
struct stat stat_regular;
{
- const f_string_t argv[] = { "mocked_main", target.string, "-r", 0 };
+ const f_string_t argv[] = { "mocked_main", target.string, "-" KT_REMOVE_short_recurse_s, 0 };
memset(&stat_directory, 0, sizeof(struct stat));
memset(&stat_regular, 0, sizeof(struct stat));
struct stat stat_regular;
{
- const f_string_t argv[] = { "mocked_main", target.string, "-r", 0 };
+ const f_string_t argv[] = { "mocked_main", target.string, "-" KT_REMOVE_short_recurse_s, 0 };
memset(&stat_directory, 0, sizeof(struct stat));
memset(&stat_regular, 0, sizeof(struct stat));
struct stat stat_regular;
{
- const f_string_t argv[] = { "mocked_main", target.string, "-r", 0 };
+ const f_string_t argv[] = { "mocked_main", target.string, "-" KT_REMOVE_short_recurse_s, 0 };
memset(&stat_directory, 0, sizeof(struct stat));
memset(&stat_regular, 0, sizeof(struct stat));
struct stat stat_regular;
{
- const f_string_t argv[] = { "mocked_main", target.string, "-r", 0 };
+ const f_string_t argv[] = { "mocked_main", target.string, "-" KT_REMOVE_short_recurse_s, 0 };
memset(&stat_directory, 0, sizeof(struct stat));
memset(&stat_regular, 0, sizeof(struct stat));
--- /dev/null
+#include "test-remove.h"
+#include "test-remove-force.h"
+
+#include <program/kevux/tools/remove/remove/main.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void test__kt_remove__force__works(void **state) {
+
+ mock_unwrap = 0;
+
+ const f_string_static_t target = macro_f_string_static_t_initialize_1("to_remove", 0, 9);
+
+ const uint8_t total = 8;
+
+ struct stat stats[total];
+
+ memset(stats, 0, sizeof(struct stat) * total);
+
+ stats[0].st_mode = F_file_mode_all_d | F_file_type_block_d;
+ stats[1].st_mode = F_file_mode_all_d | F_file_type_character_d;
+ stats[2].st_mode = F_file_mode_all_d | F_file_type_directory_d;
+ stats[3].st_mode = F_file_mode_all_d | F_file_type_fifo_d;
+ stats[4].st_mode = F_file_mode_all_d | F_file_type_link_d;
+ stats[5].st_mode = F_file_mode_all_d | F_file_type_regular_d;
+ stats[6].st_mode = F_file_mode_all_d | F_file_type_socket_d;
+ stats[7].st_mode = F_file_mode_all_d & ~S_IFMT;
+
+ const f_string_t types[] = {
+ "-" KT_REMOVE_short_block_s,
+ "-" KT_REMOVE_short_character_s,
+ "-" KT_REMOVE_short_directory_s,
+ "-" KT_REMOVE_short_fifo_s,
+ "-" KT_REMOVE_short_link_s,
+ "-" KT_REMOVE_short_regular_s,
+ "-" KT_REMOVE_short_socket_s,
+ "--" KT_REMOVE_long_unknown_s,
+ };
+
+ {
+ uint8_t i = 0;
+ uint8_t type = 0;
+
+ for (; i < total; ++i) {
+
+ for (type = 0; type < total; ++type) {
+
+ const f_string_t argv[] = { "mocked_main", target.string, types[type], 0 };
+
+ // Pre-process file.
+ will_return(__wrap_f_file_exists, F_false);
+
+ const int result = kt_main_test__remove(3, argv, 0);
+
+ assert_int_equal(result, 0);
+ } // for
+ } // for
+ }
+}
+
+#ifdef __cplusplus
+} // extern "C"
+#endif
--- /dev/null
+/**
+ * Kevux Tools - Remove
+ *
+ * Project: Kevux Tools
+ * API Version: 0.5
+ * Licenses: lgpl-2.1-or-later
+ *
+ * Test the remove.
+ */
+#ifndef _TEST__KT_remove__force
+#define _TEST__KT_remove__force
+
+/**
+ * Test that the remove works when the --force parameter is passed.
+ */
+extern void test__kt_remove__force__works(void **state);
+
+#endif // _TEST__KT_remove__force
mock_unwrap = 0;
{
- const f_string_t argv[] = { "mocked_main", "--help", 0 };
+ const f_string_t argv[] = { "mocked_main", "--" F_console_standard_long_help_s, 0 };
mock_status = F_okay;
}
{
- const f_string_t argv[] = { "mocked_main", "-h", 0 };
+ const f_string_t argv[] = { "mocked_main", "-" F_console_standard_short_help_s, 0 };
mock_status = F_okay;
mock_unwrap = 0;
{
- const f_string_t argv[] = { "mocked_main", "++version", 0 };
+ const f_string_t argv[] = { "mocked_main", "++" F_console_standard_long_version_s, 0 };
mock_status = F_okay;
}
{
- const f_string_t argv[] = { "mocked_main", "+v", 0 };
+ const f_string_t argv[] = { "mocked_main", "+" F_console_standard_short_version_s, 0 };
mock_status = F_okay;
}
{
- const f_string_t argv[] = { "mocked_main", "to_remove", "+V", 0 };
+ const f_string_t argv[] = { "mocked_main", "to_remove", "+" F_console_standard_short_verbose_s, 0 };
memset(&statistics, 0, sizeof(struct stat));
statistics.st_mode = F_file_mode_all_d | F_file_type_regular_d; // Should result in kt_remove_flag_file_operate_remove_d.
}
{
- const f_string_t argv[] = { "mocked_main", "to_remove", "+D", 0 };
+ const f_string_t argv[] = { "mocked_main", "to_remove", "+" F_console_standard_short_debug_s, 0 };
memset(&statistics, 0, sizeof(struct stat));
statistics.st_mode = F_file_mode_all_d | F_file_type_regular_d; // Should result in kt_remove_flag_file_operate_remove_d.
}
{
- const f_string_t argv[] = { "mocked_main", "to_remove", "+V", 0 };
+ const f_string_t argv[] = { "mocked_main", "to_remove", "+" F_console_standard_short_verbose_s, 0 };
memset(&statistics, 0, sizeof(struct stat));
statistics.st_mode = F_file_mode_all_d | F_file_type_regular_d; // Should result in kt_remove_flag_file_operate_remove_d.
}
{
- const f_string_t argv[] = { "mocked_main", "to_remove", "+D", 0 };
+ const f_string_t argv[] = { "mocked_main", "to_remove", "+" F_console_standard_short_debug_s, 0 };
memset(&statistics, 0, sizeof(struct stat));
statistics.st_mode = F_file_mode_all_d | F_file_type_regular_d; // Should result in kt_remove_flag_file_operate_remove_d.
}
{
- const f_string_t argv[] = { "mocked_main", "to_remove", "+V", 0 };
+ const f_string_t argv[] = { "mocked_main", "to_remove", "+" F_console_standard_short_verbose_s, 0 };
will_return(__wrap_f_file_exists, F_false);
}
{
- const f_string_t argv[] = { "mocked_main", "to_remove", "+D", 0 };
+ const f_string_t argv[] = { "mocked_main", "to_remove", "+" F_console_standard_short_debug_s, 0 };
will_return(__wrap_f_file_exists, F_false);
}
{
- const f_string_t argv[] = { "mocked_main", "to_remove", "also/remove", "+V", 0 };
+ const f_string_t argv[] = { "mocked_main", "to_remove", "also/remove", "+" F_console_standard_short_verbose_s, 0 };
memset(&statistics, 0, sizeof(struct stat));
statistics.st_mode = F_file_mode_all_d | F_file_type_regular_d; // Should result in kt_remove_flag_file_operate_remove_d.
}
{
- const f_string_t argv[] = { "mocked_main", "to_remove", "also/remove", "+D", 0 };
+ const f_string_t argv[] = { "mocked_main", "to_remove", "also/remove", "+" F_console_standard_short_debug_s, 0 };
memset(&statistics, 0, sizeof(struct stat));
statistics.st_mode = F_file_mode_all_d | F_file_type_regular_d; // Should result in kt_remove_flag_file_operate_remove_d.
}
{
- const f_string_t argv[] = { "mocked_main", "to_remove", "also/remove", "+V", 0 };
+ const f_string_t argv[] = { "mocked_main", "to_remove", "also/remove", "+" F_console_standard_short_verbose_s, 0 };
memset(&statistics, 0, sizeof(struct stat));
statistics.st_mode = F_file_mode_all_d | F_file_type_regular_d; // Should result in kt_remove_flag_file_operate_remove_d.
}
{
- const f_string_t argv[] = { "mocked_main", "to_remove", "also/remove", "+D", 0 };
+ const f_string_t argv[] = { "mocked_main", "to_remove", "also/remove", "+" F_console_standard_short_debug_s, 0 };
memset(&statistics, 0, sizeof(struct stat));
statistics.st_mode = F_file_mode_all_d | F_file_type_regular_d; // Should result in kt_remove_flag_file_operate_remove_d.
}
{
- const f_string_t argv[] = { "mocked_main", "to_remove", "also/remove", "+V", 0 };
+ const f_string_t argv[] = { "mocked_main", "to_remove", "also/remove", "+" F_console_standard_short_verbose_s, 0 };
memset(&statistics, 0, sizeof(struct stat));
statistics.st_mode = F_file_mode_all_d | F_file_type_regular_d; // Should result in kt_remove_flag_file_operate_remove_d.
}
{
- const f_string_t argv[] = { "mocked_main", "to_remove", "also/remove", "+D", 0 };
+ const f_string_t argv[] = { "mocked_main", "to_remove", "also/remove", "+" F_console_standard_short_debug_s, 0 };
memset(&statistics, 0, sizeof(struct stat));
statistics.st_mode = F_file_mode_all_d | F_file_type_regular_d; // Should result in kt_remove_flag_file_operate_remove_d.
}
{
- const f_string_t argv[] = { "mocked_main", "to_remove", "also/remove", "+V", 0 };
+ const f_string_t argv[] = { "mocked_main", "to_remove", "also/remove", "+" F_console_standard_short_verbose_s, 0 };
will_return(__wrap_f_file_exists, F_false);
will_return(__wrap_f_file_exists, F_false);
}
{
- const f_string_t argv[] = { "mocked_main", "to_remove", "also/remove", "+D", 0 };
+ const f_string_t argv[] = { "mocked_main", "to_remove", "also/remove", "+" F_console_standard_short_debug_s, 0 };
will_return(__wrap_f_file_exists, F_false);
will_return(__wrap_f_file_exists, F_false);
cmocka_unit_test(test__kt_remove__file_type__works),
+ cmocka_unit_test(test__kt_remove__force__works),
+
cmocka_unit_test(test__kt_remove__group__name_works),
cmocka_unit_test(test__kt_remove__regular_no_args__one_exists_link),
#include "test-remove-directory_tree_simple.h"
#include "test-remove-file_mode.h"
#include "test-remove-file_type.h"
+#include "test-remove-force.h"
#include "test-remove-group.h"
#include "test-remove-print_help.h"
#include "test-remove-print_version.h"
projects / kevux-tools / commitdiff