Compare commits

...

2 Commits

Author SHA1 Message Date
de88e9ff16 added List_T_destroyWithElements 2025-12-21 20:22:35 +05:00
26de01c3e7 added path_getUserDir, dir_createParent 2025-12-21 20:00:10 +05:00
8 changed files with 73 additions and 13 deletions

View File

@@ -19,6 +19,8 @@ C library with collections, strings, exceptions, io...
cbuild build_static_lib_dbg cbuild build_static_lib_dbg
``` ```
6. If you use tlibc as static library, add `LINKER_LIBS` from tlibc `project.config` to your project.
## Usage ## Usage
```c ```c

View File

@@ -39,6 +39,13 @@ static inline List(T) List_##T##_copy(const List(T)* src) { \
\ \
static inline void List_##T##_destroy(List(T)* self) { _List_destroy((void*)self); } \ static inline void List_##T##_destroy(List(T)* self) { _List_destroy((void*)self); } \
\ \
static inline void List_##T##_destroyWithElements(List(T)* self, void (*elem_destructor)(T*)) { \
for(u32 i = 0; i < self->len; i++){ \
elem_destructor(self->data + i);\
} \
_List_destroy((void*)self); \
} \
\
/* alloc bigger buffer if size + len_to_add won't fit in current */ \ /* alloc bigger buffer if size + len_to_add won't fit in current */ \
static inline void List_##T##_increaseCapacity(List(T)* self, u32 len_to_add){ \ static inline void List_##T##_increaseCapacity(List(T)* self, u32 len_to_add){ \
_List_increaseCapacity((void*)self, len_to_add); \ _List_increaseCapacity((void*)self, len_to_add); \

View File

@@ -39,6 +39,8 @@ str path_dirname(str path);
/// @return pointer to a segment of path.data or path itself if no path_sep has been found /// @return pointer to a segment of path.data or path itself if no path_sep has been found
str path_basename(str path, bool remove_ext); str path_basename(str path, bool remove_ext);
/// @return heap-allocated string
Result(char*) path_getUserDir();
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////
// FILE // // FILE //
@@ -145,8 +147,15 @@ Result(void) file_readWholeText(FILE* f, str* out_str);
// DIRECTORY // // DIRECTORY //
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////
/// @return true if directory exists or `path` is null or empty or '.' or './'
bool dir_exists(cstr path); bool dir_exists(cstr path);
/// @brief creates directories specified in path recursively /// @brief creates directories specified in path recursively
/// EXAMPLE: dir_createParent("a/b/c") -> creates "a", "a/b", "a/b/c"
/// @return false if directory was present already, true if it has been created /// @return false if directory was present already, true if it has been created
Result(bool) dir_create(cstr path); Result(bool) dir_create(cstr path);
/// @brief creates directories except the last part of path
/// EXAMPLE: dir_createParent("a/b/c") -> creates "a", "a/b"
/// @return false if directory was present already, true if it has been created
Result(bool) dir_createParent(cstr path);

View File

@@ -16,10 +16,10 @@ typedef struct str {
/* /*
USAGE: USAGE:
str s = STR("something"); str s = STR("something");
printf(FMT_str"\n", str_expand(s)); printf(FMT_str"\n", str_unwrap(s));
*/ */
#define FMT_str "%.*s" #define FMT_str "%.*s"
#define str_expand(S) (S).len, (S).data #define str_unwrap(S) (S).len, (S).data
/// creates str from a string literal /// creates str from a string literal
#define STR(LITERAL) str_construct(LITERAL, ARRAY_LEN(LITERAL) - 1, true) #define STR(LITERAL) str_construct(LITERAL, ARRAY_LEN(LITERAL) - 1, true)
@@ -59,7 +59,7 @@ static inline str Array_u8_castTo_str(Array(u8) a, bool isZeroTerminated) {
static const str str_null = str_construct(NULL, 0, 0); static const str str_null = str_construct(NULL, 0, 0);
/// copies src content to new string and adds \0 at the end /// copy str data to new str and add \0 at the end
str str_copy(const str self); str str_copy(const str self);
/// compares two strings, NullPtr-friendly /// compares two strings, NullPtr-friendly

View File

@@ -43,7 +43,7 @@ case "$OS" in
EXEC_FILE="$PROJECT.exe" EXEC_FILE="$PROJECT.exe"
SHARED_LIB_FILE="$PROJECT.dll" SHARED_LIB_FILE="$PROJECT.dll"
INCLUDE="$INCLUDE " INCLUDE="$INCLUDE "
LINKER_LIBS="" LINKER_LIBS="-luuid"
;; ;;
LINUX) LINUX)
EXEC_FILE="$PROJECT" EXEC_FILE="$PROJECT"

