From 2275c93c4c0a043f5552b07c7bce4c9519a54a97 Mon Sep 17 00:00:00 2001 From: Kevin Day Date: Tue, 6 Feb 2024 17:20:51 -0600 Subject: [PATCH] Progress: Pull in recent changes from the latest 0.7 development branch. --- data/build/tacocat/settings | 12 ++++++++---- sources/c/tacocat/main/print/error.c | 16 ++++++++-------- sources/c/tacocat/main/print/warning.c | 2 +- 3 files changed, 17 insertions(+), 13 deletions(-) diff --git a/data/build/tacocat/settings b/data/build/tacocat/settings index 82a4dc2..02aaf98 100644 --- a/data/build/tacocat/settings +++ b/data/build/tacocat/settings @@ -7,9 +7,10 @@ # - individual_thread: This is required when compiling in individual mode with "thread" mode. # - level: Compile using per level libraries. # - monolithic: Compile using per monolithic libraries. -# - clang: Use clang rather than the default, which is generally gcc. +# - clang: Use clang rather than the default, which is generally gcc # - test: Compile for a test, such as unit testing. # - fanalyzer: Compile using GCC's -fanalyzer compile time option. +# - coverage: Compile for building coverage. # - thread: Compile with thread support. # - threadless: Compile without thread support. # @@ -22,7 +23,7 @@ version_micro 0 version_file micro version_target minor -modes individual individual_thread level monolithic clang test fanalyzer thread threadless +modes individual individual_thread level monolithic clang test fanalyzer coverage thread threadless modes_default monolithic thread build_compiler gcc @@ -79,10 +80,13 @@ defines-threadless -D_di_thread_support_ defines-thread -D_pthread_attr_unsupported_ -D_pthread_sigqueue_unsupported_ defines-individual_thread -D_pthread_attr_unsupported_ -D_pthread_sigqueue_unsupported_ -flags -O2 -z now -g -fdiagnostics-color=always -Wno-logical-not-parentheses -Wno-parentheses -Wno-missing-braces +flags -O2 -g -fdiagnostics-color=always -Wno-logical-not-parentheses -Wno-parentheses +flags -fstack-clash-protection -fno-delete-null-pointer-checks -fstrict-flex-arrays=3 +flags -D_FORTIFY_SOURCE=3 +flags -Wl,-z,nodlopen -Wl,-z,noexecstack -Wl,-z,relro -Wl,-z,now flags-thread -pthread flags-clang -Wno-logical-op-parentheses -flags-test -O0 -fstack-protector -Wall +flags-test -O0 -fstack-protector-strong -Wall flags-fanalyzer -fanalyzer flags-coverage -O0 --coverage -fprofile-abs-path -fprofile-dir=build/coverage/ diff --git a/sources/c/tacocat/main/print/error.c b/sources/c/tacocat/main/print/error.c index 1452342..7e6ae5f 100644 --- a/sources/c/tacocat/main/print/error.c +++ b/sources/c/tacocat/main/print/error.c @@ -54,7 +54,7 @@ extern "C" { fl_print_format(f_string_format_Q_single_s.string, print->to, print->set->notable, network, print->set->notable); fl_print_format("%[' with file '%]", print->to, print->set->error, print->set->error, f_string_eol_s); fl_print_format(f_string_format_Q_single_s.string, print->to, print->set->notable, name, print->set->notable); - fl_print_format("%['.%]%r", print->to, print->set->error, print->set->error, f_string_eol_s); + fl_print_format(f_string_format_sentence_end_quote_s.string, print->to, print->set->error, print->set->error, f_string_eol_s); f_file_stream_unlock(print->to); @@ -124,7 +124,7 @@ extern "C" { fl_print_format(f_string_format_Q_single_s.string, print->to, print->set->notable, network, print->set->notable); fl_print_format("%[' failed to receive data or write to file '%]", print->to, print->set->error, print->set->error, f_string_eol_s); fl_print_format(f_string_format_Q_single_s.string, print->to, print->set->notable, name, print->set->notable); - fl_print_format("%['.%]%r", print->to, print->set->error, print->set->error, f_string_eol_s); + fl_print_format(f_string_format_sentence_end_quote_s.string, print->to, print->set->error, print->set->error, f_string_eol_s); f_file_stream_unlock(print->to); @@ -146,7 +146,7 @@ extern "C" { fl_print_format(f_string_format_Q_single_s.string, print->to, print->set->notable, network, print->set->notable); fl_print_format("%[' failed to send data or read from file '%]", print->to, print->set->error, print->set->error, f_string_eol_s); fl_print_format(f_string_format_Q_single_s.string, print->to, print->set->notable, name, print->set->notable); - fl_print_format("%['.%]%r", print->to, print->set->error, print->set->error, f_string_eol_s); + fl_print_format(f_string_format_sentence_end_quote_s.string, print->to, print->set->error, print->set->error, f_string_eol_s); f_file_stream_unlock(print->to); @@ -174,7 +174,7 @@ extern "C" { fl_print_format(f_string_format_Q_range_single_s.string, print->to, print->set->notable, buffer, content, print->set->notable); fl_print_format("%[' with a status code of %]", print->to, print->set->error, print->set->error, f_string_eol_s); fl_print_format(f_string_format_ul_single_s.string, print->to, print->set->notable, status, print->set->notable); - fl_print_format("%[.%]%r", print->to, print->set->error, print->set->error, f_string_eol_s); + fl_print_format(f_string_format_sentence_end_s.string, print->to, print->set->error, print->set->error, f_string_eol_s); f_file_stream_unlock(print->to); @@ -194,7 +194,7 @@ extern "C" { fl_print_format(f_string_format_Q_single_s.string, print->to, print->set->notable, on, print->set->notable); fl_print_format(" %[buffer for '%]", print->to, print->set->error, print->set->error, f_string_eol_s); fl_print_format(f_string_format_Q_single_s.string, print->to, print->set->notable, network, print->set->notable); - fl_print_format("%['.%]%r", print->to, print->set->error, print->set->error, f_string_eol_s); + fl_print_format(f_string_format_sentence_end_quote_s.string, print->to, print->set->error, print->set->error, f_string_eol_s); f_file_stream_unlock(print->to); @@ -244,7 +244,7 @@ extern "C" { fl_print_format(f_string_format_Q_single_s.string, print->to, print->set->notable, set->network, print->set->notable); fl_print_format("%[' with file '%]", print->to, print->set->error, print->set->error, f_string_eol_s); fl_print_format(f_string_format_Q_single_s.string, print->to, print->set->notable, set->name, print->set->notable); - fl_print_format("%['.%]%r", print->to, print->set->error, print->set->error, f_string_eol_s); + fl_print_format(f_string_format_sentence_end_quote_s.string, print->to, print->set->error, print->set->error, f_string_eol_s); f_file_stream_unlock(print->to); @@ -340,7 +340,7 @@ extern "C" { fl_print_format(f_string_format_Q_range_single_s.string, print->to, print->set->notable, address, range, print->set->notable); fl_print_format(" %[from the address '%]", print->to, print->set->error, print->set->error, f_string_eol_s); fl_print_format(f_string_format_Q_single_s.string, print->to, print->set->notable, address, print->set->notable); - fl_print_format("%['.%]%r", print->to, print->set->error, print->set->error, f_string_eol_s); + fl_print_format(f_string_format_sentence_end_quote_s.string, print->to, print->set->error, print->set->error, f_string_eol_s); f_file_stream_unlock(print->to); @@ -360,7 +360,7 @@ extern "C" { fl_print_format("%[%ul%]", print->to, print->set->notable, protocol, print->set->notable); fl_print_format(" %[while processing '%]", print->to, print->set->error, print->set->error, f_string_eol_s); fl_print_format(f_string_format_Q_single_s.string, print->to, print->set->notable, name, print->set->notable); - fl_print_format("%['.%]%r", print->to, print->set->error, print->set->error, f_string_eol_s); + fl_print_format(f_string_format_sentence_end_quote_s.string, print->to, print->set->error, print->set->error, f_string_eol_s); f_file_stream_unlock(print->to); diff --git a/sources/c/tacocat/main/print/warning.c b/sources/c/tacocat/main/print/warning.c index fdaf39c..4877ea5 100644 --- a/sources/c/tacocat/main/print/warning.c +++ b/sources/c/tacocat/main/print/warning.c @@ -56,7 +56,7 @@ extern "C" { fl_print_format(f_string_format_Q_single_s.string, print->to, print->set->notable, network, print->set->notable); fl_print_format("%[' failed to write to file '%]", print->to, print->set->warning, print->set->warning, f_string_eol_s); fl_print_format(f_string_format_Q_single_s.string, print->to, print->set->notable, name, print->set->notable); - fl_print_format("%['.%]%r", print->to, print->set->warning, print->set->warning, f_string_eol_s); + fl_print_format(f_string_format_sentence_end_quote_s.string, print->to, print->set->warning, print->set->warning, f_string_eol_s); f_file_stream_unlock(print->to); -- 1.8.3.1