From 2dcfcdcb1eb3e210bee36d45cd516945ccd77873 Mon Sep 17 00:00:00 2001 From: Kevin Day Date: Tue, 26 Nov 2024 00:02:43 -0600 Subject: [PATCH] Update: The fss_read has missing our out of date information. Add the android settings like is done for other settings files. Use the hex digits rather than `f_true` and `f_false`. The `fss_read_main_setting_load_as` callback appears to be missing. I need to review the code to confirm/deny this particular behavior. --- level_3/fss_read/c/basic/print.c | 2 +- level_3/fss_read/c/basic_list/print.c | 2 +- level_3/fss_read/c/embedded_list/print.c | 2 +- level_3/fss_read/c/extended/print.c | 2 +- level_3/fss_read/c/extended_list/print.c | 2 +- level_3/fss_read/c/main/common.c | 1 + level_3/fss_read/c/main/main.c | 2 +- level_3/fss_read/c/main/print/message.c | 2 -- level_3/fss_read/c/payload/main.c | 2 +- level_3/fss_read/data/build/fakefile | 2 +- level_3/fss_read/data/build/settings.basic | 5 ++++- level_3/fss_read/data/build/settings.basic_list | 5 ++++- level_3/fss_read/data/build/settings.embedded_list | 5 ++++- level_3/fss_read/data/build/settings.extended | 5 ++++- level_3/fss_read/data/build/settings.extended_list | 5 ++++- level_3/fss_read/data/build/settings.main | 5 ++++- level_3/fss_read/data/build/settings.payload | 5 ++++- 17 files changed, 37 insertions(+), 17 deletions(-) diff --git a/level_3/fss_read/c/basic/print.c b/level_3/fss_read/c/basic/print.c index b452f82..ceafb20 100644 --- a/level_3/fss_read/c/basic/print.c +++ b/level_3/fss_read/c/basic/print.c @@ -43,7 +43,7 @@ extern "C" { fss_read_print_message_help_pipe(print); - fss_read_print_message_help_note(print, F_false); + fss_read_print_message_help_note(print, 0x0); f_file_stream_flush(print->to); f_file_stream_unlock(print->to); diff --git a/level_3/fss_read/c/basic_list/print.c b/level_3/fss_read/c/basic_list/print.c index 4dae7c6..3c29284 100644 --- a/level_3/fss_read/c/basic_list/print.c +++ b/level_3/fss_read/c/basic_list/print.c @@ -51,7 +51,7 @@ extern "C" { fss_read_print_message_help_pipe(print); - fss_read_print_message_help_note(print, F_true); + fss_read_print_message_help_note(print, 0x1); f_file_stream_flush(print->to); f_file_stream_unlock(print->to); diff --git a/level_3/fss_read/c/embedded_list/print.c b/level_3/fss_read/c/embedded_list/print.c index 442a30c..821b088 100644 --- a/level_3/fss_read/c/embedded_list/print.c +++ b/level_3/fss_read/c/embedded_list/print.c @@ -80,7 +80,7 @@ extern "C" { fss_read_print_message_help_pipe(print); - fss_read_print_message_help_note(print, F_true); + fss_read_print_message_help_note(print, 0x1); f_file_stream_flush(print->to); f_file_stream_unlock(print->to); diff --git a/level_3/fss_read/c/extended/print.c b/level_3/fss_read/c/extended/print.c index e1a50fb..87da97d 100644 --- a/level_3/fss_read/c/extended/print.c +++ b/level_3/fss_read/c/extended/print.c @@ -61,7 +61,7 @@ extern "C" { fss_read_print_message_help_pipe(print); - fss_read_print_message_help_note(print, F_false); + fss_read_print_message_help_note(print, 0x0); f_file_stream_flush(print->to); f_file_stream_unlock(print->to); diff --git a/level_3/fss_read/c/extended_list/print.c b/level_3/fss_read/c/extended_list/print.c index e18931f..cef3460 100644 --- a/level_3/fss_read/c/extended_list/print.c +++ b/level_3/fss_read/c/extended_list/print.c @@ -80,7 +80,7 @@ extern "C" { fss_read_print_message_help_pipe(print); - fss_read_print_message_help_note(print, F_true); + fss_read_print_message_help_note(print, 0x1); f_file_stream_flush(print->to); f_file_stream_unlock(print->to); diff --git a/level_3/fss_read/c/main/common.c b/level_3/fss_read/c/main/common.c index 704f49f..c8050e0 100644 --- a/level_3/fss_read/c/main/common.c +++ b/level_3/fss_read/c/main/common.c @@ -102,6 +102,7 @@ extern "C" { } } + if (parameters->array[f_console_standard_parameter_copyright_e].result & f_console_result_found_e) return; if (parameters->array[f_console_standard_parameter_help_e].result & f_console_result_found_e) return; if (parameters->array[f_console_standard_parameter_version_e].result & f_console_result_found_e) return; diff --git a/level_3/fss_read/c/main/main.c b/level_3/fss_read/c/main/main.c index 89f3d76..2d54138 100644 --- a/level_3/fss_read/c/main/main.c +++ b/level_3/fss_read/c/main/main.c @@ -44,7 +44,7 @@ int main(const int argc, const f_string_t *argv, const f_string_t *envp) { { const f_console_arguments_t arguments = macro_f_console_arguments_t_initialize_1(argc, argv, envp); - fss_read_setting_load(arguments, &data, 0); + fss_read_setting_load(arguments, &data, &fss_read_main_setting_load_as); } fss_read_main(&data); diff --git a/level_3/fss_read/c/main/print/message.c b/level_3/fss_read/c/main/print/message.c index 2e45f23..3cd1cb9 100644 --- a/level_3/fss_read/c/main/print/message.c +++ b/level_3/fss_read/c/main/print/message.c @@ -56,7 +56,6 @@ extern "C" { f_color_set_context_t * const set = print->set; - // TODO: this is just copied over and needs to be broken up somehow. fl_print_format("%r All numeric positions (indexes) start at 0 instead of 1.%r", print->to, f_string_eol_s, f_string_eol_s); fl_print_format(" For example, a file of 17 lines would range from 0 to 16.%r%r", print->to, f_string_eol_s, f_string_eol_s); @@ -137,7 +136,6 @@ extern "C" { if (!print) return; - // @todo there is a pipe input format but this documentation is for write rather than read, update this as appropriate or remove function entirely. fl_print_format("%r The pipe uses the Backspace character '%[\\b%]' (%[U+0008%]) to designate the start of a Content.%r", print->to, f_string_eol_s, print->set->notable, print->set->notable, print->set->notable, print->set->notable, f_string_eol_s); fl_print_format(" The pipe uses the Form Feed character '%[\\f%]' (%[U+000C%]) to designate the end of the last Content.%r", print->to, print->set->notable, print->set->notable, print->set->notable, print->set->notable, f_string_eol_s); fl_print_format(" The pipe uses the Vertical Line character '%[\\v%]' (%[U+000B%]) is used to ignore a Content range (use this both before and after the range).%r", print->to, print->set->notable, print->set->notable, print->set->notable, print->set->notable, f_string_eol_s); diff --git a/level_3/fss_read/c/payload/main.c b/level_3/fss_read/c/payload/main.c index 7dc457e..3ef3bc9 100644 --- a/level_3/fss_read/c/payload/main.c +++ b/level_3/fss_read/c/payload/main.c @@ -64,7 +64,7 @@ int main(const int argc, const f_string_t *argv, const f_string_t *envp) { { const f_console_arguments_t arguments = macro_f_console_arguments_t_initialize_1(argc, argv, envp); - fss_read_setting_load(arguments, &data, 0); + fss_read_setting_load(arguments, &data, &fss_read_payload_setting_load); } fss_read_main(&data); diff --git a/level_3/fss_read/data/build/fakefile b/level_3/fss_read/data/build/fakefile index a0ade54..c3a9cf2 100644 --- a/level_3/fss_read/data/build/fakefile +++ b/level_3/fss_read/data/build/fakefile @@ -32,7 +32,7 @@ install: help: print - print context:'title'Fakefile Options for FSS Read Program.context:'reset' + print context:'title'Fakefile Options for FSS Read Programs.context:'reset' print print The following operations are available\: diff --git a/level_3/fss_read/data/build/settings.basic b/level_3/fss_read/data/build/settings.basic index c98dfac..9aa1759 100644 --- a/level_3/fss_read/data/build/settings.basic +++ b/level_3/fss_read/data/build/settings.basic @@ -12,7 +12,7 @@ version_micro 0 version_file micro version_target minor -modes individual individual_thread level monolithic clang gcc gcc_13 test fanalyzer thread threadless +modes android individual individual_thread level monolithic clang gcc gcc_13 test fanalyzer thread threadless modes_default monolithic thread gcc build_compiler gcc @@ -49,10 +49,12 @@ environment LANG LC_ALL LC_COLLATE LC_CTYPE LC_FASTMSG LC_MESSAGES LC_MONETARY L #defines -D_di_libcap_ defines -D_libcap_legacy_only_ +defines-android -D_di_f_thread_attribute_affinity_get_ -D_di_f_thread_attribute_affinity_set_ -D_di_f_thread_attribute_concurrency_get_ -D_di_f_thread_attribute_concurrency_set_ -D_di_f_thread_attribute_default_get_ -D_di_f_thread_attribute_default_set_ -D_di_f_thread_cancel_ -D_di_f_thread_cancel_state_set_ -D_di_f_thread_cancel_test_ -D_di_f_thread_join_try_ -D_di_f_thread_join_timed_ -D_pthread_mutex_prioceiling_unsupported_ -D_di_f_thread_semaphore_file_close_ -D_di_f_thread_semaphore_file_open_ -D_di_f_thread_semaphore_file_delete_ -D_di_f_thread_cancel_type_set_ defines-thread -D_pthread_attr_unsupported_ -D_pthread_sigqueue_unsupported_ defines-threadless -D_di_thread_support_ flags -O2 -z now -g -fdiagnostics-color=always -Wno-logical-not-parentheses -Wno-parentheses -Wno-missing-braces -Wno-main +flags-android -Wno-implicit-function-declaration -Wl,-z,norelro flags-clang -Wno-logical-op-parentheses flags-coverage -O0 --coverage -fprofile-abs-path -fprofile-dir=build/coverage/ flags-fanalyzer -fanalyzer @@ -63,3 +65,4 @@ flags-thread -pthread flags_library -fPIC flags_object -fPIC flags_program -fPIE +flags_program-android -fPIE -Wl,-z,relro diff --git a/level_3/fss_read/data/build/settings.basic_list b/level_3/fss_read/data/build/settings.basic_list index 141de1d..c64050c 100644 --- a/level_3/fss_read/data/build/settings.basic_list +++ b/level_3/fss_read/data/build/settings.basic_list @@ -12,7 +12,7 @@ version_micro 0 version_file micro version_target minor -modes individual individual_thread level monolithic clang gcc gcc_13 test fanalyzer thread threadless +modes android individual individual_thread level monolithic clang gcc gcc_13 test fanalyzer thread threadless modes_default monolithic thread gcc build_compiler gcc @@ -49,10 +49,12 @@ environment LANG LC_ALL LC_COLLATE LC_CTYPE LC_FASTMSG LC_MESSAGES LC_MONETARY L #defines -D_di_libcap_ defines -D_libcap_legacy_only_ +defines-android -D_di_f_thread_attribute_affinity_get_ -D_di_f_thread_attribute_affinity_set_ -D_di_f_thread_attribute_concurrency_get_ -D_di_f_thread_attribute_concurrency_set_ -D_di_f_thread_attribute_default_get_ -D_di_f_thread_attribute_default_set_ -D_di_f_thread_cancel_ -D_di_f_thread_cancel_state_set_ -D_di_f_thread_cancel_test_ -D_di_f_thread_join_try_ -D_di_f_thread_join_timed_ -D_pthread_mutex_prioceiling_unsupported_ -D_di_f_thread_semaphore_file_close_ -D_di_f_thread_semaphore_file_open_ -D_di_f_thread_semaphore_file_delete_ -D_di_f_thread_cancel_type_set_ defines-thread -D_pthread_attr_unsupported_ -D_pthread_sigqueue_unsupported_ defines-threadless -D_di_thread_support_ flags -O2 -z now -g -fdiagnostics-color=always -Wno-logical-not-parentheses -Wno-parentheses -Wno-missing-braces -Wno-main +flags-android -Wno-implicit-function-declaration -Wl,-z,norelro flags-clang -Wno-logical-op-parentheses flags-coverage -O0 --coverage -fprofile-abs-path -fprofile-dir=build/coverage/ flags-fanalyzer -fanalyzer @@ -63,3 +65,4 @@ flags-thread -pthread flags_library -fPIC flags_object -fPIC flags_program -fPIE +flags_program-android -fPIE -Wl,-z,relro diff --git a/level_3/fss_read/data/build/settings.embedded_list b/level_3/fss_read/data/build/settings.embedded_list index cfe39f6..adbd782 100644 --- a/level_3/fss_read/data/build/settings.embedded_list +++ b/level_3/fss_read/data/build/settings.embedded_list @@ -12,7 +12,7 @@ version_micro 0 version_file micro version_target minor -modes individual individual_thread level monolithic clang gcc gcc_13 test fanalyzer thread threadless +modes android individual individual_thread level monolithic clang gcc gcc_13 test fanalyzer thread threadless modes_default monolithic thread gcc build_compiler gcc @@ -49,10 +49,12 @@ environment LANG LC_ALL LC_COLLATE LC_CTYPE LC_FASTMSG LC_MESSAGES LC_MONETARY L #defines -D_di_libcap_ defines -D_libcap_legacy_only_ +defines-android -D_di_f_thread_attribute_affinity_get_ -D_di_f_thread_attribute_affinity_set_ -D_di_f_thread_attribute_concurrency_get_ -D_di_f_thread_attribute_concurrency_set_ -D_di_f_thread_attribute_default_get_ -D_di_f_thread_attribute_default_set_ -D_di_f_thread_cancel_ -D_di_f_thread_cancel_state_set_ -D_di_f_thread_cancel_test_ -D_di_f_thread_join_try_ -D_di_f_thread_join_timed_ -D_pthread_mutex_prioceiling_unsupported_ -D_di_f_thread_semaphore_file_close_ -D_di_f_thread_semaphore_file_open_ -D_di_f_thread_semaphore_file_delete_ -D_di_f_thread_cancel_type_set_ defines-thread -D_pthread_attr_unsupported_ -D_pthread_sigqueue_unsupported_ defines-threadless -D_di_thread_support_ flags -O2 -z now -g -fdiagnostics-color=always -Wno-logical-not-parentheses -Wno-parentheses -Wno-missing-braces -Wno-main +flags-android -Wno-implicit-function-declaration -Wl,-z,norelro flags-clang -Wno-logical-op-parentheses flags-coverage -O0 --coverage -fprofile-abs-path -fprofile-dir=build/coverage/ flags-fanalyzer -fanalyzer @@ -63,3 +65,4 @@ flags-thread -pthread flags_library -fPIC flags_object -fPIC flags_program -fPIE +flags_program-android -fPIE -Wl,-z,relro diff --git a/level_3/fss_read/data/build/settings.extended b/level_3/fss_read/data/build/settings.extended index b7ca6e7..9ccd5e9 100644 --- a/level_3/fss_read/data/build/settings.extended +++ b/level_3/fss_read/data/build/settings.extended @@ -12,7 +12,7 @@ version_micro 0 version_file micro version_target minor -modes individual individual_thread level monolithic clang gcc gcc_13 test fanalyzer thread threadless +modes android individual individual_thread level monolithic clang gcc gcc_13 test fanalyzer thread threadless modes_default monolithic thread gcc build_compiler gcc @@ -49,10 +49,12 @@ environment LANG LC_ALL LC_COLLATE LC_CTYPE LC_FASTMSG LC_MESSAGES LC_MONETARY L #defines -D_di_libcap_ defines -D_libcap_legacy_only_ +defines-android -D_di_f_thread_attribute_affinity_get_ -D_di_f_thread_attribute_affinity_set_ -D_di_f_thread_attribute_concurrency_get_ -D_di_f_thread_attribute_concurrency_set_ -D_di_f_thread_attribute_default_get_ -D_di_f_thread_attribute_default_set_ -D_di_f_thread_cancel_ -D_di_f_thread_cancel_state_set_ -D_di_f_thread_cancel_test_ -D_di_f_thread_join_try_ -D_di_f_thread_join_timed_ -D_pthread_mutex_prioceiling_unsupported_ -D_di_f_thread_semaphore_file_close_ -D_di_f_thread_semaphore_file_open_ -D_di_f_thread_semaphore_file_delete_ -D_di_f_thread_cancel_type_set_ defines-thread -D_pthread_attr_unsupported_ -D_pthread_sigqueue_unsupported_ defines-threadless -D_di_thread_support_ flags -O2 -z now -g -fdiagnostics-color=always -Wno-logical-not-parentheses -Wno-parentheses -Wno-missing-braces -Wno-main +flags-android -Wno-implicit-function-declaration -Wl,-z,norelro flags-clang -Wno-logical-op-parentheses flags-coverage -O0 --coverage -fprofile-abs-path -fprofile-dir=build/coverage/ flags-fanalyzer -fanalyzer @@ -63,3 +65,4 @@ flags-thread -pthread flags_library -fPIC flags_object -fPIC flags_program -fPIE +flags_program-android -fPIE -Wl,-z,relro diff --git a/level_3/fss_read/data/build/settings.extended_list b/level_3/fss_read/data/build/settings.extended_list index f40f93f..0ecbe3b 100644 --- a/level_3/fss_read/data/build/settings.extended_list +++ b/level_3/fss_read/data/build/settings.extended_list @@ -12,7 +12,7 @@ version_micro 0 version_file micro version_target minor -modes individual individual_thread level monolithic clang gcc gcc_13 test fanalyzer thread threadless +modes android individual individual_thread level monolithic clang gcc gcc_13 test fanalyzer thread threadless modes_default monolithic thread gcc build_compiler gcc @@ -49,10 +49,12 @@ environment LANG LC_ALL LC_COLLATE LC_CTYPE LC_FASTMSG LC_MESSAGES LC_MONETARY L #defines -D_di_libcap_ defines -D_libcap_legacy_only_ +defines-android -D_di_f_thread_attribute_affinity_get_ -D_di_f_thread_attribute_affinity_set_ -D_di_f_thread_attribute_concurrency_get_ -D_di_f_thread_attribute_concurrency_set_ -D_di_f_thread_attribute_default_get_ -D_di_f_thread_attribute_default_set_ -D_di_f_thread_cancel_ -D_di_f_thread_cancel_state_set_ -D_di_f_thread_cancel_test_ -D_di_f_thread_join_try_ -D_di_f_thread_join_timed_ -D_pthread_mutex_prioceiling_unsupported_ -D_di_f_thread_semaphore_file_close_ -D_di_f_thread_semaphore_file_open_ -D_di_f_thread_semaphore_file_delete_ -D_di_f_thread_cancel_type_set_ defines-thread -D_pthread_attr_unsupported_ -D_pthread_sigqueue_unsupported_ defines-threadless -D_di_thread_support_ flags -O2 -z now -g -fdiagnostics-color=always -Wno-logical-not-parentheses -Wno-parentheses -Wno-missing-braces -Wno-main +flags-android -Wno-implicit-function-declaration -Wl,-z,norelro flags-clang -Wno-logical-op-parentheses flags-coverage -O0 --coverage -fprofile-abs-path -fprofile-dir=build/coverage/ flags-fanalyzer -fanalyzer @@ -63,3 +65,4 @@ flags-thread -pthread flags_library -fPIC flags_object -fPIC flags_program -fPIE +flags_program-android -fPIE -Wl,-z,relro diff --git a/level_3/fss_read/data/build/settings.main b/level_3/fss_read/data/build/settings.main index 5ebebaf..9ce527b 100644 --- a/level_3/fss_read/data/build/settings.main +++ b/level_3/fss_read/data/build/settings.main @@ -12,7 +12,7 @@ version_micro 0 version_file micro version_target minor -modes individual individual_thread level monolithic clang gcc gcc_13 test fanalyzer thread threadless +modes android individual individual_thread level monolithic clang gcc gcc_13 test fanalyzer thread threadless modes_default monolithic thread gcc build_compiler gcc @@ -49,10 +49,12 @@ environment LANG LC_ALL LC_COLLATE LC_CTYPE LC_FASTMSG LC_MESSAGES LC_MONETARY L #defines -D_di_libcap_ defines -D_libcap_legacy_only_ +defines-android -D_di_f_thread_attribute_affinity_get_ -D_di_f_thread_attribute_affinity_set_ -D_di_f_thread_attribute_concurrency_get_ -D_di_f_thread_attribute_concurrency_set_ -D_di_f_thread_attribute_default_get_ -D_di_f_thread_attribute_default_set_ -D_di_f_thread_cancel_ -D_di_f_thread_cancel_state_set_ -D_di_f_thread_cancel_test_ -D_di_f_thread_join_try_ -D_di_f_thread_join_timed_ -D_pthread_mutex_prioceiling_unsupported_ -D_di_f_thread_semaphore_file_close_ -D_di_f_thread_semaphore_file_open_ -D_di_f_thread_semaphore_file_delete_ -D_di_f_thread_cancel_type_set_ defines-thread -D_pthread_attr_unsupported_ -D_pthread_sigqueue_unsupported_ defines-threadless -D_di_thread_support_ flags -O2 -z now -g -fdiagnostics-color=always -Wno-logical-not-parentheses -Wno-parentheses -Wno-missing-braces -Wno-main +flags-android -Wno-implicit-function-declaration -Wl,-z,norelro flags-clang -Wno-logical-op-parentheses flags-coverage -O0 --coverage -fprofile-abs-path -fprofile-dir=build/coverage/ flags-fanalyzer -fanalyzer @@ -63,3 +65,4 @@ flags-thread -pthread flags_library -fPIC flags_object -fPIC flags_program -fPIE +flags_program-android -fPIE -Wl,-z,relro diff --git a/level_3/fss_read/data/build/settings.payload b/level_3/fss_read/data/build/settings.payload index e73391b..b069032 100644 --- a/level_3/fss_read/data/build/settings.payload +++ b/level_3/fss_read/data/build/settings.payload @@ -12,7 +12,7 @@ version_micro 0 version_file micro version_target minor -modes individual individual_thread level monolithic clang gcc gcc_13 test fanalyzer thread threadless +modes android individual individual_thread level monolithic clang gcc gcc_13 test fanalyzer thread threadless modes_default monolithic thread gcc build_compiler gcc @@ -49,10 +49,12 @@ environment LANG LC_ALL LC_COLLATE LC_CTYPE LC_FASTMSG LC_MESSAGES LC_MONETARY L #defines -D_di_libcap_ defines -D_libcap_legacy_only_ +defines-android -D_di_f_thread_attribute_affinity_get_ -D_di_f_thread_attribute_affinity_set_ -D_di_f_thread_attribute_concurrency_get_ -D_di_f_thread_attribute_concurrency_set_ -D_di_f_thread_attribute_default_get_ -D_di_f_thread_attribute_default_set_ -D_di_f_thread_cancel_ -D_di_f_thread_cancel_state_set_ -D_di_f_thread_cancel_test_ -D_di_f_thread_join_try_ -D_di_f_thread_join_timed_ -D_pthread_mutex_prioceiling_unsupported_ -D_di_f_thread_semaphore_file_close_ -D_di_f_thread_semaphore_file_open_ -D_di_f_thread_semaphore_file_delete_ -D_di_f_thread_cancel_type_set_ defines-thread -D_pthread_attr_unsupported_ -D_pthread_sigqueue_unsupported_ defines-threadless -D_di_thread_support_ flags -O2 -z now -g -fdiagnostics-color=always -Wno-logical-not-parentheses -Wno-parentheses -Wno-missing-braces -Wno-main +flags-android -Wno-implicit-function-declaration -Wl,-z,norelro flags-clang -Wno-logical-op-parentheses flags-coverage -O0 --coverage -fprofile-abs-path -fprofile-dir=build/coverage/ flags-fanalyzer -fanalyzer @@ -63,3 +65,4 @@ flags-thread -pthread flags_library -fPIC flags_object -fPIC flags_program -fPIE +flags_program-android -fPIE -Wl,-z,relro -- 1.8.3.1