From b543f3e973a2e75de04964a025ecf2101ee8c08f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luis=20D=C3=ADaz=20M=C3=A1s?= <piponazo@gmail.com>
Date: Fri, 18 Feb 2022 18:45:22 +0100
Subject: [PATCH] Use filesystem in getExiv2ConfigPath

It seems to have an important impact in performance. The execution of
ctest on Windows passed from 48.5 secs to 43.8. Check if this is the
same on Linux
---
 src/makernote_int.cpp | 52 ++++++++++---------------------------------
 1 file changed, 12 insertions(+), 40 deletions(-)

diff --git a/src/makernote_int.cpp b/src/makernote_int.cpp
index e0ed6255..657c5641 100644
--- a/src/makernote_int.cpp
+++ b/src/makernote_int.cpp
@@ -35,9 +35,10 @@
 #include "utils.hpp"
 
 // + standard includes
-#include <string>
+#include <filesystem>
 #include <fstream>
-#include <cstring>
+
+namespace fs = std::filesystem;
 
 #if defined(__MINGW32__) || defined(__MINGW64__)
 #ifndef __MINGW__
@@ -53,25 +54,6 @@
 #include <windows.h>
 #include <direct.h> // _getcwd
 #include <shlobj.h>
-  /* older SDKs not have these */
-# ifndef CSIDL_MYMUSIC
-#    define CSIDL_MYMUSIC 13
-# endif
-# ifndef CSIDL_MYVIDEO
-#    define CSIDL_MYVIDEO 14
-# endif
-# ifndef CSIDL_INTERNET_CACHE
-#    define CSIDL_INTERNET_CACHE 32
-# endif
-# ifndef CSIDL_COMMON_APPDATA
-#    define CSIDL_COMMON_APPDATA 35
-# endif
-# ifndef CSIDL_MYPICTURES
-#    define CSIDL_MYPICTURES 0x27
-# endif
-# ifndef CSIDL_COMMON_DOCUMENTS
-#    define CSIDL_COMMON_DOCUMENTS 46
-# endif
 # ifndef CSIDL_PROFILE
 #    define CSIDL_PROFILE 40
 # endif
@@ -97,7 +79,6 @@ namespace {
 namespace Exiv2 {
     namespace Internal {
 
-        // C++17 use std::filesystem
         // Function first looks for a config file in current working directory
         // on Win the file should be named "exiv2.ini"
         // on Lin the file should be named ".exiv2"
@@ -105,36 +86,27 @@ namespace Exiv2 {
         // which is the user profile path on win and the home dir on linux
         std::string getExiv2ConfigPath()
         {
-            std::string dir;
 #if defined(_MSC_VER) || defined(__MINGW__)
             std::string inifile("exiv2.ini");
 #else
             std::string inifile(".exiv2");
 #endif
-
-            // first lets get the current working directory to check if there is a config file
-            char buffer[1024];
-#if defined(_MSC_VER) || defined(__MINGW__)
-            auto path = _getcwd(buffer, sizeof(buffer));
-#else
-            auto path = getcwd(buffer, sizeof(buffer));
-#endif
-            dir = std::string(path ? path : "");
-            auto const filename = dir + EXV_SEPARATOR_CHR + inifile;
-            // true if the file exists
-            if (std::ifstream(filename).good()) {
-                return filename;
+            auto currentPath = fs::current_path();
+            auto iniPath = currentPath / inifile;
+            if (fs::exists(iniPath)) {
+                return iniPath.string();
             }
 
 #if defined(_MSC_VER) || defined(__MINGW__)
-            if (SUCCEEDED(SHGetFolderPathA(NULL, CSIDL_PROFILE, NULL, 0, path))) {
-                dir = std::string(path);
+            char buffer[1024];
+            if (SUCCEEDED(SHGetFolderPathA(NULL, CSIDL_PROFILE, NULL, 0, buffer))) {
+                currentPath = buffer;
             }
 #else
             struct passwd* pw = getpwuid(getuid());
-            dir = std::string(pw ? pw->pw_dir : "");
+            currentPath = std::string(pw ? pw->pw_dir : "");
 #endif
-            return dir + EXV_SEPARATOR_CHR + inifile;
+            return (currentPath / inifile).string();
         }
 
         std::string readExiv2Config(const std::string& section, const std::string& value, const std::string& def)