Simplify func__direxists() and func__fileexists()

internal/c/common.h

@@ -52,14 +52,14 @@
 #    endif
 
 // common includes
-#    include <stdio.h>
 #    include <cmath>
-#    include <stdint.h>
 #    include <errno.h>
 #    include <fcntl.h>
 #    include <fstream>
 #    include <iostream>
 #    include <limits.h>
+#    include <stdint.h>
+#    include <stdio.h>
 #    include <string.h>
 #    include <time.h>
 
@@ -77,13 +77,13 @@
 
 #    else
 
+#        include <dlfcn.h>
 #        include <pthread.h>
 #        include <stdlib.h>
 #        include <sys/stat.h>
 #        include <sys/types.h>
 #        include <sys/wait.h>
 #        include <unistd.h>
-#        include <dlfcn.h>
 
 #    endif
 
@@ -93,6 +93,9 @@
 #        endif
 #    endif
 
+#    define QB_FALSE 0
+#    define QB_TRUE -1
+
 // QB64 string descriptor structure
 struct qbs_field {
     int32 fileno;

internal/c/libqb/include/filesystem.h

@@ -7,9 +7,9 @@ struct qbs;
 extern qbs *g_startDir;
 
 qbs *func__cwd();
-qbs *func__dir(qbs *context);
-int32_t func__direxists(qbs *);
-int32_t func__fileexists(qbs *);
+qbs *func__dir(qbs *context_in);
+int32_t func__direxists(qbs *path);
+int32_t func__fileexists(qbs *path);
 qbs *func__startdir();
 void sub_chdir(qbs *str);
 void sub_files(qbs *str, int32_t passed);

internal/c/libqb/src/filesystem.cpp

@@ -53,9 +53,14 @@ qbs *func__cwd() {
 /// @brief Returns true if the specified directory exists
 /// @param path The directory to check for
 /// @return True if the directory exists
-static bool __DirectoryExists(std::string &path) {
+static bool __DirectoryExists(const char *path) {
+#ifdef QB64_WINDOWS
+    auto x = GetFileAttributesA(path);
+    return x != INVALID_FILE_ATTRIBUTES && (x & FILE_ATTRIBUTE_DIRECTORY);
+#else
     struct stat info;
-    return (stat(path.c_str(), &info) == 0 && S_ISDIR(info.st_mode));
+    return (stat(path, &info) == 0 && S_ISDIR(info.st_mode));
+#endif
 }
 
 /// @brief Known directories (primarily Windows based, but we'll do our best to emulate on other platforms)
@@ -126,7 +131,7 @@ void __GetKnownDirectory(KnownDirectory kD, std::string &path) {
             path.resize(strlen(path.c_str()));
             path.append("\\Downloads");
             mkdir(path.c_str());
-            if (!__DirectoryExists(path))
+            if (!__DirectoryExists(path.c_str()))
                 path.clear();
         }
 #else
@@ -166,7 +171,7 @@ void __GetKnownDirectory(KnownDirectory kD, std::string &path) {
         if (SUCCEEDED(SHGetFolderPathA(NULL, CSIDL_LOCAL_APPDATA | CSIDL_FLAG_CREATE, NULL, SHGFP_TYPE_CURRENT, (char *)path.data()))) {
             path.resize(strlen(path.c_str()));
             path.append("\\Microsoft\\Windows\\Fonts");
-            if (!__DirectoryExists(path))
+            if (!__DirectoryExists(path.c_str()))
                 path.clear();
         }
 #else
@@ -283,67 +288,51 @@ qbs *func__dir(qbs *context_in) {
     return final;
 }
 
-int32 func__direxists(qbs *file) {
+/// @brief Returns true if a directory specified exists
+/// @param path The directory path
+/// @return True if the directory exists
+int32 func__direxists(qbs *path) {
     if (new_error)
         return 0;
-    static qbs *strz = NULL;
+
+    static qbs *strz = nullptr;
+
     if (!strz)
         strz = qbs_new(0, 0);
-    qbs_set(strz, qbs_add(file, qbs_new_txt_len("\0", 1)));
-#ifdef QB64_WINDOWS
-    static int32 x;
-    x = GetFileAttributesA(filepath_fix_directory(strz));
-    if (x == INVALID_FILE_ATTRIBUTES)
+
+    qbs_set(strz, qbs_add(path, qbs_new_txt_len("\0", 1)));
+
+    return __DirectoryExists(filepath_fix_directory(strz)) ? QB_TRUE : QB_FALSE;
+}
+
+/// @brief Returns true if a file specified exists
+/// @param path The file patn
+/// @return True if the file exists
+int32 func__fileexists(qbs *path) {
+    if (new_error)
         return 0;
-    if (x & FILE_ATTRIBUTE_DIRECTORY)
-        return -1;
-    return 0;
-#elif defined(QB64_UNIX)
-    struct stat sb;
-    if (stat(filepath_fix_directory(strz), &sb) == 0 && S_ISDIR(sb.st_mode))
-        return -1;
-    return 0;
+
+    static qbs *strz = nullptr;
+
+    if (!strz)
+        strz = qbs_new(0, 0);
+
+    qbs_set(strz, qbs_add(path, qbs_new_txt_len("\0", 1)));
+
+#ifdef QB64_WINDOWS
+    auto x = GetFileAttributesA(filepath_fix_directory(strz));
+    return (x == INVALID_FILE_ATTRIBUTES || (x & FILE_ATTRIBUTE_DIRECTORY)) ? QB_FALSE : QB_TRUE;
 #else
-    return 0; // default response
+    struct stat sb;
+    return (stat(filepath_fix_directory(strz), &sb) == 0 && S_ISREG(sb.st_mode)) ? QB_TRUE : QB_FALSE;
 #endif
 }
 
-int32 func__fileexists(qbs *file) {
-    if (new_error)
-        return 0;
-    static qbs *strz = NULL;
-    if (!strz)
-        strz = qbs_new(0, 0);
-    qbs_set(strz, qbs_add(file, qbs_new_txt_len("\0", 1)));
-#ifdef QB64_WINDOWS
-    static int32 x;
-    x = GetFileAttributesA(filepath_fix_directory(strz));
-    if (x == INVALID_FILE_ATTRIBUTES)
-        return 0;
-    if (x & FILE_ATTRIBUTE_DIRECTORY)
-        return 0;
-    return -1;
-#elif defined(QB64_UNIX)
-    struct stat sb;
-    if (stat(filepath_fix_directory(strz), &sb) == 0 && S_ISREG(sb.st_mode))
-        return -1;
-    return 0;
-#else
-    // generic method (not currently used)
-    static std::ifstream fh;
-    fh.open(filepath_fix_directory(strz), std::ios::binary | std::ios::in);
-    if (fh.is_open() == NULL) {
-        fh.clear(std::ios::goodbit);
-        return 0;
-    }
-    fh.clear(std::ios::goodbit);
-    fh.close();
-    return -1;
-#endif
-}
-
-qbs *g_startDir = nullptr; // set on startup
+/// @brief This is a global variable that is set on startup and holds the directory that was current when the program was loaded
+qbs *g_startDir = nullptr;
 
+/// @brief Return the startup directory
+/// @return A qbs containing the directory path
 qbs *func__startdir() {
     qbs *temp = qbs_new(0, 1);
     qbs_set(temp, g_startDir);

internal/c/parts/audio/audio.cpp

@@ -28,9 +28,6 @@
 #define INVALID_MEM_LOCK 1073741821
 // This should be defined elsewhere (in libqb?). Since it is not, we are doing it here
 #define MEM_TYPE_SOUND 5
-// In QuickBASIC false means 0 and true means -1 (sad, but true XD)
-#define QB_FALSE MA_FALSE
-#define QB_TRUE -MA_TRUE
 // This is returned to the caller if handle allocation fails with a -1
 // CreateHandle() does not return 0 because it is a valid internal handle
 // Handle 0 is 'handled' as a special case