Update: Relocate fll_path to fl_path.

I recently noticed that the fll_path has no level 1 dependencies.
I try to keep all projects as low as possible (level_0 being the lowest).
Move fll_paath to fl_path and update everything affected by this.

diff --git a/build/level_1/settings b/build/level_1/settings
index 8eb303362b46108c424c54162806b3d73c58f8f4..b0d9654bfe496a1363f14607e1a7ee11b327e4f1 100644 (file)
--- a/build/level_1/settings
+++ b/build/level_1/settings
@@ -27,6 +27,7 @@ build_sources_library directory.c private-directory.c
 build_sources_library environment.c
 build_sources_library private-fss.c fss/basic.c fss/basic_list.c fss/embedded_list.c fss/extended.c fss/extended_list.c
 build_sources_library iki.c
+build_sources_library path.c
 build_sources_library print.c private-print.c print/common.c
 build_sources_library signal.c
 build_sources_library string.c private-string.c
@@ -40,6 +41,7 @@ build_sources_headers environment.h
 build_sources_headers execute.h execute/common.h
 build_sources_headers fss.h fss/basic.h fss/basic_list.h fss/embedded_list.h fss/extended.h fss/extended_list.h
 build_sources_headers iki.h
+build_sources_headers path.h
 build_sources_headers print.h print/common.h
 build_sources_headers signal.h signal/common.h
 build_sources_headers string.h

diff --git a/build/level_2/settings b/build/level_2/settings
index cd1eacdc6760c83e0960b29edba8e7a657277268..a5808a934648c8ac771406798453189d7a90bf76 100644 (file)
--- a/build/level_2/settings
+++ b/build/level_2/settings
@@ -28,7 +28,6 @@ build_sources_library file.c private-file.c
 build_sources_library fss.c fss/basic.c fss/basic_list.c fss/embedded_list.c fss/extended.c fss/extended_list.c fss/payload.c
 build_sources_library fss_status_string.c
 build_sources_library iki.c private-iki.c
-build_sources_library path.c
 build_sources_library print.c
 build_sources_library program.c program/common.c program/print.c private-program.c
 build_sources_library status_string.c
@@ -40,7 +39,6 @@ build_sources_headers file.h
 build_sources_headers fss.h fss/basic.h fss/basic_list.h fss/embedded_list.h fss/extended.h fss/extended_list.h fss/payload.h
 build_sources_headers fss_status_string.h
 build_sources_headers iki.h
-build_sources_headers path.h
 build_sources_headers print.h
 build_sources_headers program.h program/common.h program/print.h
 build_sources_headers status_string.h

diff --git a/build/monolithic/settings b/build/monolithic/settings
index 99bf6daddf8877b59f990973b73d877b3482a0eb..bf67e507f08bd8312216832362d3efbf06fd1a39 100644 (file)
--- a/build/monolithic/settings
+++ b/build/monolithic/settings
@@ -54,6 +54,7 @@ build_sources_library level_1/directory.c level_1/private-directory.c
 build_sources_library level_1/environment.c
 build_sources_library level_1/private-fss.c level_1/fss/basic.c level_1/fss/basic_list.c level_1/fss/embedded_list.c level_1/fss/extended.c level_1/fss/extended_list.c
 build_sources_library level_1/iki.c
+build_sources_library level_1/path.c
 build_sources_library level_1/print.c level_1/private-print.c level_1/print/common.c
 build_sources_library level_1/signal.c
 build_sources_library level_1/string.c level_1/private-string.c
@@ -67,7 +68,6 @@ build_sources_library level_2/file.c level_2/private-file.c
 build_sources_library level_2/fss.c level_2/fss/basic.c level_2/fss/basic_list.c level_2/fss/embedded_list.c level_2/fss/extended.c level_2/fss/extended_list.c level_2/fss/payload.c
 build_sources_library level_2/fss_status_string.c
 build_sources_library level_2/iki.c level_2/private-iki.c
-build_sources_library level_2/path.c
 build_sources_library level_2/print.c
 build_sources_library level_2/program.c level_2/program/common.c level_2/program/print.c level_2/private-program.c
 build_sources_library level_2/status_string.c
