QB64/QB64-PE
QB64/QB64-PE
1
1
Fork 0
mirror of https://github.com/QB64-Phoenix-Edition/QB64pe.git synced 2024-07-04 04:50:22 +00:00
Code Issues Releases Wiki Activity

Make FS_GetFQN() return trailing slash for directories

Browse source
This commit is contained in:
Samuel Gomes 2023-12-29 00:58:15 +05:30
parent fcabef61ce
commit 85afb4b84a
2 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
internal/c/libqb/include/filesystem.h
View file

@ -1,4 +1,4 @@
//----------------------------------------------------------------------------------------------------
//-----------------------------------------------------------------------------------------------------
// QB64-PE filesystem related functions
//-----------------------------------------------------------------------------------------------------

21
internal/c/libqb/src/filesystem.cpp
View file

@ -1,4 +1,4 @@
//----------------------------------------------------------------------------------------------------
//-----------------------------------------------------------------------------------------------------
// QB64-PE filesystem related functions
//-----------------------------------------------------------------------------------------------------
@ -15,6 +15,8 @@
#include <unistd.h>
#ifdef QB64_WINDOWS
# include <shlobj.h>
#else
# include <sys/statvfs.h>
#endif
#ifdef QB64_BACKSLASH_FILESYSTEM
@ -696,28 +698,28 @@ static uint64_t FS_GetFreeDiskSpace(const char *path) {
/// @param path The path name to get the FQN for
/// @return The FQN
static std::string FS_GetFQN(const char *path) {
std::string FQN;
std::string FQN = path; // fallback
#ifdef QB64_WINDOWS
DWORD size = GetFullPathNameA(path, 0, nullptr, nullptr); // get the required buffer size
if (size) {
FQN.resize(size);
if (GetFullPathNameA(path, size, &FQN[0], nullptr)) {
if (GetFullPathNameA(path, size, &FQN[0], nullptr))
FQN.resize(size - 1); // resize to exclude the null terminator
return FQN;
}
}
#else
char *result = realpath(path, nullptr);
if (result) {
FQN = result;
free(result); // cleanup memory allocated by realpath
return FQN;
}
#endif
return path; // fallback
if (FS_DirectoryExists(FQN.c_str()) && FQN.back() != FS_PATH_SEPARATOR)
FQN.append(1, FS_PATH_SEPARATOR);
return FQN;
}
/// @brief Gets the short name for a file / directory (if possible)
@ -906,10 +908,11 @@ void sub_mkdir(qbs *str) {
qbs_set(strz, qbs_add(str, qbs_new_txt_len("\0", 1)));
#ifdef QB64_WINDOWS
if (mkdir(filepath_fix_directory(strz)) == -1) {
if (mkdir(filepath_fix_directory(strz)) == -1)
#else
if (mkdir(filepath_fix_directory(strz), S_IRWXU | S_IRWXG) == -1) {
if (mkdir(filepath_fix_directory(strz), S_IRWXU | S_IRWXG) == -1)
#endif
{
if (errno == EEXIST) {
error(75);
return;