Cleanup: rename f_paths to f_path

diff --git a/build/level_0/settings b/build/level_0/settings
index f4eda935e0b1e30e34c029134a964ae56723e38e..42b33a57193e12e785697783872f459b5c691b16 100644 (file)
--- a/build/level_0/settings
+++ b/build/level_0/settings
@@ -13,7 +13,7 @@ build_libraries -lc
 build_libraries_fll
 build_sources_library level_0/console.c level_0/conversion.c level_0/file.c level_0/memory.c level_0/pipe.c level_0/print.c level_0/utf.c
 build_sources_program
-build_sources_headers level_0/colors.h level_0/console.h level_0/conversion.h level_0/status.h level_0/file.h level_0/fss.h level_0/memory.h level_0/fll_paths.h level_0/filesystem_paths.h level_0/pipe.h level_0/print.h level_0/serialized.h level_0/string.h level_0/types.h level_0/types_array.h level_0/utf.h
+build_sources_headers level_0/colors.h level_0/console.h level_0/conversion.h level_0/status.h level_0/file.h level_0/fss.h level_0/memory.h level_0/path_fll.h level_0/path_filesystem.h level_0/pipe.h level_0/print.h level_0/serialized.h level_0/string.h level_0/types.h level_0/types_array.h level_0/utf.h
 build_shared yes
 build_static yes
 

diff --git a/build/monolithic/settings b/build/monolithic/settings
index 45ce8bed8ee34535e8ad2412eb758050050e74c9..b00459d50198eafcd13738e925bf8becaa502646 100644 (file)
--- a/build/monolithic/settings
+++ b/build/monolithic/settings
@@ -13,7 +13,7 @@ build_libraries -lc
 build_libraries_fll
 build_sources_library level_0/console.c level_0/conversion.c level_0/file.c level_0/memory.c level_0/pipe.c level_0/print.c level_0/utf.c level_1/colors.c level_1/console.c level_1/directory.c level_1/status.c level_1/file.c level_1/fss.c level_1/fss_basic.c level_1/fss_basic_list.c level_1/fss_extended.c level_1/program.c level_1/serialized.c level_1/string.c level_1/utf.c level_2/colors.c level_2/execute.c level_2/status.c
 build_sources_program
-build_sources_headers level_0/colors.h level_0/console.h level_0/conversion.h level_0/status.h level_0/file.h level_0/fss.h level_0/memory.h level_0/fll_paths.h level_0/filesystem_paths.h level_0/pipe.h level_0/print.h level_0/serialized.h level_0/string.h level_0/types.h level_0/types_array.h level_0/utf.h level_1/colors.h level_1/console.h level_1/directory.h level_1/status.h level_1/file.h level_1/fss.h level_1/fss_basic.h level_1/fss_basic_list.h level_1/fss_status.h level_1/fss_extended.h level_1/fss_macro.h level_1/program.h level_1/serialized.h level_1/string.h level_1/utf.h level_2/colors.h level_2/execute.h level_2/status.h level_2/fss_basic.h level_2/fss_basic_list.h level_2/fss_extended.h level_2/fss_status.h
+build_sources_headers level_0/colors.h level_0/console.h level_0/conversion.h level_0/status.h level_0/file.h level_0/fss.h level_0/memory.h level_0/path_fll.h level_0/path_filesystem.h level_0/pipe.h level_0/print.h level_0/serialized.h level_0/string.h level_0/types.h level_0/types_array.h level_0/utf.h level_1/colors.h level_1/console.h level_1/directory.h level_1/status.h level_1/file.h level_1/fss.h level_1/fss_basic.h level_1/fss_basic_list.h level_1/fss_status.h level_1/fss_extended.h level_1/fss_macro.h level_1/program.h level_1/serialized.h level_1/string.h level_1/utf.h level_2/colors.h level_2/execute.h level_2/status.h level_2/fss_basic.h level_2/fss_basic_list.h level_2/fss_extended.h level_2/fss_status.h
 build_sources_bash
 build_sources_settings
 build_shared yes

