]> Kevux Git Server - fll/commitdiff
Update: The fss_read has missing our out of date information. development
authorKevin Day <Kevin@kevux.org>
Tue, 26 Nov 2024 06:02:43 +0000 (00:02 -0600)
committerKevin Day <Kevin@kevux.org>
Tue, 26 Nov 2024 06:03:36 +0000 (00:03 -0600)
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.

17 files changed:
level_3/fss_read/c/basic/print.c
level_3/fss_read/c/basic_list/print.c
level_3/fss_read/c/embedded_list/print.c
level_3/fss_read/c/extended/print.c
level_3/fss_read/c/extended_list/print.c
level_3/fss_read/c/main/common.c
level_3/fss_read/c/main/main.c
level_3/fss_read/c/main/print/message.c
level_3/fss_read/c/payload/main.c
level_3/fss_read/data/build/fakefile
level_3/fss_read/data/build/settings.basic
level_3/fss_read/data/build/settings.basic_list
level_3/fss_read/data/build/settings.embedded_list
level_3/fss_read/data/build/settings.extended
level_3/fss_read/data/build/settings.extended_list
level_3/fss_read/data/build/settings.main
level_3/fss_read/data/build/settings.payload

index b452f826cd0bceb56e407c92ad1e5163dfa40bb8..ceafb20edd3c8a5fd2f49b5dbcd4c50a942eb1af 100644 (file)
@@ -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);
index 4dae7c675e71a6f41c8b55af68dd6b2de5c9f289..3c292841bb33ac757461b3a59aa323e8b49ca563 100644 (file)
@@ -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);
index 442a30c13e50ed174168734a29d3defd65e7bac5..821b0882dca728a3b6f896bc025cbda18e5abe46 100644 (file)
@@ -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);
index e1a50fb32b7cf53e6b3d50241c4fd962d58f413e..87da97d71aa42afa60cfabae5bd41efa9de04c3e 100644 (file)
@@ -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);
index e18931f485d73c172ac5130c07e67b98ad9eb828..cef3460ecff95dfd0dc97880afae9d07a80fb784 100644 (file)
@@ -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);
index 704f49f1e4319dfa01e446c935a37a7a531f1f7d..c8050e0179799ad54c82157c7c467c0cf3a19d12 100644 (file)
@@ -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;
 
index 89f3d76f9008cdd41cdd1f2ee51b45a009547a6b..2d541389f0cfdd06a34904387c59a6d5e370b9f1 100644 (file)
@@ -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);
index 2e45f23f7ee30d2ec604a7733bb92cb63c2291a3..3cd1cb97cebb6200c6b879b4ea5ad72c27a2d535 100644 (file)
@@ -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);
index 7dc457e99c5cdd54b5c3605fe2d673a0cbcf239c..3ef3bc9f998caff7f879f45fda632027a9179629 100644 (file)
@@ -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);
index a0ade5439ab873c6fa291aaa4771d101285bfa5a..c3a9cf21a804f3db7ec59cbf50a2217335dd8b3f 100644 (file)
@@ -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\:
index c98dfac5c6e124bedc95a70059d2b83ea0edce0f..9aa17598be2942fd44676250ec0d2110d923a086 100644 (file)
@@ -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
index 141de1d778118fb2aefb7d9ddba923a0929adb6b..c64050c7a4a525d2f55218b9b11f025cdcf496f3 100644 (file)
@@ -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
index cfe39f6f2c55a1cc8ac4bb15817d9cfaf5ac5bb2..adbd782be2cd8aceefb132576027ec9a057c0572 100644 (file)
@@ -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
index b7ca6e75c94c1b622f52e6b84d66746e3547b43c..9ccd5e93e3812877ef137117c669d2d97d455c48 100644 (file)
@@ -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
index f40f93f690240b1780a16b190d8cc53f7fcea301..0ecbe3be1c5fbd4f639623aa7fbd706562d4d452 100644 (file)
@@ -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
index 5ebebafed8632098a60e1ba20a535aa4f53fe857..9ce527b55a683082d15b918796917605c0c5ca31 100644 (file)
@@ -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
index e73391b9cc6dce5706cf8b82287cc05d69a9caf2..b069032e0754213b0f238e108a4ffcea355c73e9 100644 (file)
@@ -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