View File

@@ -1,6 +1,9 @@
#include "internal.h" #include "internal.h"
bool dir_exists(cstr path){ bool dir_exists(cstr path){
if(path == NULL || path[0] == 0)
return true;
if(path[0]=='.'){ if(path[0]=='.'){
if(path[1]==0 || (path[1]==path_sep && path[1]==0)) if(path[1]==0 || (path[1]==path_sep && path[1]==0))
return true; // dir . or ./ always exists return true; // dir . or ./ always exists
@@ -23,13 +26,12 @@ bool dir_exists(cstr path){
Result(bool) dir_create(cstr path){ Result(bool) dir_create(cstr path){
Deferral(4); Deferral(4);
if (dir_exists(path)){
if (path == NULL || path[0] == 0 || dir_exists(path)){
Return RESULT_VALUE(i, false); Return RESULT_VALUE(i, false);
} }
char* parentDir= str_copy(path_dirname(str_from_cstr((void*)path))).data; try_void(dir_createParent(path));
Defer(free(parentDir));
try_void(dir_create(parentDir));
#if TLIBC_FS_USE_WINDOWS_H #if TLIBC_FS_USE_WINDOWS_H
if(!CreateDirectory(path, NULL)) if(!CreateDirectory(path, NULL))
@@ -47,3 +49,18 @@ Result(bool) dir_create(cstr path){
Return RESULT_VALUE(i, true); Return RESULT_VALUE(i, true);
} }
Result(bool) dir_createParent(cstr path){
Deferral(4);
str parent_dir_str = path_dirname(str_from_cstr((void*)path));
if(parent_dir_str.len == 0){
Return RESULT_VALUE(i, false);
}
char* parent_dir_cstr = str_copy(parent_dir_str).data;
Defer(free(parent_dir_cstr));
try(bool result, i, dir_create(parent_dir_cstr));
Return RESULT_VALUE(i, result);
}

View File

@@ -1,4 +1,10 @@
#include "tlibc/filesystem.h" #include "internal.h"
#if TLIBC_FS_USE_WINDOWS_H
#include <knownfolders.h>
#include <shlobj.h>
#else
#endif
str path_dirname(str path){ str path_dirname(str path){
if(path.len == 0) if(path.len == 0)
@@ -43,3 +49,23 @@ str path_basename(str path, bool remove_ext){
} }
return path; return path;
} }
Result(char*) path_getUserDir(){
#if TLIBC_FS_USE_WINDOWS_H
PWSTR wpath = NULL;
HRESULT reslut = SHGetKnownFolderPath(&FOLDERID_Profile, 0, NULL, &wpath);
if(!SUCCEEDED(reslut)){
return RESULT_ERROR_LITERAL("can't get user directory by SHGetKnownFolderPath()");
}
size_t char_len = wcslen(wpath) * 4 + 1;
char* path = (char*)malloc(char_len);
wcstombs(path, wpath, char_len);
return RESULT_VALUE(p, path);
#else
const char *home = getenv("HOME");
if(home == NULL){
return RESULT_ERROR_LITERAL("can't get user directory by getenv(\"HOME\")");
}
return RESULT_VALUE(p, cstr_copy(home));
#endif
}

View File

@@ -2,11 +2,10 @@
#include "tlibc/string/StringBuilder.h" #include "tlibc/string/StringBuilder.h"
str str_copy(const str self){ str str_copy(const str self){
if(self.data == NULL || self.len == 0)
return self;
str copy = str_construct((char*)malloc(self.len + 1), self.len, true); str copy = str_construct((char*)malloc(self.len + 1), self.len, true);
if(self.len != 0){
memcpy(copy.data, self.data, self.len); memcpy(copy.data, self.data, self.len);
}
copy.data[copy.len] = '\0'; copy.data[copy.len] = '\0';
return copy; return copy;
} }