diff --git a/level_0/f_conversion/c/conversion.h b/level_0/f_conversion/c/conversion.h
index f970d0cea4359b60051a4e8cd7dd3f2eee19aeed..5d5a396210687e7acef91d49e7e5162365dc8241 100644 (file)
--- a/level_0/f_conversion/c/conversion.h
+++ b/level_0/f_conversion/c/conversion.h
@@ -25,7 +25,7 @@
 // libc includes
 #include <stdlib.h>
 
-// fll includes
+// fll-0 includes
 #include <level_0/status.h>
 #include <level_0/string.h>
 #include <level_0/types.h>

diff --git a/level_0/f_fss/c/fss.h b/level_0/f_fss/c/fss.h
index 4a6373c3a14d1e6297c2f515695740a90df10dbb..9afd750bad486d8a2480bcfdf2e397e364cd68bb 100644 (file)
--- a/level_0/f_fss/c/fss.h
+++ b/level_0/f_fss/c/fss.h
@@ -13,7 +13,7 @@
 #ifndef _F_fss_h
 #define _F_fss_h
 
-// fll includes
+// fll-0 includes
 #include <level_0/status.h>
 #include <level_0/string.h>
 #include <level_0/types.h>

diff --git a/level_0/f_memory/c/memory.h b/level_0/f_memory/c/memory.h
index 5170fffca0e8c30eb53724553e28da26f9af5512..e2a0f152cafa747bed23d20fba9e06721a5f3e1d 100644 (file)
--- a/level_0/f_memory/c/memory.h
+++ b/level_0/f_memory/c/memory.h
@@ -28,7 +28,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-// fll includes
+// fll-0 includes
 #include <level_0/status.h>
 #include <level_0/types.h>
 

diff --git a/level_0/f_paths/c/filesystem_paths.h b/level_0/f_path/c/path_filesystem.h
similarity index 93%
rename from level_0/f_paths/c/filesystem_paths.h
rename to level_0/f_path/c/path_filesystem.h
index 8ee02a8d0851dfb6c521415a7a7aa0a022d27d87..f17469698eec7cb18fb5bb93da964162928596d1 100644 (file)
--- a/level_0/f_paths/c/filesystem_paths.h
+++ b/level_0/f_path/c/path_filesystem.h
@@ -1,7 +1,7 @@
 /**
  * FLL - Level 0
  *
- * Project: Paths
+ * Project: Path
  * API Version: 0.5
  * Licenses: lgplv2.1
  *
@@ -9,17 +9,17 @@
  *
  * FIXME: this is very outdated due to numerous structural changes while I was developing turtle kevux.
  */
-#ifndef _F_filesystem_paths_h
-#define _F_filesystem_paths_h
+#ifndef _F_path_filesystem_h
+#define _F_path_filesystem_h
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 // KFS Filesystem Paths
-#ifdef _di_kevux_standard_paths_
+#ifdef _di_path_kevux_standard_
   // disable the FHS default paths
-  #define _di_filesystem_hierarch_standard_paths_
+  #define _di_path_filesystem_hierarchy_standard_
 
   // KFS Root Level
   #define f_path_devices   "/devices"