@@ -109,6 +109,7 @@ build_sources_headers level_1/environment.h
 build_sources_headers level_1/execute.h level_1/execute/common.h
 build_sources_headers level_1/fss.h level_1/fss/basic.h level_1/fss/basic_list.h level_1/fss/embedded_list.h level_1/fss/extended.h level_1/fss/extended_list.h
 build_sources_headers level_1/iki.h
+build_sources_headers level_1/path.h
 build_sources_headers level_1/print.h level_1/print/common.h
 build_sources_headers level_1/signal.h level_1/signal/common.h
 build_sources_headers level_1/string.h
@@ -122,7 +123,6 @@ build_sources_headers level_2/file.h
 build_sources_headers level_2/fss.h level_2/fss/basic.h level_2/fss/basic_list.h level_2/fss/embedded_list.h level_2/fss/extended.h level_2/fss/extended_list.h level_2/fss/payload.h
 build_sources_headers level_2/fss_status_string.h
 build_sources_headers level_2/iki.h
-build_sources_headers level_2/path.h
 build_sources_headers level_2/print.h
 build_sources_headers level_2/program.h level_2/program/common.h level_2/program/print.h
 build_sources_headers level_2/status_string.h

diff --git a/build/scripts/bootstrap-example.sh b/build/scripts/bootstrap-example.sh
index 41007ffb6a7b6a091600e6ec928627dc3290807a..27819a94a9895e40cd1fbe3f1345f8d676a1c480 100644 (file)
--- a/build/scripts/bootstrap-example.sh
+++ b/build/scripts/bootstrap-example.sh
@@ -121,7 +121,7 @@ if [[ $1 == "individual" ]] ; then
   $shell_command build/scripts/package.sh $verbose $color rebuild -i
 
   if [[ $? -eq 0 ]] ; then
-    for i in f_type f_status f_memory f_type_array f_string f_utf f_account f_capability f_color f_console f_control_group f_conversion f_directory f_environment f_execute f_file f_fss f_iki f_limit f_path f_pipe f_print f_status_string f_serialize f_signal f_socket f_thread fl_control_group fl_conversion fl_directory fl_environment fl_execute fl_fss fl_iki fl_print fl_signal fl_string fl_utf fl_utf_file fll_control_group fll_error fll_execute fll_file fll_fss fll_fss_status_string fll_iki fll_path fll_print fll_program fll_status_string ; do
+    for i in f_type f_status f_memory f_type_array f_string f_utf f_account f_capability f_color f_console f_control_group f_conversion f_directory f_environment f_execute f_file f_fss f_iki f_limit f_path f_pipe f_print f_status_string f_serialize f_signal f_socket f_thread fl_control_group fl_conversion fl_directory fl_environment fl_execute fl_fss fl_iki fl_path fl_print fl_signal fl_string fl_utf fl_utf_file fll_control_group fll_error fll_execute fll_file fll_fss fll_fss_status_string fll_iki fll_print fll_program fll_status_string ; do
       echo && echo "Processing $i." &&
 
       cd package/individual/$i-$version/ &&

diff --git a/build/stand_alone/fake.settings b/build/stand_alone/fake.settings
index 23e613107c8ea37252ea42aa90870cfac497cfeb..66662d51dec4ca44fdce433dfb7251e73b6de4f0 100644 (file)
--- a/build/stand_alone/fake.settings
+++ b/build/stand_alone/fake.settings
@@ -56,6 +56,7 @@ build_sources_program fll/level_1/directory.c fll/level_1/private-directory.c
 build_sources_program fll/level_1/environment.c
 build_sources_program fll/level_1/private-fss.c fll/level_1/fss/basic.c fll/level_1/fss/basic_list.c fll/level_1/fss/embedded_list.c fll/level_1/fss/extended.c fll/level_1/fss/extended_list.c
 build_sources_program fll/level_1/iki.c
+build_sources_program fll/level_1/path.c
 build_sources_program fll/level_1/print.c fll/level_1/private-print.c fll/level_1/print/common.c
 build_sources_program fll/level_1/string.c fll/level_1/private-string.c
 
