From a6dc6c01a6e58aff67fbf76d8f8d2a973d137bb0 Mon Sep 17 00:00:00 2001 From: Kevin Day Date: Wed, 8 Sep 2021 20:26:00 -0500 Subject: [PATCH] Bugfix: Miscellaneous mistakes. The fl_signal has the wrong project name, causing the fl_signal to be installed as fl_iki. Fix comment in fll_print header file. The byte_dump program needs to report file not found as an error. Fix error message from missing bug in byte_dump. Incorrect variable used in fss_basic_write (a copy and paste error). Fix _libcap_legacy_only_ defines and apply the libcap and pthread defines more universally. --- build/level_0/settings | 2 +- build/level_1/settings | 2 +- level_1/fl_execute/data/build/settings | 2 +- level_1/fl_signal/data/build/settings | 2 +- level_2/fll_print/c/print.h | 2 +- level_3/byte_dump/c/byte_dump.c | 8 ++++++-- level_3/byte_dump/data/build/settings | 3 ++- level_3/control/data/build/settings | 3 ++- level_3/fss_basic_list_read/data/build/settings | 3 ++- level_3/fss_basic_list_write/data/build/settings | 3 ++- level_3/fss_basic_read/data/build/settings | 3 ++- level_3/fss_basic_write/c/fss_basic_write.c | 2 +- level_3/fss_basic_write/data/build/settings | 3 ++- level_3/fss_embedded_list_read/data/build/settings | 3 ++- level_3/fss_embedded_list_write/data/build/settings | 3 ++- level_3/fss_extended_list_read/data/build/settings | 3 ++- level_3/fss_extended_list_write/data/build/settings | 3 ++- level_3/fss_extended_read/data/build/settings | 3 ++- level_3/fss_extended_write/data/build/settings | 3 ++- level_3/fss_identify/data/build/settings | 3 ++- level_3/fss_status_code/data/build/settings | 3 ++- level_3/iki_read/data/build/settings | 3 ++- level_3/iki_write/data/build/settings | 3 ++- level_3/status_code/data/build/settings | 3 ++- 24 files changed, 46 insertions(+), 25 deletions(-) diff --git a/build/level_0/settings b/build/level_0/settings index 425634a..f6e13d5 100644 --- a/build/level_0/settings +++ b/build/level_0/settings @@ -47,7 +47,7 @@ search_shared yes search_static yes #defines_all -D_di_libcap_ -defines_all -D_libcap_legacy_only -D_pthread_attr_unsupported_ -D_pthread_sigqueue_unsupported_ +defines_all -D_libcap_legacy_only_ -D_pthread_attr_unsupported_ -D_pthread_sigqueue_unsupported_ defines_all-level defines_all-level_threadless -D_di_pthread_support_ defines_static diff --git a/build/level_1/settings b/build/level_1/settings index fc13651..34a3c73 100644 --- a/build/level_1/settings +++ b/build/level_1/settings @@ -47,7 +47,7 @@ search_shared yes search_static yes #defines_all -D_di_libcap_ -defines_all -D_pthread_attr_unsupported_ -D_pthread_sigqueue_unsupported_ +defines_all -D_libcap_legacy_only_ -D_pthread_attr_unsupported_ -D_pthread_sigqueue_unsupported_ defines_all-level defines_all-level_threadless -D_di_pthread_support_ defines_static diff --git a/level_1/fl_execute/data/build/settings b/level_1/fl_execute/data/build/settings index 7a56d14..1cb0f4b 100644 --- a/level_1/fl_execute/data/build/settings +++ b/level_1/fl_execute/data/build/settings @@ -46,7 +46,7 @@ search_shared yes search_static yes #defines_all -D_di_libcap_ -defines_all +defines_all -D_libcap_legacy_only_ defines_static defines_shared diff --git a/level_1/fl_signal/data/build/settings b/level_1/fl_signal/data/build/settings index e2f04b8..7250059 100644 --- a/level_1/fl_signal/data/build/settings +++ b/level_1/fl_signal/data/build/settings @@ -1,6 +1,6 @@ # fss-0001 -project_name fl_iki +project_name fl_signal version_major 0 version_minor 5 diff --git a/level_2/fll_print/c/print.h b/level_2/fll_print/c/print.h index 2ac136e..a46b994 100644 --- a/level_2/fll_print/c/print.h +++ b/level_2/fll_print/c/print.h @@ -1769,4 +1769,4 @@ extern "C" { } // extern "C" #endif -#endif // _FLL_path_h +#endif // _FLL_print_h diff --git a/level_3/byte_dump/c/byte_dump.c b/level_3/byte_dump/c/byte_dump.c index fc7f7b9..55dd926 100644 --- a/level_3/byte_dump/c/byte_dump.c +++ b/level_3/byte_dump/c/byte_dump.c @@ -405,12 +405,16 @@ extern "C" { status = f_file_exists(arguments.argv[main->remaining.array[counter]]); - if (status == F_false || F_status_is_error(status)) { + if (status == F_false) { + status = F_status_set_error(F_file_found_not); + } + + if (F_status_is_error(status)) { if (missing_files == F_none) { missing_files = status; } - fll_error_file_print(main->error, F_status_set_fine(status), "f_file_exists", F_true, arguments.argv[main->remaining.array[counter]], "find", fll_error_file_type_file); + fll_error_file_print(main->error, F_status_set_fine(status), "f_file_exists", F_true, arguments.argv[main->remaining.array[counter]], "open", fll_error_file_type_file); } } // for diff --git a/level_3/byte_dump/data/build/settings b/level_3/byte_dump/data/build/settings index 97015d7..9ada218 100644 --- a/level_3/byte_dump/data/build/settings +++ b/level_3/byte_dump/data/build/settings @@ -47,7 +47,8 @@ search_exclusive yes search_shared yes search_static yes -defines_all +#defines_all -D_di_libcap_ -D_di_thread_support_ +defines_all -D_libcap_legacy_only_ -D_pthread_attr_unsupported_ -D_pthread_sigqueue_unsupported_ defines_static defines_shared diff --git a/level_3/control/data/build/settings b/level_3/control/data/build/settings index 53798cb..5789f96 100644 --- a/level_3/control/data/build/settings +++ b/level_3/control/data/build/settings @@ -47,7 +47,8 @@ search_exclusive yes search_shared yes search_static yes -defines_all -D_libcap_legacy_only_ +#defines_all -D_di_libcap_ -D_di_thread_support_ +defines_all -D_libcap_legacy_only_ -D_pthread_attr_unsupported_ -D_pthread_sigqueue_unsupported_ defines_static defines_shared diff --git a/level_3/fss_basic_list_read/data/build/settings b/level_3/fss_basic_list_read/data/build/settings index a7a1699..4405451 100644 --- a/level_3/fss_basic_list_read/data/build/settings +++ b/level_3/fss_basic_list_read/data/build/settings @@ -47,7 +47,8 @@ search_exclusive yes search_shared yes search_static yes -defines_all +#defines_all -D_di_libcap_ -D_di_thread_support_ +defines_all -D_libcap_legacy_only_ -D_pthread_attr_unsupported_ -D_pthread_sigqueue_unsupported_ defines_static defines_shared diff --git a/level_3/fss_basic_list_write/data/build/settings b/level_3/fss_basic_list_write/data/build/settings index fc204f9..41c3a11 100644 --- a/level_3/fss_basic_list_write/data/build/settings +++ b/level_3/fss_basic_list_write/data/build/settings @@ -47,7 +47,8 @@ search_exclusive yes search_shared yes search_static yes -defines_all +#defines_all -D_di_libcap_ -D_di_thread_support_ +defines_all -D_libcap_legacy_only_ -D_pthread_attr_unsupported_ -D_pthread_sigqueue_unsupported_ defines_static defines_shared diff --git a/level_3/fss_basic_read/data/build/settings b/level_3/fss_basic_read/data/build/settings index 941cf50..74430a8 100644 --- a/level_3/fss_basic_read/data/build/settings +++ b/level_3/fss_basic_read/data/build/settings @@ -47,7 +47,8 @@ search_exclusive yes search_shared yes search_static yes -defines_all +#defines_all -D_di_libcap_ -D_di_thread_support_ +defines_all -D_libcap_legacy_only_ -D_pthread_attr_unsupported_ -D_pthread_sigqueue_unsupported_ defines_static defines_shared diff --git a/level_3/fss_basic_write/c/fss_basic_write.c b/level_3/fss_basic_write/c/fss_basic_write.c index 03c089b..d0a684b 100644 --- a/level_3/fss_basic_write/c/fss_basic_write.c +++ b/level_3/fss_basic_write/c/fss_basic_write.c @@ -44,7 +44,7 @@ extern "C" { fl_print_format(" or a Form Feed character '%[\\f%]' (%[U+000C%]).%c", output.stream, context.set.notable, context.set.notable, context.set.notable, context.set.notable, f_string_eol_s[0]); fl_print_format(" The end of the pipe represents the end of any Object or Content.%c%c", output.stream, f_string_eol_s[0], f_string_eol_s[0]); - fl_print_format(" The FSS-0000 (Basic) specification does not support multi-line Content, therefore the parameter '%[%s%s%]'", output.stream, context.set.notable, f_console_symbol_long_enable_s, fss_extended_write_long_prepend, context.set.notable); + fl_print_format(" The FSS-0000 (Basic) specification does not support multi-line Content, therefore the parameter '%[%s%s%]'", output.stream, context.set.notable, f_console_symbol_long_enable_s, fss_basic_write_long_prepend, context.set.notable); fl_print_format(" does nothing.%c%c", output.stream, f_string_eol_s[0], f_string_eol_s[0]); fl_print_format(" This program does not use the parameter '%[%s%s%]', which therefore does nothing.%c", output.stream, context.set.notable, f_console_symbol_long_enable_s, fss_basic_write_long_ignore, context.set.notable, f_string_eol_s[0]); diff --git a/level_3/fss_basic_write/data/build/settings b/level_3/fss_basic_write/data/build/settings index a9feb7b..8ec43b8 100644 --- a/level_3/fss_basic_write/data/build/settings +++ b/level_3/fss_basic_write/data/build/settings @@ -47,7 +47,8 @@ search_exclusive yes search_shared yes search_static yes -defines_all +#defines_all -D_di_libcap_ -D_di_thread_support_ +defines_all -D_libcap_legacy_only_ -D_pthread_attr_unsupported_ -D_pthread_sigqueue_unsupported_ defines_static defines_shared diff --git a/level_3/fss_embedded_list_read/data/build/settings b/level_3/fss_embedded_list_read/data/build/settings index 27dfee3..cdaeefc 100644 --- a/level_3/fss_embedded_list_read/data/build/settings +++ b/level_3/fss_embedded_list_read/data/build/settings @@ -47,7 +47,8 @@ search_exclusive yes search_shared yes search_static yes -defines_all +#defines_all -D_di_libcap_ -D_di_thread_support_ +defines_all -D_libcap_legacy_only_ -D_pthread_attr_unsupported_ -D_pthread_sigqueue_unsupported_ defines_static defines_shared diff --git a/level_3/fss_embedded_list_write/data/build/settings b/level_3/fss_embedded_list_write/data/build/settings index 3efcee9..db51e70 100644 --- a/level_3/fss_embedded_list_write/data/build/settings +++ b/level_3/fss_embedded_list_write/data/build/settings @@ -47,7 +47,8 @@ search_exclusive yes search_shared yes search_static yes -defines_all +#defines_all -D_di_libcap_ -D_di_thread_support_ +defines_all -D_libcap_legacy_only_ -D_pthread_attr_unsupported_ -D_pthread_sigqueue_unsupported_ defines_static defines_shared diff --git a/level_3/fss_extended_list_read/data/build/settings b/level_3/fss_extended_list_read/data/build/settings index 3e60e17..26332cd 100644 --- a/level_3/fss_extended_list_read/data/build/settings +++ b/level_3/fss_extended_list_read/data/build/settings @@ -47,7 +47,8 @@ search_exclusive yes search_shared yes search_static yes -defines_all +#defines_all -D_di_libcap_ -D_di_thread_support_ +defines_all -D_libcap_legacy_only_ -D_pthread_attr_unsupported_ -D_pthread_sigqueue_unsupported_ defines_static defines_shared diff --git a/level_3/fss_extended_list_write/data/build/settings b/level_3/fss_extended_list_write/data/build/settings index 43b4ee1..cb893c9 100644 --- a/level_3/fss_extended_list_write/data/build/settings +++ b/level_3/fss_extended_list_write/data/build/settings @@ -47,7 +47,8 @@ search_exclusive yes search_shared yes search_static yes -defines_all +#defines_all -D_di_libcap_ -D_di_thread_support_ +defines_all -D_libcap_legacy_only_ -D_pthread_attr_unsupported_ -D_pthread_sigqueue_unsupported_ defines_static defines_shared diff --git a/level_3/fss_extended_read/data/build/settings b/level_3/fss_extended_read/data/build/settings index aa25095..5f91368 100644 --- a/level_3/fss_extended_read/data/build/settings +++ b/level_3/fss_extended_read/data/build/settings @@ -47,7 +47,8 @@ search_exclusive yes search_shared yes search_static yes -defines_all +#defines_all -D_di_libcap_ -D_di_thread_support_ +defines_all -D_libcap_legacy_only_ -D_pthread_attr_unsupported_ -D_pthread_sigqueue_unsupported_ defines_static defines_shared diff --git a/level_3/fss_extended_write/data/build/settings b/level_3/fss_extended_write/data/build/settings index 2cb1375..1d0ebcc 100644 --- a/level_3/fss_extended_write/data/build/settings +++ b/level_3/fss_extended_write/data/build/settings @@ -47,7 +47,8 @@ search_exclusive yes search_shared yes search_static yes -defines_all +#defines_all -D_di_libcap_ -D_di_thread_support_ +defines_all -D_libcap_legacy_only_ -D_pthread_attr_unsupported_ -D_pthread_sigqueue_unsupported_ defines_static defines_shared diff --git a/level_3/fss_identify/data/build/settings b/level_3/fss_identify/data/build/settings index 6c5ef33..8c25c3e 100644 --- a/level_3/fss_identify/data/build/settings +++ b/level_3/fss_identify/data/build/settings @@ -47,7 +47,8 @@ search_exclusive yes search_shared yes search_static yes -defines_all +#defines_all -D_di_libcap_ -D_di_thread_support_ +defines_all -D_libcap_legacy_only_ -D_pthread_attr_unsupported_ -D_pthread_sigqueue_unsupported_ defines_static defines_shared diff --git a/level_3/fss_status_code/data/build/settings b/level_3/fss_status_code/data/build/settings index 4ac98f2..7cbf71d 100644 --- a/level_3/fss_status_code/data/build/settings +++ b/level_3/fss_status_code/data/build/settings @@ -47,7 +47,8 @@ search_exclusive yes search_shared yes search_static yes -defines_all +#defines_all -D_di_libcap_ -D_di_thread_support_ +defines_all -D_libcap_legacy_only_ -D_pthread_attr_unsupported_ -D_pthread_sigqueue_unsupported_ defines_static defines_shared diff --git a/level_3/iki_read/data/build/settings b/level_3/iki_read/data/build/settings index dc3d889..b59dff4 100644 --- a/level_3/iki_read/data/build/settings +++ b/level_3/iki_read/data/build/settings @@ -47,7 +47,8 @@ search_exclusive yes search_shared yes search_static yes -defines_all +#defines_all -D_di_libcap_ -D_di_thread_support_ +defines_all -D_libcap_legacy_only_ -D_pthread_attr_unsupported_ -D_pthread_sigqueue_unsupported_ defines_static defines_shared diff --git a/level_3/iki_write/data/build/settings b/level_3/iki_write/data/build/settings index 23ca09d..6c56358 100644 --- a/level_3/iki_write/data/build/settings +++ b/level_3/iki_write/data/build/settings @@ -47,7 +47,8 @@ search_exclusive yes search_shared yes search_static yes -defines_all +#defines_all -D_di_libcap_ -D_di_thread_support_ +defines_all -D_libcap_legacy_only_ -D_pthread_attr_unsupported_ -D_pthread_sigqueue_unsupported_ defines_static defines_shared diff --git a/level_3/status_code/data/build/settings b/level_3/status_code/data/build/settings index b5d63a5..e36a2fc 100644 --- a/level_3/status_code/data/build/settings +++ b/level_3/status_code/data/build/settings @@ -47,7 +47,8 @@ search_exclusive yes search_shared yes search_static yes -defines_all +#defines_all -D_di_libcap_ -D_di_thread_support_ +defines_all -D_libcap_legacy_only_ -D_pthread_attr_unsupported_ -D_pthread_sigqueue_unsupported_ defines_static defines_shared -- 1.8.3.1