@@ -83,12 +83,12 @@ extern "C" {
   #define f_path_user_data      "data"
   #define f_path_user_temporary "temporary"
   #define f_path_user_shared    "shared"
-#endif // _di_kevux_standard_paths_
+#endif // _di_path_kevux_standard_
 
 // FHS Filesystem Paths
-#ifndef _di_filesystem_hierarch_standard_paths_
+#ifndef _di_path_filesystem_hierarchy_standard_
   // disable the kevux standard default paths
-  #define _di_kevux_standard_paths_
+  #define _di_path_kevux_standard_
 
   // KFS Root Level
   #define f_path_devices   "/"
@@ -152,10 +152,10 @@ extern "C" {
   #define f_path_user_data      ""
   #define f_path_user_temporary ""
   #define f_path_user_shared    ""
-#endif // _di_filesystem_hierarch_standard_paths_
+#endif // _di_path_filesystem_hierarchy_standard_
 
 #ifdef __cplusplus
 } // extern "C"
 #endif
 
-#endif // _F_filesystem_paths_h
+#endif // _F_path_filesystem_h

diff --git a/level_0/f_paths/c/fll_paths.h b/level_0/f_path/c/path_fll.h
similarity index 91%
rename from level_0/f_paths/c/fll_paths.h
rename to level_0/f_path/c/path_fll.h
index 03bf40cfa35e4567776c2379a08764431b1e824f..5c115d1da7e62b60e07660e80b91f3942b755677 100644 (file)
--- a/level_0/f_paths/c/fll_paths.h
+++ b/level_0/f_path/c/path_fll.h
@@ -1,7 +1,7 @@
 /**
  * FLL - Level 0
  *
- * Project: Paths
+ * Project: Path
  * API Version: 0.5
  * Licenses: lgplv2.1
  *
@@ -10,10 +10,11 @@
  *
  * FIXME: this is very outdated due to numerous structural changes while I was developing turtle kevux.
  */
-#ifndef _F_fll_paths_h
-#define _F_fll_paths_h
+#ifndef _F_path_fll_h
+#define _F_path_fll_h
 
-#include <level_0/filesystem_paths.h>
+// fll-0 includes
+#include <level_0/path_filesystem.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -47,4 +48,4 @@ extern "C" {
 } // extern "C"
 #endif
 
-#endif // _F_fll_paths_h
+#endif // _F_path_fll_h

diff --git a/level_0/f_paths/data/build/dependencies b/level_0/f_path/data/build/dependencies
similarity index 100%
rename from level_0/f_paths/data/build/dependencies
rename to level_0/f_path/data/build/dependencies

diff --git a/level_0/f_paths/data/build/settings b/level_0/f_path/data/build/settings
similarity index 84%
rename from level_0/f_paths/data/build/settings
rename to level_0/f_path/data/build/settings
index d49cebdaded67db33b1d0a0c9c2de002fb74db58..4b64799b4680cfc1bbb5053caa5484bf273c4f2f 100644 (file)
--- a/level_0/f_paths/data/build/settings
+++ b/level_0/f_path/data/build/settings
@@ -1,6 +1,6 @@
 # fss-0000
 
-project_name f_paths
+project_name f_path
 project_level 0
 
 version_major 0
@@ -13,7 +13,7 @@ build_libraries
 build_libraries_fll
 build_sources_library 
 build_sources_program 
-build_sources_headers fll_paths.h filesystem_paths.h
+build_sources_headers path_fll.h path_filesystem.h
 build_sources_bash
 build_sources_settings
 build_shared yes

diff --git a/level_0/f_pipe/c/pipe.h b/level_0/f_pipe/c/pipe.h
index b09c8b382b0903b6453eb78c902cb75680dbde59..3633e1195a76c9d1aa8c35ce842d2aa9cc8fb57b 100644 (file)
--- a/level_0/f_pipe/c/pipe.h
+++ b/level_0/f_pipe/c/pipe.h
@@ -14,7 +14,7 @@
 #include <stdio.h>
 #include <sys/stat.h>
 
-// fll includes
+// fll-0 includes
 #include <level_0/status.h>
 #include <level_0/types.h>
 

diff --git a/level_0/f_socket/c/socket.h b/level_0/f_socket/c/socket.h
index c99b7d5c5c3ea07804e4782a0b821f6a56578d98..5b6ef09540733fdf25b273c79eecfce0d5926ed5 100644 (file)
--- a/level_0/f_socket/c/socket.h
+++ b/level_0/f_socket/c/socket.h
@@ -15,7 +15,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-// fll includes
+// fll-0 includes
 #include <level_0/status.h>
 #include <level_0/string.h>
 #include <level_0/types.h>

diff --git a/level_0/f_string/c/string.h b/level_0/f_string/c/string.h
index 3f0c8899b6fc975880883a2f0db6971ec8d619de..fb87e2430a4fa79144c324d07450fe3b47291095 100644 (file)
--- a/level_0/f_string/c/string.h
+++ b/level_0/f_string/c/string.h
@@ -13,7 +13,7 @@
 // libc includes
 #include <string.h>
 