@@ -63,7 +64,6 @@ build_sources_program fll/level_2/error.c fll/level_2/error/common.c fll/level_2
 build_sources_program fll/level_2/execute.c fll/level_2/private-execute.c
 build_sources_program fll/level_2/file.c fll/level_2/private-file.c
 build_sources_program fll/level_2/fss.c fll/level_2/fss/basic.c fll/level_2/fss/basic_list.c fll/level_2/fss/embedded_list.c fll/level_2/fss/extended.c fll/level_2/fss/extended_list.c fll/level_2/fss/payload.c
-build_sources_program fll/level_2/path.c
 build_sources_program fll/level_2/print.c
 build_sources_program fll/level_2/program.c fll/level_2/program/common.c fll/level_2/program/print.c fll/level_2/private-program.c
 

diff --git a/level_2/fll_path/c/path.c b/level_1/fl_path/c/path.c
similarity index 93%
rename from level_2/fll_path/c/path.c
rename to level_1/fl_path/c/path.c
index 30cf64ae16290d9d2d0f657521d2c96131273dda..03e36b9464727f3b40b545f0ced6fbae34eb17d5 100644 (file)
--- a/level_2/fll_path/c/path.c
+++ b/level_1/fl_path/c/path.c
@@ -4,11 +4,11 @@
 extern "C" {
 #endif
 
-#ifndef _di_fll_path_canonical_
-  f_status_t fll_path_canonical(const f_string_static_t path, f_string_dynamic_t * const canonical) {
-    #ifndef _di_level_2_parameter_checking_
+#ifndef _di_fl_path_canonical_
+  f_status_t fl_path_canonical(const f_string_static_t path, f_string_dynamic_t * const canonical) {
+    #ifndef _di_level_1_parameter_checking_
       if (!canonical) return F_status_set_error(F_parameter);
-    #endif // _di_level_2_parameter_checking_
+    #endif // _di_level_1_parameter_checking_
 
     f_status_t status = F_none;
 
@@ -139,7 +139,7 @@ extern "C" {
 
     return F_none;
   }
-#endif // _di_fll_path_canonical_
+#endif // _di_fl_path_canonical_
 
 #ifdef __cplusplus
 } // extern "C"

diff --git a/level_2/fll_path/c/path.h b/level_1/fl_path/c/path.h
similarity index 87%
rename from level_2/fll_path/c/path.h
rename to level_1/fl_path/c/path.h
index 4ffa250f7e1cb3c15a8ce830e9d60a60e46c3fa9..19d6fdc5c2d2ce3520e4b5d5b2afc846531d4679 100644 (file)
--- a/level_2/fll_path/c/path.h
+++ b/level_1/fl_path/c/path.h
@@ -7,8 +7,8 @@
  *
  * Provides path-related functionality.
  */
-#ifndef _FLL_path_h
-#define _FLL_path_h
+#ifndef _FL_path_h
+#define _FL_path_h
 
 // Libc includes.
 #include <stdio.h>
@@ -56,12 +56,12 @@ extern "C" {
  * @see f_string_append_assure()
  * @see f_string_dynamic_append_assure()
  */
-#ifndef _di_fll_path_canonical_
-  extern f_status_t fll_path_canonical(const f_string_static_t path, f_string_dynamic_t * const canonical);
-#endif // _di_fll_path_canonical_
+#ifndef _di_fl_path_canonical_
+  extern f_status_t fl_path_canonical(const f_string_static_t path, f_string_dynamic_t * const canonical);
+#endif // _di_fl_path_canonical_
 
 #ifdef __cplusplus
 } // extern "C"
 #endif
 
-#endif // _FLL_path_h
+#endif // _FL_path_h

diff --git a/level_2/fll_path/data/build/defines b/level_1/fl_path/data/build/defines
similarity index 100%
rename from level_2/fll_path/data/build/defines
rename to level_1/fl_path/data/build/defines

diff --git a/level_2/fll_path/data/build/dependencies b/level_1/fl_path/data/build/dependencies
similarity index 100%
rename from level_2/fll_path/data/build/dependencies
rename to level_1/fl_path/data/build/dependencies

diff --git a/level_2/fll_path/data/build/dependencies-tests b/level_1/fl_path/data/build/dependencies-tests
similarity index 100%
rename from level_2/fll_path/data/build/dependencies-tests
rename to level_1/fl_path/data/build/dependencies-tests

diff --git a/level_2/fll_path/data/build/fakefile b/level_1/fl_path/data/build/fakefile
similarity index 100%
rename from level_2/fll_path/data/build/fakefile
rename to level_1/fl_path/data/build/fakefile

diff --git a/level_2/fll_path/data/build/settings b/level_1/fl_path/data/build/settings
similarity index 96%
rename from level_2/fll_path/data/build/settings
rename to level_1/fl_path/data/build/settings
index dc00f9e8f6062557ed99d57eb186b15f9641b5d0..86ef3846d8e0172a8186a12b7eff6ddafea99377 100644 (file)
--- a/level_2/fll_path/data/build/settings
+++ b/level_1/fl_path/data/build/settings
@@ -1,6 +1,6 @@
 # fss-0001
 
-build_name fll_path
+build_name fl_path
 
 version_major 0
 version_minor 7
@@ -28,7 +28,7 @@ build_script yes
 build_shared yes
 build_static no
 
-path_headers fll/level_2
+path_headers fll/level_1
 path_library_script script
 path_library_shared shared
 path_library_static static

diff --git a/level_2/fll_path/data/build/settings-tests b/level_1/fl_path/data/build/settings-tests
similarity index 91%
rename from level_2/fll_path/data/build/settings-tests
rename to level_1/fl_path/data/build/settings-tests
index bf78c7e1b597253ddf99106e91cd0acfbaddb76e..e5b9b39fb202b10344173a5f5fa0e2100ceb0b52 100644 (file)
--- a/level_2/fll_path/data/build/settings-tests
+++ b/level_1/fl_path/data/build/settings-tests
@@ -1,6 +1,6 @@
 # fss-0001
 
-build_name test-fll_path
+build_name test-fl_path
 
 version_major 0
 version_minor 6
@@ -18,7 +18,7 @@ build_indexer_arguments rcs
 build_language c
 
 build_libraries -lc -lcmocka
-build_libraries-individual -lf_memory -lf_path -lf_string -lfll_path
+build_libraries-individual -lf_memory -lf_path -lf_string -lfl_path
 
 build_sources_program test-path-canonical.c
 

diff --git a/level_2/fll_path/data/build/testfile b/level_1/fl_path/data/build/testfile
similarity index 81%
rename from level_2/fll_path/data/build/testfile
rename to level_1/fl_path/data/build/testfile
index 1e73743378e0b5780893aa4dcd453f0bb476eb4d..cd1a11a5a319218bc99f5f4dbf93e21c14e8aab7 100644 (file)
--- a/level_2/fll_path/data/build/testfile
+++ b/level_1/fl_path/data/build/testfile
@@ -22,14 +22,14 @@ main:
 
   operate ld_library_path
 
-  if exist build/programs/shared/test-fll_path
-    shell build/programs/shared/test-fll_path
+  if exist build/programs/shared/test-fl_path
+    shell build/programs/shared/test-fl_path
 
-  if exist build/programs/static/test-fll_path
-    shell build/programs/static/test-fll_path
+  if exist build/programs/static/test-fl_path
+    shell build/programs/static/test-fl_path
 
-  if not exist build/programs/shared/test-fll_path
-  and not exist build/programs/static/test-fll_path
+  if not exist build/programs/shared/test-fl_path
+  and not exist build/programs/static/test-fl_path
     operate not_created
 
 not_created:

diff --git a/level_2/fll_path/tests/unit/c/test-path-canonical.c b/level_1/fl_path/tests/unit/c/test-path-canonical.c
similarity index 100%
rename from level_2/fll_path/tests/unit/c/test-path-canonical.c
rename to level_1/fl_path/tests/unit/c/test-path-canonical.c

diff --git a/level_2/fll_path/tests/unit/c/test-path-canonical.h b/level_1/fl_path/tests/unit/c/test-path-canonical.h
similarity index 100%
rename from level_2/fll_path/tests/unit/c/test-path-canonical.h
rename to level_1/fl_path/tests/unit/c/test-path-canonical.h

diff --git a/level_2/fll_path/tests/unit/c/test-path.c b/level_1/fl_path/tests/unit/c/test-path.c
similarity index 100%
rename from level_2/fll_path/tests/unit/c/test-path.c
rename to level_1/fl_path/tests/unit/c/test-path.c

diff --git a/level_2/fll_path/tests/unit/c/test-path.h b/level_1/fl_path/tests/unit/c/test-path.h
similarity index 97%
rename from level_2/fll_path/tests/unit/c/test-path.h
rename to level_1/fl_path/tests/unit/c/test-path.h
index 9e13f2e30d4271b03f3b7bcca174d945825e65d2..7ccb384e9361a59dc6845f2ab810a91b31056458 100644 (file)
--- a/level_2/fll_path/tests/unit/c/test-path.h
+++ b/level_1/fl_path/tests/unit/c/test-path.h
@@ -22,7 +22,7 @@
 #include <cmocka.h>
 
 // FLL-2 includes.
-#include <fll/level_2/path.h>
+#include <fll/level_1/path.h>
 
 // Mock includes.
 //#include "mock-path.h"

diff --git a/level_3/controller/c/controller.h b/level_3/controller/c/controller.h
index 441b8e6f9e286d62e8dbbccf7995833a976487cf..12b3f1972f38562cb28a0fb19e453372226ae27b 100644 (file)
--- a/level_3/controller/c/controller.h
+++ b/level_3/controller/c/controller.h
@@ -59,6 +59,7 @@
 #include <fll/level_1/environment.h>
 #include <fll/level_1/fss.h>
 #include <fll/level_1/iki.h>
+#include <fll/level_1/path.h>
 #include <fll/level_1/print.h>
 #include <fll/level_1/string.h>
 
@@ -71,7 +72,6 @@
 #include <fll/level_2/fss/extended.h>
 #include <fll/level_2/fss/extended_list.h>
 #include <fll/level_2/fss/payload.h>
-#include <fll/level_2/path.h>
 #include <fll/level_2/print.h>
 #include <fll/level_2/program.h>
 #include <fll/level_2/status_string.h>

diff --git a/level_3/controller/c/controller/private-controller.c b/level_3/controller/c/controller/private-controller.c
index 0b2c3ae12691352e7fe2370a8aca2b74cb5bdfb4..18946da16c10ab7ecbce0907466a5ae16b4600da 100644 (file)
--- a/level_3/controller/c/controller/private-controller.c
+++ b/level_3/controller/c/controller/private-controller.c
@@ -368,7 +368,7 @@ extern "C" {
   f_status_t controller_path_canonical_relative(const controller_setting_t * const setting, const f_string_static_t source, f_string_dynamic_t * const destination) {
 
     {
-      const f_status_t status = fll_path_canonical(source, destination);
+      const f_status_t status = fl_path_canonical(source, destination);
       if (F_status_is_error(status)) return status;
     }
 

diff --git a/level_3/controller/c/controller/private-controller.h b/level_3/controller/c/controller/private-controller.h
index 004a469768523905f0a373c54f50be84573a02ac..84bbd7270cb1ccd5bf40dbdc2151f8e239cff50b 100644 (file)
--- a/level_3/controller/c/controller/private-controller.h
+++ b/level_3/controller/c/controller/private-controller.h
@@ -219,9 +219,9 @@ extern "C" {
  * @return
  *   F_none on success.
  *
- *   Errors (with error bit) from: fll_path_canonical().
+ *   Errors (with error bit) from: fl_path_canonical().
  *
- * @see fll_path_canonical()
+ * @see fl_path_canonical()
  */
 #ifndef _di_controller_path_canonical_relative_
   extern f_status_t controller_path_canonical_relative(const controller_setting_t * const global, const f_string_static_t source, f_string_dynamic_t * const destination) F_attribute_visibility_internal_d;

diff --git a/level_3/controller/data/build/dependencies b/level_3/controller/data/build/dependencies
index 3e6414ed5d7649ad8b9fc4978c71cf0e9550865e..9ec2ee2b4cedca3ea96a018bc3f6c5cdc58b257b 100644 (file)
--- a/level_3/controller/data/build/dependencies
+++ b/level_3/controller/data/build/dependencies
@@ -33,6 +33,7 @@ fl_directory
 fl_environment
 fl_fss
 fl_iki
+fl_path
 fl_print
 fl_string
 
@@ -40,7 +41,6 @@ fll_control_group
 fll_error
 fll_execute
 fll_fss
-fll_path
 fll_print
 fll_program
 fll_status_string

diff --git a/level_3/controller/data/build/settings b/level_3/controller/data/build/settings
index 5b6702dc18e25d15d1421f8f44c813d0a0e5c9d0..f3ea0388c0654bddf097838231181881e0c742ff 100644 (file)
--- a/level_3/controller/data/build/settings
+++ b/level_3/controller/data/build/settings
@@ -18,8 +18,8 @@ build_indexer_arguments rcs
 build_language c
 
 build_libraries -lc -lcap
-build_libraries-individual -lfll_control_group -lfll_error -lfll_execute -lfll_fss -lfll_path -lfll_print -lfll_program -lfll_status_string
-build_libraries-individual -lfl_control_group -lfl_conversion -lfl_directory -lfl_environment -lfl_fss -lfl_iki -lfl_print -lfl_string
+build_libraries-individual -lfll_control_group -lfll_error -lfll_execute -lfll_fss -lfll_print -lfll_program -lfll_status_string
+build_libraries-individual -lfl_control_group -lfl_conversion -lfl_directory -lfl_environment -lfl_fss -lfl_iki -lfl_path -lfl_print -lfl_string
 build_libraries-individual -lf_account -lf_capability -lf_color -lf_console -lf_control_group -lf_conversion -lf_directory -lf_environment -lf_execute -lf_file -lf_fss -lf_iki -lf_limit -lf_memory -lf_path -lf_pipe -lf_print -lf_signal -lf_socket -lf_status_string -lf_string -lf_thread -lf_type_array -lf_utf
 build_libraries-level -lfll_2 -lfll_1 -lfll_0
 build_libraries-monolithic -lfll

diff --git a/level_3/fake/c/main/fake.h b/level_3/fake/c/main/fake.h
index 8b0491fa597ee2f3e118ea9ef2be489d54e664b2..2f478130a5e2f7640980751b3bc9a7d56c549508 100644 (file)
--- a/level_3/fake/c/main/fake.h
+++ b/level_3/fake/c/main/fake.h
@@ -81,6 +81,7 @@
 #include <fll/level_1/directory.h>
 #include <fll/level_1/environment.h>
 #include <fll/level_1/iki.h>
+#include <fll/level_1/path.h>
 #include <fll/level_1/print.h>
 #include <fll/level_1/string.h>
 
@@ -91,7 +92,6 @@
 #include <fll/level_2/fss.h>
 #include <fll/level_2/fss/basic_list.h>
 #include <fll/level_2/fss/extended.h>
-#include <fll/level_2/path.h>
 #include <fll/level_2/print.h>
 #include <fll/level_2/program.h>
 

diff --git a/level_3/fake/c/main/make.c b/level_3/fake/c/main/make.c
index 5a3f028359d76d57878d705bdbec9b35ecf560f1..bcb6440dedf941828c493222c61adf34f09b481d 100644 (file)
--- a/level_3/fake/c/main/make.c
+++ b/level_3/fake/c/main/make.c
@@ -11,7 +11,7 @@ extern "C" {
 
     data_make->cache_path.used = 0;
 
-    data_make->setting->state.status = fll_path_canonical(path, &data_make->cache_path);
+    data_make->setting->state.status = fl_path_canonical(path, &data_make->cache_path);
     if (F_status_is_error(data_make->setting->state.status)) return;
 
     if (data_make->cache_path.used < data_make->path.stack.array[0].used) {

diff --git a/level_3/fake/c/main/make.h b/level_3/fake/c/main/make.h
index 8fbcfdd3e51339724806a3dcb43fd19b83c532e2..4bcd559d0f820fd4f788ed07ae28315065078ce2 100644 (file)
--- a/level_3/fake/c/main/make.h
+++ b/level_3/fake/c/main/make.h
@@ -28,12 +28,12 @@ extern "C" {
  *     F_false (with error bit) if path exists outside of the root project path.
  *
  *     Errors (with error bit) from: fl_string_dynamic_partial_compare()
- *     Errors (with error bit) from: fll_path_canonical()
+ *     Errors (with error bit) from: fl_path_canonical()
  * @param path
  *   file path to get the real path of.
  *
  * @see fl_string_dynamic_partial_compare()
- * @see fll_path_canonical()
+ * @see fl_path_canonical()
  */
 #ifndef _di_fake_make_assure_inside_project_
   extern void fake_make_assure_inside_project(fake_make_data_t * const data_make, const f_string_static_t path);

diff --git a/level_3/fake/c/main/make/operate_process_type.c b/level_3/fake/c/main/make/operate_process_type.c
index c06832e3268c6c659bde84d315401d78d388f15f..6c1773754bbdbdb3cb39a00cc0777920c3ba2d9a 100644 (file)
--- a/level_3/fake/c/main/make/operate_process_type.c
+++ b/level_3/fake/c/main/make/operate_process_type.c
@@ -1954,7 +1954,7 @@ extern "C" {
         data_make->setting->state.status = f_file_touch(data_make->cache_arguments.array[i], mode.regular, F_false);
 
         if (F_status_is_error(data_make->setting->state.status)) {
-          if (F_status_is_error_not(fll_path_canonical(data_make->cache_arguments.array[i], &data_make->cache_path))) {
+          if (F_status_is_error_not(fl_path_canonical(data_make->cache_arguments.array[i], &data_make->cache_path))) {
             fake_print_error_file(data_make->setting, data_make->main->error, macro_fake_f(f_file_touch), data_make->cache_path, f_file_operation_touch_s, fll_error_file_type_file_e);
           }
           else {
@@ -1970,7 +1970,7 @@ extern "C" {
         data_make->setting->state.status = f_directory_touch(data_make->cache_arguments.array[i], mode.directory);
 
         if (F_status_is_error(data_make->setting->state.status)) {
-          if (F_status_is_error_not(fll_path_canonical(data_make->cache_arguments.array[i], &data_make->cache_path))) {
+          if (F_status_is_error_not(fl_path_canonical(data_make->cache_arguments.array[i], &data_make->cache_path))) {
             fake_print_error_file(data_make->setting, data_make->main->error, macro_fake_f(f_directory_touch), data_make->cache_path, f_file_operation_touch_s, fll_error_file_type_directory_e);
           }
           else {
@@ -2003,7 +2003,7 @@ extern "C" {
       data_make->setting->state.status = f_file_stream_open(data_make->cache_arguments.array[0], f_file_open_mode_truncate_s, &file);
 
       if (F_status_is_error(data_make->setting->state.status)) {
-        if (F_status_is_error_not(fll_path_canonical(data_make->cache_arguments.array[0], &data_make->cache_path))) {
+        if (F_status_is_error_not(fl_path_canonical(data_make->cache_arguments.array[0], &data_make->cache_path))) {
           fake_print_error_file(data_make->setting, data_make->main->error, macro_fake_f(f_file_stream_open), data_make->cache_path, f_file_operation_open_s, fll_error_file_type_file_e);
         }
         else {
@@ -2032,7 +2032,7 @@ extern "C" {
         data_make->setting->state.status = f_file_stream_open(data_make->cache_arguments.array[0], f_file_open_mode_append_s, &file);
 
         if (F_status_is_error(data_make->setting->state.status)) {
-          if (F_status_is_error_not(fll_path_canonical(data_make->cache_arguments.array[0], &data_make->cache_path))) {
+          if (F_status_is_error_not(fl_path_canonical(data_make->cache_arguments.array[0], &data_make->cache_path))) {
             fake_print_error_file(data_make->setting, data_make->main->error, macro_fake_f(f_file_stream_open), data_make->cache_path, f_file_operation_open_s, fll_error_file_type_file_e);
           }
           else {
@@ -2049,7 +2049,7 @@ extern "C" {
           fake_make_operate_process_buffer_escape(data_make, data_make->cache_arguments.array[i], &data_make->cache_1);
 
           if (F_status_is_error(data_make->setting->state.status)) {
-            if (F_status_is_error_not(fll_path_canonical(data_make->cache_arguments.array[0], &data_make->cache_path))) {
+            if (F_status_is_error_not(fl_path_canonical(data_make->cache_arguments.array[0], &data_make->cache_path))) {
               fake_print_error_file(data_make->setting, data_make->main->error, macro_fake_f(fake_make_operate_process_buffer_escape), data_make->cache_path, f_file_operation_write_s, fll_error_file_type_file_e);
             }
             else {
@@ -2062,7 +2062,7 @@ extern "C" {
           data_make->setting->state.status = f_file_stream_write(file, data_make->cache_1, 0);
 
           if (F_status_is_error(data_make->setting->state.status)) {
-            if (F_status_is_error_not(fll_path_canonical(data_make->cache_arguments.array[0], &data_make->cache_path))) {
+            if (F_status_is_error_not(fl_path_canonical(data_make->cache_arguments.array[0], &data_make->cache_path))) {
               fake_print_error_file(data_make->setting, data_make->main->error, macro_fake_f(f_file_stream_write), data_make->cache_path, f_file_operation_write_s, fll_error_file_type_file_e);
             }
             else {

diff --git a/level_3/fake/data/build/dependencies b/level_3/fake/data/build/dependencies
index 85e173f203cc4b6fd78ae78090854b1d0d92997c..755823c0aa4f29a1197311b9f2b8cfdc075a6278 100644 (file)
--- a/level_3/fake/data/build/dependencies
+++ b/level_3/fake/data/build/dependencies
@@ -32,6 +32,7 @@ fl_environment
 fl_execute
 fl_fss
 fl_iki
+fl_path
 fl_print
 fl_string
 
@@ -39,6 +40,5 @@ fll_error
 fll_execute
 fll_file
 fll_fss
-fll_path
 fll_print
 fll_program

diff --git a/level_3/fake/data/build/settings b/level_3/fake/data/build/settings
index 7a1eacd993122845e58841b4fbc3dc0307ab44a5..d1c755e9854cb51252b4bb356ddebc3ec8f0d3eb 100644 (file)
--- a/level_3/fake/data/build/settings
+++ b/level_3/fake/data/build/settings
@@ -21,8 +21,8 @@ build_indexer_arguments rcs
 build_language c
 
 build_libraries -lc -lcap
-build_libraries-individual -lfll_error -lfll_execute -lfll_file -lfll_fss -lfll_path -lfll_print -lfll_program
-build_libraries-individual -lfl_control_group -lfl_conversion -lfl_directory -lfl_environment -lfl_fss -lfl_iki -lfl_print -lfl_string
+build_libraries-individual -lfll_error -lfll_execute -lfll_file -lfll_fss -lfll_print -lfll_program
+build_libraries-individual -lfl_control_group -lfl_conversion -lfl_directory -lfl_environment -lfl_fss -lfl_iki -lfl_path -lfl_print -lfl_string
 build_libraries-individual -lf_account -lf_capability -lf_color -lf_console -lf_control_group -lf_conversion -lf_directory -lf_environment -lf_execute -lf_file -lf_fss -lf_iki -lf_limit -lf_memory -lf_path -lf_pipe -lf_print -lf_signal -lf_status_string -lf_string -lf_thread -lf_type_array -lf_utf
 build_libraries-level -lfll_2 -lfll_1 -lfll_0
 build_libraries-monolithic -lfll