Bugfix: Fixes to f_path of problems exposed by unit tests.

Remove unnecessary variable.
Remove unnecessary if condition.

Change while loop to be more robust in .
Check the path.used before checking path.string in case path.used is 0 (this should be safer).

Update function documentation.

The logic in private_f_path_real() is incorrect.
The realpath() function returns a string (char *) rather than an integer.

Also do some code clean up.

diff --git a/level_0/f_path/c/path.c b/level_0/f_path/c/path.c
index 23932f3b1629c8b4e58ce496f9acf57744b95a38..fe1994a7134f15f78579468c3e6cc57b7852ea27 100644 (file)
--- a/level_0/f_path/c/path.c
+++ b/level_0/f_path/c/path.c
@@ -33,6 +33,7 @@ extern "C" {
 
     if (fchdir(at_id) < 0) {
       if (errno == EACCES) return F_status_set_error(F_access_denied);
+      if (errno == EBADF) return F_status_set_error(F_directory_descriptor);
       if (errno == EFAULT) return F_status_set_error(F_buffer);
       if (errno == EIO) return F_status_set_error(F_input_output);
       if (errno == ELOOP) return F_status_set_error(F_loop);
@@ -40,7 +41,6 @@ extern "C" {
       if (errno == ENOENT) return F_status_set_error(F_file_found_not);
       if (errno == ENOMEM) return F_status_set_error(F_memory_not);
       if (errno == ENOTDIR) return F_status_set_error(F_directory);
-      if (errno == EBADF) return F_status_set_error(F_directory_descriptor);
 
       return F_status_set_error(F_failure);
     }
@@ -97,56 +97,48 @@ extern "C" {
       if (!directory) return F_status_set_error(F_parameter);
     #endif // _di_level_0_parameter_checking_
 
-    const f_array_length_t used_original = argument.used;
-
     directory->used = 0;
 
-    if (!used_original) {
+    if (!argument.used) {
       return F_none;
     }
 
-    // Ensure enough space is available for termiting slash and terminating NULL.
+    // Ensure enough space is available for terminating slash and terminating NULL.
     if (argument.string[argument.used - 1] == f_path_separator_s.string[0]) {
-      const f_status_t status = f_string_dynamic_increase_by(used_original + 1, directory);
+      const f_status_t status = f_string_dynamic_increase_by(argument.used + 1, directory);
       if (F_status_is_error(status)) return status;
     }
     else {
-      const f_status_t status = f_string_dynamic_increase_by(used_original + 2, directory);
+      const f_status_t status = f_string_dynamic_increase_by(argument.used + 2, directory);
       if (F_status_is_error(status)) return status;
     }
 
-    if (used_original == 1) {
-      directory->string[0] = argument.string[0];
-
-      return F_none;
-    }
-
     f_array_length_t i = 0;
     f_array_length_t j = 0;
 
-    do {
+    while (i < argument.used) {
+
       if (argument.string[i] == f_path_separator_s.string[0]) {
         directory->string[directory->used++] = f_path_separator_s.string[0];
 
         do {
           ++i;
-        } while (i < used_original && (argument.string[i] == f_path_separator_s.string[0] || !argument.string[i]));
+        } while (i < argument.used && (argument.string[i] == f_path_separator_s.string[0] || !argument.string[i]));
       }
       else {
         j = i + 1;
 
-        while (j < used_original && argument.string[j] != f_path_separator_s.string[0]) {
+        while (j < argument.used && argument.string[j] != f_path_separator_s.string[0]) {
           ++j;
         } // while
 
-        // Use memcpy() to take advantage of its optimized copy behaviors whenever possible.
+        // Use memcpy() to take advantage of its optimized copy behaviors.
         memcpy(directory->string + directory->used, argument.string + i, sizeof(f_char_t) * (j - i));
 
         directory->used += j - i;
         i = j;
       }
-
-    } while (i < used_original);
+    } // while
 
     if (directory->string[directory->used - 1] != f_path_separator_s.string[0]) {
       directory->string[directory->used++] = f_path_separator_s.string[0];
@@ -161,7 +153,7 @@ extern "C" {
 #ifndef _di_f_path_is_
   f_status_t f_path_is(const f_string_static_t path) {
 
-    if (!path.string || !path.used) {
+    if (!path.used || !path.string) {
       return F_data_not;
     }
 
@@ -176,7 +168,7 @@ extern "C" {
 #ifndef _di_f_path_is_absolute_
   f_status_t f_path_is_absolute(const f_string_static_t path) {
 
-    if (!path.string || !path.used) {
+    if (!path.used || !path.string) {
       return F_data_not;
     }
 
@@ -196,7 +188,7 @@ extern "C" {
 #ifndef _di_f_path_is_relative_
   f_status_t f_path_is_relative(const f_string_static_t path) {
 
-    if (!path.string || !path.used) {
+    if (!path.used || !path.string) {
       return F_data_not;
     }
 
@@ -216,7 +208,7 @@ extern "C" {
 #ifndef _di_f_path_is_relative_current_
   f_status_t f_path_is_relative_current(const f_string_static_t path) {
 
-    if (!path.string || !path.used) {
+    if (!path.used || !path.string) {
       return F_data_not;
     }
 

diff --git a/level_0/f_path/c/path.h b/level_0/f_path/c/path.h
index 5b69b31cd8aff05b00c03674b7cca59e83fa49f7..9393d14d3c5355219bfb2125eadade1c01a026b7 100644 (file)
--- a/level_0/f_path/c/path.h
+++ b/level_0/f_path/c/path.h
@@ -36,6 +36,8 @@ extern "C" {
 /**
  * Change to a path.
  *
+ * When path.used is 0, then this is treated as an empty string.
+ *
  * @param path
  *   The file path.
  *
@@ -198,6 +200,8 @@ extern "C" {
  * A string without any path parts that could be a path is considered a relative path by this function.
  * That is to say "my_file.txt" is a relative path string.
  *
+ * The strings that are relative to the current path, such as  "./my_file.txt", are considered relative by this function.
+ *
  * @param path
  *   The string that may or may not represent a relative path.
  *

diff --git a/level_0/f_path/c/private-path.c b/level_0/f_path/c/private-path.c
index 8baeeff9b76ba262c968f5a306830066be43f5a3..c41f4548e32aee86591dbd03adbe9dd62e678490 100644 (file)
--- a/level_0/f_path/c/private-path.c
+++ b/level_0/f_path/c/private-path.c
@@ -8,9 +8,9 @@ extern "C" {
 #if !defined(_di_f_path_current_) || !defined(_di_f_path_real_)
   f_status_t private_f_path_real(const char *path, f_string_dynamic_t * const real) {
 
-    char buffer[F_path_length_max_d];
+    char *buffer = realpath(path, buffer);
 
-    if (!realpath(path, buffer)) {
+    if (buffer == 0) {
       if (errno == EACCES) return F_status_set_error(F_access_denied);
       if (errno == EINVAL) return F_status_set_error(F_parameter);
       if (errno == EIO) return F_status_set_error(F_input_output);