From c50a41a7ac3bb161acb6e08c68c77bba92c361f1 Mon Sep 17 00:00:00 2001 From: Kevin Day Date: Thu, 1 Aug 2024 21:21:54 -0500 Subject: [PATCH] Update: Project structure with latest practices and improve header file define wrappers. The ifdef wrappers used for each header file is updated to be more accurate in regards to the directory and file path structure. --- .gitignore | 8 ++ data/build/fakefile | 4 +- data/build/remove/fakefile | 3 +- data/build/remove/settings | 12 ++- data/build/remove/settings.remove | 96 ++++++++++++++++++++++ data/build/tacocat/fakefile | 3 +- data/build/tacocat/settings | 10 +-- data/build/tacocat/settings.tacocat | 95 +++++++++++++++++++++ sources/c/program/remove/main/common.h | 6 +- sources/c/program/remove/main/common/string.c | 5 -- sources/c/program/remove/main/common/string.h | 6 -- sources/c/program/remove/main/convert.h | 6 +- sources/c/program/remove/main/operate.h | 6 +- sources/c/program/remove/main/remove.c | 7 -- sources/c/program/remove/main/remove.h | 6 +- sources/c/program/remove/main/signal.h | 6 +- sources/c/program/remove/main/thread.h | 6 +- sources/c/program/remove/remove/config.c | 1 + sources/c/program/remove/remove/config.h | 0 sources/c/program/remove/{main => remove}/main.c | 2 +- sources/c/program/remove/{main => remove}/main.h | 6 +- sources/c/program/remove/remove/remove.c | 9 ++ sources/c/program/remove/remove/remove.h | 25 ++++++ sources/c/program/remove/remove/string.c | 14 ++++ sources/c/program/remove/remove/string.h | 34 ++++++++ sources/c/program/tacocat/main/common.h | 7 +- sources/c/program/tacocat/main/common/define.h | 6 +- .../c/program/tacocat/main/common/enumeration.h | 6 +- sources/c/program/tacocat/main/common/print.h | 6 +- sources/c/program/tacocat/main/common/string.c | 5 -- sources/c/program/tacocat/main/common/string.h | 12 +-- sources/c/program/tacocat/main/common/type.h | 6 +- sources/c/program/tacocat/main/packet.h | 6 +- sources/c/program/tacocat/main/process.h | 6 +- sources/c/program/tacocat/main/receive.h | 6 +- sources/c/program/tacocat/main/send.h | 6 +- sources/c/program/tacocat/main/signal.h | 6 +- sources/c/program/tacocat/main/tacocat.h | 8 +- sources/c/program/tacocat/main/thread.h | 6 +- sources/c/program/tacocat/tacocat/config.c | 1 + sources/c/program/tacocat/tacocat/config.h | 0 sources/c/program/tacocat/{main => tacocat}/main.c | 0 sources/c/program/tacocat/{main => tacocat}/main.h | 10 +-- sources/c/program/tacocat/tacocat/string.c | 14 ++++ sources/c/program/tacocat/tacocat/string.h | 34 ++++++++ sources/c/program/tacocat/tacocat/tacocat.c | 9 ++ sources/c/program/tacocat/tacocat/tacocat.h | 25 ++++++ 47 files changed, 449 insertions(+), 112 deletions(-) create mode 100644 data/build/remove/settings.remove create mode 100644 data/build/tacocat/settings.tacocat create mode 100644 sources/c/program/remove/remove/config.c create mode 100644 sources/c/program/remove/remove/config.h rename sources/c/program/remove/{main => remove}/main.c (99%) rename sources/c/program/remove/{main => remove}/main.h (88%) create mode 100644 sources/c/program/remove/remove/remove.c create mode 100644 sources/c/program/remove/remove/remove.h create mode 100644 sources/c/program/remove/remove/string.c create mode 100644 sources/c/program/remove/remove/string.h create mode 100644 sources/c/program/tacocat/tacocat/config.c create mode 100644 sources/c/program/tacocat/tacocat/config.h rename sources/c/program/tacocat/{main => tacocat}/main.c (100%) rename sources/c/program/tacocat/{main => tacocat}/main.h (79%) create mode 100644 sources/c/program/tacocat/tacocat/string.c create mode 100644 sources/c/program/tacocat/tacocat/string.h create mode 100644 sources/c/program/tacocat/tacocat/tacocat.c create mode 100644 sources/c/program/tacocat/tacocat/tacocat.h diff --git a/.gitignore b/.gitignore index 84c048a..ebdab6f 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,9 @@ /build/ +/build/* + +# Disclude FLL sources dropped for stand alone building. +sources/c/fll + +# Do not include the local configuration sources. +sources/c/config.c +sources/c/config.h diff --git a/data/build/fakefile b/data/build/fakefile index c2131b9..a09c4e8 100644 --- a/data/build/fakefile +++ b/data/build/fakefile @@ -2,14 +2,16 @@ settings: fail exit - modes individual level monolithic clang test fanalyzer coverage threaded threadless + modes individual individual_thread level monolithic clang gcc gcc_13 test fanalyzer coverage thread threadless environment PATH LD_LIBRARY_PATH environment LANG LC_ALL LC_COLLATE LC_CTYPE LC_FASTMSG LC_MESSAGES LC_MONETARY LC_NUMERIC LC_TIME LOCPATH NLSPATH main: build remove/settings + build remove/settings.remove build tacocat/settings + build tacocat/settings.tacocat install: shell ./install.sh parameter:'work' parameter:'verbosity' parameter:'color' -s data/remove/build/settings diff --git a/data/build/remove/fakefile b/data/build/remove/fakefile index fd166cb..60048da 100644 --- a/data/build/remove/fakefile +++ b/data/build/remove/fakefile @@ -2,13 +2,14 @@ settings: fail exit - modes individual level monolithic clang test fanalyzer coverage threaded threadless + modes individual individual_thread level monolithic clang gcc gcc_13 test fanalyzer coverage thread threadless environment PATH LD_LIBRARY_PATH environment LANG LC_ALL LC_COLLATE LC_CTYPE LC_FASTMSG LC_MESSAGES LC_MONETARY LC_NUMERIC LC_TIME LOCPATH NLSPATH main: build settings + build settings.remove install: shell ./install.sh parameter:'work' parameter:'verbosity' parameter:'color' diff --git a/data/build/remove/settings b/data/build/remove/settings index 4d0c759..04d9ddf 100644 --- a/data/build/remove/settings +++ b/data/build/remove/settings @@ -1,6 +1,6 @@ # fss-0001 # -# Builds the main remove program of the project. +# Builds the remove library of the project. # # Modes: # - individual: Compile using per project (individual) libraries, does not handle thread or threadless cases. @@ -41,11 +41,9 @@ build_libraries-individual_thread -lf_thread build_libraries-level -lfll_2 -lfll_1 -lfll_0 build_libraries-monolithic -lfll -build_sources_library main/common.c main/common/define.c main/common/enumeration.c main/common/print.c main/common/string.c main/common/type.c main/convert.c main/operate.c main/print/error.c main/print/message.c main/print/simulate.c main/print/verbose.c main/print/warning.c main/remove.c main/signal.c main/thread.c +build_sources_library common.c common/define.c common/enumeration.c common/print.c common/string.c common/type.c convert.c operate.c print/error.c print/message.c print/simulate.c print/verbose.c print/warning.c remove.c signal.c thread.c -build_sources_headers main/common.h main/common/define.h main/common/enumeration.h main/common/print.h main/common/string.h main/common/type.h main/convert.h main/operate.h main/print/error.h main/print/message.h main/print/simulate.h main/print/verbose.h main/print/warning.h main/remove.h main/signal.h main/thread.h - -build_sources_program main/main.c +build_sources_headers common.h common/define.h common/enumeration.h common/print.h common/string.h common/type.h convert.h operate.h print/error.h print/message.h print/simulate.h print/verbose.h print/warning.h remove.h signal.h thread.h build_sources_documentation man @@ -53,7 +51,7 @@ build_script yes build_shared yes build_static no -path_headers program/kevux/tools/remove +path_headers program/kevux/tools/remove/main path_library_script script path_library_shared shared path_library_static static @@ -63,7 +61,7 @@ path_object_static static path_program_script script path_program_shared shared path_program_static static -path_sources sources/c/program/remove +path_sources sources/c/program/remove/main has_path_standard no preserve_path_headers yes diff --git a/data/build/remove/settings.remove b/data/build/remove/settings.remove new file mode 100644 index 0000000..3e5ea11 --- /dev/null +++ b/data/build/remove/settings.remove @@ -0,0 +1,96 @@ +# fss-0001 +# +# Builds the remove program of the project. +# +# Modes: +# - individual: Compile using per project (individual) libraries, does not handle thread or threadless cases. +# - 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. +# - gcc: Use gcc specific settings. +# - gcc_13: Use gcc version 13 or greater specific settings. +# - 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. +# + +build_name remove +stage remove + +version_major 0 +version_minor 5 +version_micro 0 +version_file micro +version_target minor + +modes individual individual_thread level monolithic clang gcc gcc_13 test fanalyzer coverage thread threadless +modes_default monolithic thread gcc + +build_compiler gcc +build_compiler-clang clang +build_indexer ar +build_indexer_arguments rcs +build_language c + +build_libraries -lc -lremove +build_libraries-individual -lfll_error -lfll_print -lfll_program -lfl_conversion -fl_directory -lfl_print -lf_account -lf_color -lf_compare -lf_console -lf_conversion -lf_directory -lf_file -lf_memory -lf_pipe -lf_print -lf_rip -lf_signal -lf_string -lf_type_array -lf_utf +build_libraries-individual_thread -lf_thread +build_libraries-level -lfll_2 -lfll_1 -lfll_0 +build_libraries-monolithic -lfll + +build_sources_program config.c remove.c main.c string.c + +build_sources_headers remove.h string.h + +build_sources_documentation man + +build_script yes +build_shared yes +build_static no + +path_headers program/kevux/tools/remove/remove +path_library_script script +path_library_shared shared +path_library_static static +path_object_script script +path_object_shared shared +path_object_static static +path_program_script script +path_program_shared shared +path_program_static static +path_sources sources/c/program/remove/remove + +has_path_standard no +preserve_path_headers yes + +search_exclusive yes +search_shared yes +search_static yes + +environment PATH LD_LIBRARY_PATH +environment LANG LC_ALL LC_COLLATE LC_CTYPE LC_FASTMSG LC_MESSAGES LC_MONETARY LC_NUMERIC LC_TIME LOCPATH NLSPATH + +#defines -D_di_libcap_ +defines -D_libcap_legacy_only_ +defines-threadless -D_di_thread_support_ +defines-thread -D_pthread_attr_unsupported_ -D_pthread_sigqueue_unsupported_ + +# This is needed for glibc and strptime() usage. +defines -D_GNU_SOURCE=1 + +flags -O2 -g -fdiagnostics-color=always -Wno-logical-not-parentheses -Wno-parentheses -Wno-missing-braces +flags -fstack-clash-protection -fno-delete-null-pointer-checks +flags -Wl,-z,nodlopen -Wl,-z,noexecstack -Wl,-z,relro -Wl,-z,now +flags-thread -pthread +flags-clang -Wno-logical-op-parentheses +flags-gcc_13 -fstrict-flex-arrays=3 +flags-test -O0 -fstack-protector-strong -Wall +flags-fanalyzer -fanalyzer +flags-coverage -O0 --coverage -fprofile-abs-path -fprofile-dir=build/coverage/ + +flags_library -fPIC +flags_object -fPIC +flags_program -fPIE diff --git a/data/build/tacocat/fakefile b/data/build/tacocat/fakefile index 4813f0f..ead4211 100644 --- a/data/build/tacocat/fakefile +++ b/data/build/tacocat/fakefile @@ -2,13 +2,14 @@ settings: fail exit - modes individual level monolithic clang test fanalyzer coverage threaded threadless + modes individual individual_thread level monolithic clang gcc gcc_13 test fanalyzer coverage thread threadless environment PATH LD_LIBRARY_PATH environment LANG LC_ALL LC_COLLATE LC_CTYPE LC_FASTMSG LC_MESSAGES LC_MONETARY LC_NUMERIC LC_TIME LOCPATH NLSPATH main: build settings + build settings.tacocat install: shell ./install.sh parameter:'work' parameter:'verbosity' parameter:'color' diff --git a/data/build/tacocat/settings b/data/build/tacocat/settings index 0e007c3..6c0410a 100644 --- a/data/build/tacocat/settings +++ b/data/build/tacocat/settings @@ -43,11 +43,9 @@ build_libraries-individual_thread -lf_thread build_libraries-level -lfll_2 -lfll_1 -lfll_0 build_libraries-monolithic -lfll -build_sources_library main/common.c main/common/define.c main/common/enumeration.c main/common/print.c main/common/string.c main/common/type.c main/print/error.c main/print/message.c main/print/verbose.c main/print/warning.c main/packet.c main/process.c main/receive.c main/send.c main/signal.c main/tacocat.c main/thread.c +build_sources_library common.c common/define.c common/enumeration.c common/print.c common/string.c common/type.c print/error.c print/message.c print/verbose.c print/warning.c packet.c process.c receive.c send.c signal.c tacocat.c thread.c -build_sources_headers main/common.h main/common/define.h main/common/enumeration.h main/common/print.h main/common/string.h main/common/type.h main/print/error.h main/print/message.h main/print/verbose.h main/print/warning.h main/packet.h main/process.h main/receive.h main/send.h main/signal.h main/tacocat.h main/thread.h - -build_sources_program main/main.c +build_sources_headers common.h common/define.h common/enumeration.h common/print.h common/string.h common/type.h print/error.h print/message.h print/verbose.h print/warning.h packet.h process.h receive.h send.h signal.h tacocat.h thread.h build_sources_documentation man @@ -55,7 +53,7 @@ build_script yes build_shared yes build_static no -path_headers program/kevux/tools/tacocat +path_headers program/kevux/tools/tacocat/main path_library_script script path_library_shared shared path_library_static static @@ -65,7 +63,7 @@ path_object_static static path_program_script script path_program_shared shared path_program_static static -path_sources sources/c/program/tacocat +path_sources sources/c/program/tacocat/main has_path_standard no preserve_path_headers yes diff --git a/data/build/tacocat/settings.tacocat b/data/build/tacocat/settings.tacocat new file mode 100644 index 0000000..f6ea54e --- /dev/null +++ b/data/build/tacocat/settings.tacocat @@ -0,0 +1,95 @@ +# fss-0001 +# +# Builds the main tacocat program of the project. +# +# Modes: +# - individual: Compile using per project (individual) libraries, does not handle thread or threadless cases. +# - 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 +# - gcc: Use gcc specific settings. +# - gcc_13: Use gcc version 13 or greater specific settings. +# - 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. +# + +build_name tacocat +stage tacocat + +version_major 0 +version_minor 5 +version_micro 0 +version_file micro +version_target minor + +modes individual individual_thread level monolithic clang gcc gcc_13 test fanalyzer coverage thread threadless +modes_default monolithic thread gcc + +build_compiler gcc +build_compiler-clang clang +build_indexer ar +build_indexer_arguments rcs +build_language c + +build_libraries -lc -ltacocat +build_libraries-individual -lfll_error -lfll_fss -lfll_print -lfll_program +build_libraries-individual -lfl_conversion -lfl_fss -lfl_print -lfl_status_string +build_libraries-individual -lf_abstruse -lf_color -lf_compare -lf_console -lf_conversion -lf_file -lf_fss -lf_memory -lf_network -lf_parse -lf_path -lf_pipe -lf_print -lf_random -lf_rip -lf_signal -lf_socket -lf_status_string -lf_string -lf_time -lf_type_array -lf_utf +build_libraries-individual_thread -lf_thread +build_libraries-level -lfll_2 -lfll_1 -lfll_0 +build_libraries-monolithic -lfll + +build_sources_program config.c tacocat.c main.c string.c + +build_sources_headers tacocat.h string.h + +build_sources_documentation man + +build_script yes +build_shared yes +build_static no + +path_headers program/kevux/tools/tacocat/tacocat +path_library_script script +path_library_shared shared +path_library_static static +path_object_script script +path_object_shared shared +path_object_static static +path_program_script script +path_program_shared shared +path_program_static static +path_sources sources/c/program/tacocat/tacocat + +has_path_standard no +preserve_path_headers yes + +search_exclusive yes +search_shared yes +search_static yes + +environment PATH LD_LIBRARY_PATH +environment LANG LC_ALL LC_COLLATE LC_CTYPE LC_FASTMSG LC_MESSAGES LC_MONETARY LC_NUMERIC LC_TIME LOCPATH NLSPATH + +#defines -D_di_libcap_ +defines -D_libcap_legacy_only_ +defines-threadless -D_di_thread_support_ +defines-thread -D_pthread_attr_unsupported_ -D_pthread_sigqueue_unsupported_ + +flags -O2 -g -fdiagnostics-color=always -Wno-logical-not-parentheses -Wno-parentheses -Wno-missing-braces +flags -fstack-clash-protection -fno-delete-null-pointer-checks +flags -Wl,-z,nodlopen -Wl,-z,noexecstack -Wl,-z,relro -Wl,-z,now +flags-thread -pthread +flags-clang -Wno-logical-op-parentheses +flags-gcc_13 -fstrict-flex-arrays=3 +flags-test -O0 -fstack-protector-strong -Wall +flags-fanalyzer -fanalyzer +flags-coverage -O0 --coverage -fprofile-abs-path -fprofile-dir=build/coverage/ + +flags_library -fPIC +flags_object -fPIC +flags_program -fPIE diff --git a/sources/c/program/remove/main/common.h b/sources/c/program/remove/main/common.h index efe1100..e6e0259 100644 --- a/sources/c/program/remove/main/common.h +++ b/sources/c/program/remove/main/common.h @@ -9,8 +9,8 @@ * * This is auto-included and should not need to be explicitly included. */ -#ifndef _kt_remove_common_h -#define _kt_remove_common_h +#ifndef _kt_remove_main_common_h +#define _kt_remove_main_common_h #ifdef __cplusplus extern "C" { @@ -92,4 +92,4 @@ extern "C" { } // extern "C" #endif -#endif // _kt_remove_common_h +#endif // _kt_remove_main_common_h diff --git a/sources/c/program/remove/main/common/string.c b/sources/c/program/remove/main/common/string.c index cf192b3..3a8867f 100644 --- a/sources/c/program/remove/main/common/string.c +++ b/sources/c/program/remove/main/common/string.c @@ -8,11 +8,6 @@ extern "C" { const f_string_static_t kt_remove_program_version_s = macro_f_string_static_t_initialize_1(KT_REMOVE_program_version_s, 0, KT_REMOVE_program_version_s_length); #endif // _di_kt_remove_program_version_s_ -#ifndef _di_kt_remove_program_name_s_ - const f_string_static_t kt_remove_program_name_s = macro_f_string_static_t_initialize_1(KT_REMOVE_program_name_s, 0, KT_REMOVE_program_name_s_length); - const f_string_static_t kt_remove_program_name_long_s = macro_f_string_static_t_initialize_1(KT_REMOVE_program_name_long_s, 0, KT_REMOVE_program_name_long_s_length); -#endif // _di_kt_remove_program_name_s_ - #ifndef kt_remove_program_help_parameters_s_ const f_string_static_t kt_remove_program_help_parameters_s = macro_f_string_static_t_initialize_1(KT_REMOVE_program_help_parameters_s, 0, KT_REMOVE_program_help_parameters_s_length); #endif // _di_utf8_program_help_parameters_s_ diff --git a/sources/c/program/remove/main/common/string.h b/sources/c/program/remove/main/common/string.h index afaf3ee..3a17234 100644 --- a/sources/c/program/remove/main/common/string.h +++ b/sources/c/program/remove/main/common/string.h @@ -49,12 +49,6 @@ extern "C" { * The program name. */ #ifndef _di_kt_remove_program_name_s_ - #define KT_REMOVE_program_name_s "remove" - #define KT_REMOVE_program_name_long_s "Remove" - - #define KT_REMOVE_program_name_s_length 6 - #define KT_REMOVE_program_name_long_s_length 6 - extern const f_string_static_t kt_remove_program_name_s; extern const f_string_static_t kt_remove_program_name_long_s; #endif // _di_kt_remove_program_name_s_ diff --git a/sources/c/program/remove/main/convert.h b/sources/c/program/remove/main/convert.h index d3aef9c..0985b1d 100644 --- a/sources/c/program/remove/main/convert.h +++ b/sources/c/program/remove/main/convert.h @@ -5,8 +5,8 @@ * API Version: 0.5 * Licenses: lgpl-2.1-or-later */ -#ifndef _kt_remove_convert_h -#define _kt_remove_convert_h +#ifndef _kt_remove_main_convert_h +#define _kt_remove_main_convert_h #ifdef __cplusplus extern "C" { @@ -206,4 +206,4 @@ extern "C" { } // extern "C" #endif -#endif // _kt_remove_convert_h +#endif // _kt_remove_main_convert_h diff --git a/sources/c/program/remove/main/operate.h b/sources/c/program/remove/main/operate.h index 23084a6..f35afcb 100644 --- a/sources/c/program/remove/main/operate.h +++ b/sources/c/program/remove/main/operate.h @@ -5,8 +5,8 @@ * API Version: 0.5 * Licenses: lgpl-2.1-or-later */ -#ifndef _kt_remove_operate_h -#define _kt_remove_operate_h +#ifndef _kt_remove_main_operate_h +#define _kt_remove_main_operate_h #ifdef __cplusplus extern "C" { @@ -163,4 +163,4 @@ extern "C" { } // extern "C" #endif -#endif // _kt_remove_operate_h +#endif // _kt_remove_main_operate_h diff --git a/sources/c/program/remove/main/remove.c b/sources/c/program/remove/main/remove.c index 4be11dd..4191c81 100644 --- a/sources/c/program/remove/main/remove.c +++ b/sources/c/program/remove/main/remove.c @@ -56,14 +56,7 @@ extern "C" { if (!main) return; - f_thread_id_t id_signal; - - memset(&id_signal, 0, sizeof(f_thread_id_t)); - kt_remove_process_normal_operate(((kt_remove_main_t *) main)); - - f_thread_cancel(id_signal); - f_thread_join(id_signal, 0); } #endif // _di_kt_remove_process_normal_ diff --git a/sources/c/program/remove/main/remove.h b/sources/c/program/remove/main/remove.h index c39668b..b481e1f 100644 --- a/sources/c/program/remove/main/remove.h +++ b/sources/c/program/remove/main/remove.h @@ -7,8 +7,8 @@ * * This program provides a program to perform file, directory, and symbolic link remove file removals. */ -#ifndef _kt_remove_h -#define _kt_remove_h +#ifndef _kt_remove_main_remove_h +#define _kt_remove_main_remove_h // Libc includes. #include @@ -149,4 +149,4 @@ extern "C" { } // extern "C" #endif -#endif // _kt_remove_h +#endif // _kt_remove_main_remove_h diff --git a/sources/c/program/remove/main/signal.h b/sources/c/program/remove/main/signal.h index 1726994..073b08e 100644 --- a/sources/c/program/remove/main/signal.h +++ b/sources/c/program/remove/main/signal.h @@ -5,8 +5,8 @@ * API Version: 0.5 * Licenses: lgpl-2.1-or-later */ -#ifndef _kt_remove_signal_h -#define _kt_remove_signal_h +#ifndef _kt_remove_main_signal_h +#define _kt_remove_main_signal_h #ifdef __cplusplus extern "C" { @@ -79,4 +79,4 @@ extern "C" { } // extern "C" #endif -#endif // _kt_remove_signal_h +#endif // _kt_remove_main_signal_h diff --git a/sources/c/program/remove/main/thread.h b/sources/c/program/remove/main/thread.h index 24ded36..9147f35 100644 --- a/sources/c/program/remove/main/thread.h +++ b/sources/c/program/remove/main/thread.h @@ -5,8 +5,8 @@ * API Version: 0.5 * Licenses: lgpl-2.1-or-later */ -#ifndef _kt_remove_thread_h -#define _kt_remove_thread_h +#ifndef _kt_remove_main_thread_h +#define _kt_remove_main_thread_h #ifdef __cplusplus extern "C" { @@ -43,4 +43,4 @@ extern "C" { } // extern "C" #endif -#endif // _kt_remove_thread_h +#endif // _kt_remove_main_thread_h diff --git a/sources/c/program/remove/remove/config.c b/sources/c/program/remove/remove/config.c new file mode 100644 index 0000000..1ac2545 --- /dev/null +++ b/sources/c/program/remove/remove/config.c @@ -0,0 +1 @@ +#include "config.h" diff --git a/sources/c/program/remove/remove/config.h b/sources/c/program/remove/remove/config.h new file mode 100644 index 0000000..e69de29 diff --git a/sources/c/program/remove/main/main.c b/sources/c/program/remove/remove/main.c similarity index 99% rename from sources/c/program/remove/main/main.c rename to sources/c/program/remove/remove/main.c index 52883dd..1854a3f 100644 --- a/sources/c/program/remove/main/main.c +++ b/sources/c/program/remove/remove/main.c @@ -52,7 +52,7 @@ int main(const int argc, const f_string_t *argv, const f_string_t *envp) { kt_remove_setting_load(arguments, &data); } - status_code_main(&data); + kt_remove_main(&data); #else { f_thread_id_t id_signal; diff --git a/sources/c/program/remove/main/main.h b/sources/c/program/remove/remove/main.h similarity index 88% rename from sources/c/program/remove/main/main.h rename to sources/c/program/remove/remove/main.h index f57355f..3cd9474 100644 --- a/sources/c/program/remove/main/main.h +++ b/sources/c/program/remove/remove/main.h @@ -8,8 +8,8 @@ * This file is only ever included by main.c and should not normally be included anywhere else. * Anything that wants to include this should be providing the "remove" program functionality in some manner. */ -#ifndef _kt_remove_main_h -#define _kt_remove_main_h +#ifndef _kt_remove_remove_main_h +#define _kt_remove_remove_main_h #ifdef __cplusplus extern "C" { @@ -35,4 +35,4 @@ extern int main(const int argc, const f_string_t *argv, const f_string_t *envp); } // extern "C" #endif -#endif // _kt_remove_main_h +#endif // _kt_remove_remove_main_h diff --git a/sources/c/program/remove/remove/remove.c b/sources/c/program/remove/remove/remove.c new file mode 100644 index 0000000..97cae6c --- /dev/null +++ b/sources/c/program/remove/remove/remove.c @@ -0,0 +1,9 @@ +#include "remove.h" + +#ifdef __cplusplus +extern "C" { +#endif + +#ifdef __cplusplus +} // extern "C" +#endif diff --git a/sources/c/program/remove/remove/remove.h b/sources/c/program/remove/remove/remove.h new file mode 100644 index 0000000..1ff2e3b --- /dev/null +++ b/sources/c/program/remove/remove/remove.h @@ -0,0 +1,25 @@ +/** + * FLL - Level 3 + * + * Project: Kevux Tools + * API Version: 0.7 + * Licenses: lgpl-2.1-or-later + * + * This program provides the base include for the remove program. + */ +#ifndef _kt_remove_remove_remove_h +#define _kt_remove_remove_remove_h + +// Remove includes. +#include +#include + +#ifdef __cplusplus +extern "C" { +#endif + +#ifdef __cplusplus +} // extern "C" +#endif + +#endif // _kt_remove_remove_remove_h diff --git a/sources/c/program/remove/remove/string.c b/sources/c/program/remove/remove/string.c new file mode 100644 index 0000000..2ce068d --- /dev/null +++ b/sources/c/program/remove/remove/string.c @@ -0,0 +1,14 @@ +#include "remove.h" + +#ifdef __cplusplus +extern "C" { +#endif + +#ifndef _di_remove_program_name_s_ + const f_string_static_t kt_remove_program_name_s = macro_f_string_static_t_initialize_1(KT_REMOVE_program_name_s, 0, KT_REMOVE_program_name_s_length); + const f_string_static_t kt_remove_program_name_long_s = macro_f_string_static_t_initialize_1(KT_REMOVE_program_name_long_s, 0, KT_REMOVE_program_name_long_s_length); +#endif // _di_remove_program_name_s_ + +#ifdef __cplusplus +} // extern "C" +#endif diff --git a/sources/c/program/remove/remove/string.h b/sources/c/program/remove/remove/string.h new file mode 100644 index 0000000..1bacfb7 --- /dev/null +++ b/sources/c/program/remove/remove/string.h @@ -0,0 +1,34 @@ +/** + * FLL - Level 3 + * + * Project: Kevux Tools + * API Version: 0.7 + * Licenses: lgpl-2.1-or-later + * + * Provides the common string structures for the remove program. + * + * This is auto-included and should not need to be explicitly included. + */ +#ifndef _kt_remove_remove_string_h +#define _kt_remove_remove_string_h + +#ifdef __cplusplus +extern "C" { +#endif + +/** + * The program name. + */ +#ifndef _di_kt_remove_program_name_s_ + #define KT_REMOVE_program_name_s "remove" + #define KT_REMOVE_program_name_long_s "Remove" + + #define KT_REMOVE_program_name_s_length 6 + #define KT_REMOVE_program_name_long_s_length 6 +#endif // _di_kt_remove_program_name_s_ + +#ifdef __cplusplus +} // extern "C" +#endif + +#endif // _kt_remove_remove_string_h diff --git a/sources/c/program/tacocat/main/common.h b/sources/c/program/tacocat/main/common.h index 753b95f..2863573 100644 --- a/sources/c/program/tacocat/main/common.h +++ b/sources/c/program/tacocat/main/common.h @@ -9,8 +9,8 @@ * * This is auto-included and should not need to be explicitly included. */ -#ifndef _kt_tacocat_common_h -#define _kt_tacocat_common_h +#ifndef _kt_tacocat_main_common_h +#define _kt_tacocat_main_common_h #ifdef __cplusplus extern "C" { @@ -139,4 +139,5 @@ extern "C" { } // extern "C" #endif -#endif // _kt_tacocat_common_h +#endif // _kt_tacocat_main_common_h + diff --git a/sources/c/program/tacocat/main/common/define.h b/sources/c/program/tacocat/main/common/define.h index 5a71168..9d3869e 100644 --- a/sources/c/program/tacocat/main/common/define.h +++ b/sources/c/program/tacocat/main/common/define.h @@ -9,8 +9,8 @@ * * This is auto-included and should not need to be explicitly included. */ -#ifndef _kt_tacocat_common_define_h -#define _kt_tacocat_common_define_h +#ifndef _kt_tacocat_main_common_define_h +#define _kt_tacocat_main_common_define_h #ifdef __cplusplus extern "C" { @@ -316,4 +316,4 @@ extern "C" { } // extern "C" #endif -#endif // _kt_tacocat_common_define_h +#endif // _kt_tacocat_main_common_define_h diff --git a/sources/c/program/tacocat/main/common/enumeration.h b/sources/c/program/tacocat/main/common/enumeration.h index ce59693..49afe90 100644 --- a/sources/c/program/tacocat/main/common/enumeration.h +++ b/sources/c/program/tacocat/main/common/enumeration.h @@ -9,8 +9,8 @@ * * This is auto-included and should not need to be explicitly included. */ -#ifndef _kt_tacocat_common_enumeration_h -#define _kt_tacocat_common_enumeration_h +#ifndef _kt_tacocat_main_common_enumeration_h +#define _kt_tacocat_main_common_enumeration_h #ifdef __cplusplus extern "C" { @@ -116,4 +116,4 @@ extern "C" { } // extern "C" #endif -#endif // _kt_tacocat_common_enumeration_h +#endif // _kt_tacocat_main_common_enumeration_h diff --git a/sources/c/program/tacocat/main/common/print.h b/sources/c/program/tacocat/main/common/print.h index d1556a1..49dc9fa 100644 --- a/sources/c/program/tacocat/main/common/print.h +++ b/sources/c/program/tacocat/main/common/print.h @@ -9,8 +9,8 @@ * * This is auto-included and should not need to be explicitly included. */ -#ifndef _kt_tacocat_common_print_h -#define _kt_tacocat_common_print_h +#ifndef _kt_tacocat_main_common_print_h +#define _kt_tacocat_main_common_print_h #ifdef __cplusplus extern "C" { @@ -91,4 +91,4 @@ extern "C" { } // extern "C" #endif -#endif // _kt_tacocat_common_print_h +#endif // _kt_tacocat_main_common_print_h diff --git a/sources/c/program/tacocat/main/common/string.c b/sources/c/program/tacocat/main/common/string.c index 4b17022..bf5fbef 100644 --- a/sources/c/program/tacocat/main/common/string.c +++ b/sources/c/program/tacocat/main/common/string.c @@ -8,11 +8,6 @@ extern "C" { const f_string_static_t kt_tacocat_program_version_s = macro_f_string_static_t_initialize_1(KT_TACOCAT_program_version_s, 0, KT_TACOCAT_program_version_s_length); #endif // _di_kt_tacocat_program_version_s_ -#ifndef _di_kt_tacocat_program_name_s_ - const f_string_static_t kt_tacocat_program_name_s = macro_f_string_static_t_initialize_1(KT_TACOCAT_program_name_s, 0, KT_TACOCAT_program_name_s_length); - const f_string_static_t kt_tacocat_program_name_long_s = macro_f_string_static_t_initialize_1(KT_TACOCAT_program_name_long_s, 0, KT_TACOCAT_program_name_long_s_length); -#endif // _di_kt_tacocat_program_name_s_ - #ifndef kt_tacocat_program_help_parameters_s_ // Not used. #endif // _di_utf8_program_help_parameters_s_ diff --git a/sources/c/program/tacocat/main/common/string.h b/sources/c/program/tacocat/main/common/string.h index 8215704..370fd9d 100644 --- a/sources/c/program/tacocat/main/common/string.h +++ b/sources/c/program/tacocat/main/common/string.h @@ -9,8 +9,8 @@ * * This is auto-included and should not need to be explicitly included. */ -#ifndef _kt_tacocat_common_string_h -#define _kt_tacocat_common_string_h +#ifndef _kt_tacocat_main_common_string_h +#define _kt_tacocat_main_common_string_h #ifdef __cplusplus extern "C" { @@ -49,12 +49,6 @@ extern "C" { * The program name. */ #ifndef _di_kt_tacocat_program_name_s_ - #define KT_TACOCAT_program_name_s "tacocat" - #define KT_TACOCAT_program_name_long_s "TacocaT" - - #define KT_TACOCAT_program_name_s_length 7 - #define KT_TACOCAT_program_name_long_s_length 7 - extern const f_string_static_t kt_tacocat_program_name_s; extern const f_string_static_t kt_tacocat_program_name_long_s; #endif // _di_kt_tacocat_program_name_s_ @@ -193,4 +187,4 @@ extern "C" { } // extern "C" #endif -#endif // _kt_tacocat_common_string_h +#endif // _kt_tacocat_main_common_string_h diff --git a/sources/c/program/tacocat/main/common/type.h b/sources/c/program/tacocat/main/common/type.h index 5f390e3..ffe226d 100644 --- a/sources/c/program/tacocat/main/common/type.h +++ b/sources/c/program/tacocat/main/common/type.h @@ -9,8 +9,8 @@ * * This is auto-included and should not need to be explicitly included. */ -#ifndef _kt_tacocat_common_type_h -#define _kt_tacocat_common_type_h +#ifndef _kt_tacocat_main_common_type_h +#define _kt_tacocat_main_common_type_h #ifdef __cplusplus extern "C" { @@ -481,4 +481,4 @@ extern "C" { } // extern "C" #endif -#endif // _kt_tacocat_common_type_h +#endif // _kt_tacocat_main_common_type_h diff --git a/sources/c/program/tacocat/main/packet.h b/sources/c/program/tacocat/main/packet.h index 13ce42e..514316a 100644 --- a/sources/c/program/tacocat/main/packet.h +++ b/sources/c/program/tacocat/main/packet.h @@ -5,8 +5,8 @@ * API Version: 0.5 * Licenses: lgpl-2.1-or-later */ -#ifndef _kt_tacocat_packet_h -#define _kt_tacocat_packet_h +#ifndef _kt_tacocat_main_packet_h +#define _kt_tacocat_main_packet_h #ifdef __cplusplus extern "C" { @@ -116,4 +116,4 @@ extern "C" { } // extern "C" #endif -#endif // _kt_tacocat_packet_h +#endif // _kt_tacocat_main_packet_h diff --git a/sources/c/program/tacocat/main/process.h b/sources/c/program/tacocat/main/process.h index 472f5c5..b68f18b 100644 --- a/sources/c/program/tacocat/main/process.h +++ b/sources/c/program/tacocat/main/process.h @@ -5,8 +5,8 @@ * API Version: 0.5 * Licenses: lgpl-2.1-or-later */ -#ifndef _kt_tacocat_process_h -#define _kt_tacocat_process_h +#ifndef _kt_tacocat_main_process_h +#define _kt_tacocat_main_process_h #ifdef __cplusplus extern "C" { @@ -160,4 +160,4 @@ extern "C" { } // extern "C" #endif -#endif // _kt_tacocat_process_h +#endif // _kt_tacocat_main_process_h diff --git a/sources/c/program/tacocat/main/receive.h b/sources/c/program/tacocat/main/receive.h index b78e930..b6e625c 100644 --- a/sources/c/program/tacocat/main/receive.h +++ b/sources/c/program/tacocat/main/receive.h @@ -5,8 +5,8 @@ * API Version: 0.5 * Licenses: lgpl-2.1-or-later */ -#ifndef _kt_tacocat_receive_h -#define _kt_tacocat_receive_h +#ifndef _kt_tacocat_main_receive_h +#define _kt_tacocat_main_receive_h #ifdef __cplusplus extern "C" { @@ -139,4 +139,4 @@ extern "C" { } // extern "C" #endif -#endif // _kt_tacocat_receive_h +#endif // _kt_tacocat_main_receive_h diff --git a/sources/c/program/tacocat/main/send.h b/sources/c/program/tacocat/main/send.h index 3c07b55..1bfe898 100644 --- a/sources/c/program/tacocat/main/send.h +++ b/sources/c/program/tacocat/main/send.h @@ -5,8 +5,8 @@ * API Version: 0.5 * Licenses: lgpl-2.1-or-later */ -#ifndef _kt_tacocat_send_h -#define _kt_tacocat_send_h +#ifndef _kt_tacocat_main_send_h +#define _kt_tacocat_main_send_h #ifdef __cplusplus extern "C" { @@ -136,4 +136,4 @@ extern "C" { } // extern "C" #endif -#endif // _kt_tacocat_send_h +#endif // _kt_tacocat_main_send_h diff --git a/sources/c/program/tacocat/main/signal.h b/sources/c/program/tacocat/main/signal.h index e44651f..7bcc972 100644 --- a/sources/c/program/tacocat/main/signal.h +++ b/sources/c/program/tacocat/main/signal.h @@ -5,8 +5,8 @@ * API Version: 0.5 * Licenses: lgpl-2.1-or-later */ -#ifndef _kt_tacocat_signal_h -#define _kt_tacocat_signal_h +#ifndef _kt_tacocat_main_signal_h +#define _kt_tacocat_main_signal_h #ifdef __cplusplus extern "C" { @@ -79,4 +79,4 @@ extern "C" { } // extern "C" #endif -#endif // _kt_tacocat_signal_h +#endif // _kt_tacocat_main_signal_h diff --git a/sources/c/program/tacocat/main/tacocat.h b/sources/c/program/tacocat/main/tacocat.h index 4faa2e6..314e65e 100644 --- a/sources/c/program/tacocat/main/tacocat.h +++ b/sources/c/program/tacocat/main/tacocat.h @@ -5,10 +5,10 @@ * API Version: 0.5 * Licenses: lgpl-2.1-or-later * - * This program provides a program to perform file, directory, and symbolic link remove file removals. + * This program provides a program to perform network communication. */ -#ifndef _kt_tacocat_h -#define _kt_tacocat_h +#ifndef _kt_tacocat_main_tacocat_h +#define _kt_tacocat_main_tacocat_h // Libc includes. #include @@ -108,4 +108,4 @@ extern "C" { } // extern "C" #endif -#endif // _kt_tacocat_h +#endif // _kt_tacocat_main_tacocat_h diff --git a/sources/c/program/tacocat/main/thread.h b/sources/c/program/tacocat/main/thread.h index 8aa11d7..0a7fb21 100644 --- a/sources/c/program/tacocat/main/thread.h +++ b/sources/c/program/tacocat/main/thread.h @@ -5,8 +5,8 @@ * API Version: 0.5 * Licenses: lgpl-2.1-or-later */ -#ifndef _kt_tacocat_thread_h -#define _kt_tacocat_thread_h +#ifndef _kt_tacocat_main_thread_h +#define _kt_tacocat_main_thread_h #ifdef __cplusplus extern "C" { @@ -43,4 +43,4 @@ extern "C" { } // extern "C" #endif -#endif // _kt_tacocat_thread_h +#endif // _kt_tacocat_main_thread_h diff --git a/sources/c/program/tacocat/tacocat/config.c b/sources/c/program/tacocat/tacocat/config.c new file mode 100644 index 0000000..1ac2545 --- /dev/null +++ b/sources/c/program/tacocat/tacocat/config.c @@ -0,0 +1 @@ +#include "config.h" diff --git a/sources/c/program/tacocat/tacocat/config.h b/sources/c/program/tacocat/tacocat/config.h new file mode 100644 index 0000000..e69de29 diff --git a/sources/c/program/tacocat/main/main.c b/sources/c/program/tacocat/tacocat/main.c similarity index 100% rename from sources/c/program/tacocat/main/main.c rename to sources/c/program/tacocat/tacocat/main.c diff --git a/sources/c/program/tacocat/main/main.h b/sources/c/program/tacocat/tacocat/main.h similarity index 79% rename from sources/c/program/tacocat/main/main.h rename to sources/c/program/tacocat/tacocat/main.h index 58011b0..6ce45d0 100644 --- a/sources/c/program/tacocat/main/main.h +++ b/sources/c/program/tacocat/tacocat/main.h @@ -1,15 +1,15 @@ /** - * Kevux Tools - TacocaT + * Kevux Tools - Remove * * Project: Kevux Tools * API Version: 0.5 * Licenses: lgpl-2.1-or-later * * This file is only ever included by main.c and should not normally be included anywhere else. - * Anything that wants to include this should be providing the "remove" program functionality in some manner. + * Anything that wants to include this should be providing the "tacocat" program functionality in some manner. */ -#ifndef _kt_remove_main_h -#define _kt_remove_main_h +#ifndef _kt_tacocat_tacocat_main_h +#define _kt_tacocat_tacocat_main_h #ifdef __cplusplus extern "C" { @@ -35,4 +35,4 @@ extern int main(const int argc, const f_string_t *argv, const f_string_t *envp); } // extern "C" #endif -#endif // _kt_remove_main_h +#endif // _kt_tacocat_tacocat_main_h diff --git a/sources/c/program/tacocat/tacocat/string.c b/sources/c/program/tacocat/tacocat/string.c new file mode 100644 index 0000000..866ccef --- /dev/null +++ b/sources/c/program/tacocat/tacocat/string.c @@ -0,0 +1,14 @@ +#include "tacocat.h" + +#ifdef __cplusplus +extern "C" { +#endif + +#ifndef _di_kt_tacocat_program_name_s_ + const f_string_static_t kt_tacocat_program_name_s = macro_f_string_static_t_initialize_1(KT_TACOCAT_program_name_s, 0, KT_TACOCAT_program_name_s_length); + const f_string_static_t kt_tacocat_program_name_long_s = macro_f_string_static_t_initialize_1(KT_TACOCAT_program_name_long_s, 0, KT_TACOCAT_program_name_long_s_length); +#endif // _di_kt_tacocat_program_name_s_ + +#ifdef __cplusplus +} // extern "C" +#endif diff --git a/sources/c/program/tacocat/tacocat/string.h b/sources/c/program/tacocat/tacocat/string.h new file mode 100644 index 0000000..4a22795 --- /dev/null +++ b/sources/c/program/tacocat/tacocat/string.h @@ -0,0 +1,34 @@ +/** + * FLL - Level 3 + * + * Project: Kevux Tools + * API Version: 0.7 + * Licenses: lgpl-2.1-or-later + * + * Provides the common string structures for the tacocat program. + * + * This is auto-included and should not need to be explicitly included. + */ +#ifndef _kt_tacocat_tacocat_string_h +#define _kt_tacocat_tacocat_string_h + +#ifdef __cplusplus +extern "C" { +#endif + +/** + * The program name. + */ +#ifndef _di_kt_tacocat_program_name_s_ + #define KT_TACOCAT_program_name_s "tacocat" + #define KT_TACOCAT_program_name_long_s "TacocaT" + + #define KT_TACOCAT_program_name_s_length 7 + #define KT_TACOCAT_program_name_long_s_length 7 +#endif // _di_kt_tacocat_program_name_s_ + +#ifdef __cplusplus +} // extern "C" +#endif + +#endif // _kt_tacocat_tacocat_string_h diff --git a/sources/c/program/tacocat/tacocat/tacocat.c b/sources/c/program/tacocat/tacocat/tacocat.c new file mode 100644 index 0000000..d798367 --- /dev/null +++ b/sources/c/program/tacocat/tacocat/tacocat.c @@ -0,0 +1,9 @@ +#include "tacocat.h" + +#ifdef __cplusplus +extern "C" { +#endif + +#ifdef __cplusplus +} // extern "C" +#endif diff --git a/sources/c/program/tacocat/tacocat/tacocat.h b/sources/c/program/tacocat/tacocat/tacocat.h new file mode 100644 index 0000000..4df4bae --- /dev/null +++ b/sources/c/program/tacocat/tacocat/tacocat.h @@ -0,0 +1,25 @@ +/** + * FLL - Level 3 + * + * Project: Kevux Tools + * API Version: 0.7 + * Licenses: lgpl-2.1-or-later + * + * This program provides the base include for the tacocat program. + */ +#ifndef _kt_tacocat_tacocat_tacocat_h +#define _kt_tacocat_tacocat_tacocat_h + +// Remove includes. +#include +#include + +#ifdef __cplusplus +extern "C" { +#endif + +#ifdef __cplusplus +} // extern "C" +#endif + +#endif // _kt_tacocat_tacocat_tacocat_h -- 1.8.3.1