From 15c89a56f67b549246d0be285ad3975cff46871c Mon Sep 17 00:00:00 2001
From: Unbewohnte <me@unbewohnte.su>
Date: Tue, 11 Apr 2023 18:32:11 +0300
Subject: [PATCH] Updated libpath

---
 src/fs/libpath.c      | 69 ++++++++++++++++++++++++++++++++++++++-----
 src/fs/libpath.h      | 16 +++++++++-
 src/strings/auxistr.h |  3 ++
 testing/test.c        |  3 +-
 4 files changed, 82 insertions(+), 9 deletions(-)

diff --git a/src/fs/libpath.c b/src/fs/libpath.c
index 15d51cb..ad38cc0 100644
--- a/src/fs/libpath.c
+++ b/src/fs/libpath.c
@@ -133,12 +133,12 @@ void path_free(char** path) {
 Creates a new path pointing to the parent.
 Be sure to path_free() on the base as well after use.
 */
-char* path_parent(const char* path) {
+char* path_parent_copy(const char* path) {
     if (!path) {
         return NULL;
     }
 
-    char* base_path = NULL;
+    char* parent_path = NULL;
     char* clean_path = NULL;
     size_t path_len;
     size_t last_separator_index = 0;
@@ -160,18 +160,73 @@ char* path_parent(const char* path) {
         }
     }
 
+    if (last_separator_index == 0) {
+        return clean_path;
+    }
+
     // allocate memory to hold up to last separator bytes
-    base_path = malloc(sizeof(char) * last_separator_index);
-    if (!base_path) {
+    parent_path = malloc(sizeof(char) * last_separator_index);
+    if (!parent_path) {
         return NULL;
     }
 
     // copy over
-    memcpy(base_path, clean_path, sizeof(char) * last_separator_index);
-    base_path[last_separator_index] = '\0';
+    memcpy(parent_path, clean_path, sizeof(char) * last_separator_index);
+    parent_path[last_separator_index] = '\0';
 
     // free temporary cleaned path
     path_free(&clean_path);
 
-    return base_path;
+    return parent_path;
 }
+
+/*
+Shrinks given path so that it points to the parent.
+Reallocates memory.
+*/
+void path_parent(char* path) {
+    if (!path) {
+        return;
+    }
+    
+    path_clean(path);
+
+    size_t path_len = strlen(path);
+    size_t last_separator_index = 0;
+
+    // find the last separator index
+    for (size_t i = 0; i < path_len; i++) {
+        if (path[i] == PATH_SEPARATOR) {
+            last_separator_index = i;
+        }
+    }
+
+    if (last_separator_index == 0) {
+        return;
+    }
+
+    path = realloc(path, sizeof(char) * last_separator_index);
+    path[last_separator_index] = '\0';
+}
+
+/*
+Swaps Windows' path separators (\) in given path with
+POSIX path separators (/) if compiled for POSIX systems
+and the other way around. Calls path_clean on the resulting
+path 
+*/
+void path_to_native_separators(char* path) {
+    if (!path) {
+        return;
+    }
+
+    size_t path_len = strlen(path);
+
+    for (size_t i = 0; i < path_len; i++) {
+        if (path[i] == '\\' || path[i] == '/') {
+            path[i] = PATH_SEPARATOR;
+        }
+    }
+
+    path_clean(path);
+}
\ No newline at end of file
diff --git a/src/fs/libpath.h b/src/fs/libpath.h
index ca77b8a..360465e 100644
--- a/src/fs/libpath.h
+++ b/src/fs/libpath.h
@@ -38,4 +38,18 @@ void path_free(char** path);
 Creates a new path pointing to the parent.
 Be sure to path_free() on the base as well after use.
 */
-char* path_parent(const char* path);
\ No newline at end of file
+char* path_parent_copy(const char* path);
+
+/*
+Shrinks given path so that it points to the parent.
+Reallocates memory.
+*/
+void path_parent(char* path);
+
+/*
+Swaps Windows' path separators (\) in given path with
+POSIX path separators (/) if compiled for POSIX systems
+and the other way around. Calls path_clean on the resulting
+path 
+*/
+void path_to_native_separators(char* path);
\ No newline at end of file
diff --git a/src/strings/auxistr.h b/src/strings/auxistr.h
index ef75f5d..7669f2d 100644
--- a/src/strings/auxistr.h
+++ b/src/strings/auxistr.h
@@ -16,5 +16,8 @@ unsigned long strlength(const char* str);
 // Concatenate 2 strings together and return allocated resulting one
 char* strconcat(const char* first, const char* second);
 
+// Concatenate 2 strings together up to n-th char and return allocated resulting one
+char* strnconcat(const char* first, const char* second, unsigned long n);
+
 // Check if 2 strings are equal. Returns 1 if it is true, 0 - otherwise
 int streq(const char* first, const char* second);
\ No newline at end of file
diff --git a/testing/test.c b/testing/test.c
index 2e631bc..3a7257f 100644
--- a/testing/test.c
+++ b/testing/test.c
@@ -161,12 +161,13 @@ int test_libpath() {
         return EXIT_FAILURE;
     }
 
-    char* parent = path_parent(path);
+    char* parent = path_parent_copy(path);
     if (strcmp(parent, "./") != 0 && strcmp(parent, ".") != 0) {
         printf("[ERROR] Failed to find path's parent: got %s; expected %s\n", parent, ".");
         path_free(&path);
         return EXIT_FAILURE;
     }
+    path_free(&parent);
 
     path_free(&path);
     if (path != NULL) {