Implement isadirectory with std::filesystem

CMakeLists.txt

@@ -138,6 +138,7 @@ add_library(libid
     headers/get_ifs_token.h
     common/help.cpp
     common/intro.cpp headers/intro.h
+    headers/is_directory.h
     common/jiim.cpp headers/jiim.h
     headers/make_path.h
     common/miscovl.cpp headers/miscovl.h
@@ -292,6 +293,7 @@ source_group("Header Files/common/ui" FILES
     headers/help.h
     headers/helpdefs.h
     headers/intro.h
+    headers/is_directory.h
     headers/jiim.h
     headers/make_path.h
     headers/miscovl.h

common/cmdfiles.cpp

@@ -17,6 +17,7 @@
 #include "framain2.h"
 #include "helpcom.h"
 #include "id_data.h"
+#include "is_directory.h"
 #include "jb.h"
 #include "line3d.h"
 #include "loadfile.h"

common/prompts2.cpp

@@ -19,6 +19,7 @@
 #include "helpdefs.h"
 #include "id_data.h"
 #include "id_io.h"
+#include "is_directory.h"
 #include "loadfile.h"
 #include "loadmap.h"
 #include "lorenz.h"

headers/is_directory.h

@@ -0,0 +1,8 @@
+#pragma once
+
+#include <filesystem>
+
+inline bool isadirectory(const char *s)
+{
+    return std::filesystem::is_directory(s);
+}

headers/prompts2.h

@@ -16,7 +16,6 @@ extern int get_view_params();
 extern int get_starfield_params();
 extern int get_commands();
 extern void goodbye();
-extern bool isadirectory(char const *s);
 extern bool getafilename(char const *hdg, char const *file_template, char *flname);
 extern bool getafilename(char const *hdg, char const *file_template, std::string &flname);
 extern int splitpath(char const *file_template, char *drive, char *dir, char *fname, char *ext);

tests/CMakeLists.txt

@@ -30,6 +30,7 @@ add_executable(test-id
     test_find_file.cpp
     test_find_path.cpp
     test_get_ifs_token.cpp
+    test_is_directory.cpp
     test_make_path.cpp
     test_path_match.cpp
     test_search_path.cpp

tests/test_is_directory.cpp

@@ -0,0 +1,21 @@
+#include <is_directory.h>
+
+#include "test_data.h"
+
+#include <gtest/gtest.h>
+
+#include <filesystem>
+
+namespace fs = std::filesystem;
+
+TEST(TestIsDirectory, affirmative)
+{
+    EXPECT_TRUE(isadirectory(ID_TEST_DATA_DIR));
+    EXPECT_TRUE(isadirectory(ID_TEST_DATA_SUBDIR));
+}
+
+TEST(TestIsDirectory, negative)
+{
+    EXPECT_FALSE(isadirectory((fs::path{ID_TEST_DATA_DIR} / ID_TEST_IFS_FILE).string().c_str()));
+    EXPECT_FALSE(isadirectory((fs::path{ID_TEST_DATA_SUBDIR} / ID_TEST_IFS_FILE2).string().c_str()));
+}

unix/os_unix.cpp

@@ -33,46 +33,6 @@ VIDEOINFO g_video_table[MAX_VIDEO_MODES]{};
 // Global variables that should be phased out (old video mode stuff)
 int g_video_vram = 0;
 
-bool isadirectory(char const *s)
-{
-    int len;
-    char sv;
-    if (std::strchr(s, '*') || std::strchr(s, '?'))
-        return false; // for my purposes, not a directory
-
-    len = (int) std::strlen(s);
-    if (len > 0)
-        sv = s[len-1];   // last char
-    else
-        sv = 0;
-
-    if (fr_findfirst(s) != 0) // couldn't find it
-    {
-        // any better ideas??
-        if (sv == SLASHC) // we'll guess it is a directory
-            return true;
-        else
-            return false; // no slashes - we'll guess it's a file
-    }
-    else if ((DTA.attribute & SUBDIR) != 0)
-    {
-        if (sv == SLASHC)
-        {
-            // strip trailing slash and try again
-            std::string path{s, &s[len-1]};
-            if (fr_findfirst(path.c_str()) != 0) // couldn't find it
-                return false;
-            else if ((DTA.attribute & SUBDIR) != 0)
-                return true;  // we're SURE it's a directory
-            else
-                return false;
-        }
-        else
-            return true;  // we're SURE it's a directory
-    }
-    return false;
-}
-
 // converts relative path to absolute path
 int expand_dirname(char *dirname, char *drive)
 {

win32/os_win32.cpp

@@ -341,11 +341,6 @@ void home()
     g_text_col = 0;
 }
 
-bool isadirectory(char const *s)
-{
-    return PathIsDirectory(s) != 0;
-}
-
 // tenths of millisecond timewr routine
 // static struct timeval tv_start;