-// fll includes
+// fll-0 includes
 #include <level_0/status.h>
 #include <level_0/memory.h>
 #include <level_0/types.h>

diff --git a/level_0/f_types/c/types_array.h b/level_0/f_types/c/types_array.h
index 3f786f7a8c312451df456449074ebd4a3bb7c977..c29a0029d198b8e35ce3f6b4081b15fecec55dfe 100644 (file)
--- a/level_0/f_types/c/types_array.h
+++ b/level_0/f_types/c/types_array.h
@@ -10,7 +10,7 @@
 #ifndef _F_types_array_h
 #define _F_types_array_h
 
-// fll includes
+// fll-0 includes
 #include <level_0/memory.h>
 #include <level_0/types.h>
 

diff --git a/level_0/f_utf/c/utf.h b/level_0/f_utf/c/utf.h
index 32fe7d74dd7dfa9a477c0f24178489d75eecd98a..f2f6c772baf44b65644cb5979b401fdac418f26d 100644 (file)
--- a/level_0/f_utf/c/utf.h
+++ b/level_0/f_utf/c/utf.h
@@ -38,7 +38,7 @@
 #include <ctype.h>
 #include <string.h>
 
-// fll includes
+// fll-0 includes
 #include <level_0/status.h>
 #include <level_0/types.h>
 #include <level_0/string.h>

diff --git a/level_1/fl_socket/c/socket.h b/level_1/fl_socket/c/socket.h
index f04dae57c0c7ff11f29accb875fc2c5492e837a1..8c5aa8d8d6be290800d9e8bc2dedcd1cbcf13311 100644 (file)
--- a/level_1/fl_socket/c/socket.h
+++ b/level_1/fl_socket/c/socket.h
@@ -19,7 +19,7 @@
 #include <sys/un.h>
 #include <unistd.h>
 
-// fll includes
+// fll-0 includes
 #include <level_0/status.h>
 #include <level_0/string.h>
 #include <level_0/types.h>

diff --git a/level_1/fl_string/c/string.h b/level_1/fl_string/c/string.h
index 5fde2d9a7ce40fbfaed82f736cad4ce1b87d8f41..6c73a8fbba510fbe50e06dec51bd584bd1ec04fc 100644 (file)
--- a/level_1/fl_string/c/string.h
+++ b/level_1/fl_string/c/string.h
@@ -14,7 +14,7 @@
 #include <ctype.h>
 #include <string.h>
 
-// fll includes
+// fll-0 includes
 #include <level_0/status.h>
 #include <level_0/memory.h>
 #include <level_0/string.h>

diff --git a/level_1/fl_utf/c/utf.h b/level_1/fl_utf/c/utf.h
index 708074f6b97c990a88ffb8a3c9264af53e2e4716..4695bc1a5ed36fc9bdbdb319f400aeec9e104740 100644 (file)
--- a/level_1/fl_utf/c/utf.h
+++ b/level_1/fl_utf/c/utf.h
@@ -14,7 +14,7 @@
 #include <ctype.h>
 #include <string.h>
 
-// fll includes
+// fll-0 includes
 #include <level_0/status.h>
 #include <level_0/memory.h>
 #include <level_0/string.h>

diff --git a/level_3/init/c/init.h b/level_3/init/c/init.h
index 4362233a0e747cd601ed8340f92283bdaafa42ba..f09356e73fc65b2cd2227e2a45d2577a79888649 100644 (file)
--- a/level_3/init/c/init.h
+++ b/level_3/init/c/init.h
@@ -83,7 +83,7 @@ extern "C" {
 #endif // _di_init_default_allocation_step_
 
 #ifndef _di_init_paths_
-  // @todo: this will eventually be written to use the f_paths project.
+  // @todo: this will eventually be written to use the f_path project.
   #define init_paths_rootfs         "/"
   #define init_paths_devices        "/dev/"
   #define init_paths_devices_pts    "/dev/pts/"