Revert "#9825 - Handle non ASCII command line parameters such as path"

NREL · Jul 25, 2023 · d101793 · d101793 · nrel-bot-2 · Jul 25, 2023
1 parent 7944edd
commit d101793
Show file tree

Hide file tree

Showing 18 changed files with 2,731 additions and 11,247 deletions.
diff --git a/cmake/CompilerFlags.cmake b/cmake/CompilerFlags.cmake
@@ -24,7 +24,6 @@ if(MSVC AND NOT ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel")) # Visual C++ (VS
   target_compile_options(project_options INTERFACE /EHsc)
   target_compile_options(project_options INTERFACE /MP) # Enables multi-processor compilation of source within a single project
   target_compile_options(project_options INTERFACE /Zc:externConstexpr)  # allows constexpr to be extern'd in headers, which is part of the standard, and supported by default on non-vs compilers
-  target_compile_options(project_options INTERFACE /utf-8)  # Specifies both the source character set and the execution character set as UTF-8
 
   # string(REGEX REPLACE "/W3" "/W1" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}"
   # )# Increase to /W2 then /W3 as more serious warnings are addressed (using regex to avoid VC override warnings)

diff --git a/src/ConvertInputFormat/main.cpp b/src/ConvertInputFormat/main.cpp
diff --git a/src/EnergyPlus/CMakeLists.txt b/src/EnergyPlus/CMakeLists.txt
@@ -1070,46 +1070,6 @@ if(BUILD_TESTING)
   set_tests_properties("API.test_SysExit" PROPERTIES ENVIRONMENT PYTHONPATH=${DIR_WITH_PY_ENERGYPLUS})
   add_test(NAME "API.test_OutputFiles" COMMAND "${Python_EXECUTABLE}" "${PROJECT_SOURCE_DIR}/tst/EnergyPlus/api/test_OutputFiles.py")
   set_tests_properties("API.test_OutputFiles" PROPERTIES ENVIRONMENT PYTHONPATH=${DIR_WITH_PY_ENERGYPLUS})
-
-  # 9825 - Test some non-ASCII directories
-  set(CLI_TEST_DIR "${PROJECT_BINARY_DIR}/tst/cli")
-  set(EXAMPLES_FILES_DIR "${PROJECT_SOURCE_DIR}/testfiles")
-
-  # This has some accented chars, and also the nice thing about it is that in `C:\path\dir\térmica`, you do have something that could be a `\t` escape sequence
-  set(NON_ASCII_DIRNAME "térmicà")
-  set(INPUT_TEST_DIR "${CLI_TEST_DIR}/${NON_ASCII_DIRNAME}")
-  file(MAKE_DIRECTORY ${INPUT_TEST_DIR})
-
-  set(TEST_CASE "1ZoneUncontrolled")
-  set(IDF_FILE "${EXAMPLES_FILES_DIR}/${TEST_CASE}.idf")
-  configure_file(${IDF_FILE} "${INPUT_TEST_DIR}/${TEST_CASE}.idf" COPYONLY)
-
-  add_test(NAME energyplus.TestNonASCIIDirsAndFiles.NoPlugin.FromWithin
-    COMMAND  energyplus -D -d "${CLI_TEST_DIR}/NoPlugin.FromWithin/out-${NON_ASCII_DIRNAME}" ${TEST_CASE}.idf
-    WORKING_DIRECTORY  "${CLI_TEST_DIR}/${NON_ASCII_DIRNAME}"
-  )
-
-  add_test(NAME energyplus.TestNonASCIIDirsAndFiles.NoPlugin.FromOutside
-    COMMAND  energyplus -D -d "${CLI_TEST_DIR}/NoPlugin.FromOutside/out-${NON_ASCII_DIRNAME}" ${NON_ASCII_DIRNAME}/${TEST_CASE}.idf
-    WORKING_DIRECTORY  "${CLI_TEST_DIR}"
-  )
-
-  set(TEST_CASE "PythonPlugin1ZoneUncontrolledCondFD")
-  set(IDF_FILE "${EXAMPLES_FILES_DIR}/${TEST_CASE}.idf")
-  configure_file(${IDF_FILE} "${INPUT_TEST_DIR}/${TEST_CASE}.idf" COPYONLY)
-  set(PY_FILE "${EXAMPLES_FILES_DIR}/${TEST_CASE}.py")
-  configure_file(${PY_FILE} "${INPUT_TEST_DIR}/${TEST_CASE}.py" COPYONLY)
-
-  add_test(NAME energyplus.TestNonASCIIDirsAndFiles.PythonPlugin.FromWithin
-    COMMAND  energyplus -D -d "${CLI_TEST_DIR}/PythonPlugin.FromWithin/out-${NON_ASCII_DIRNAME}" ${TEST_CASE}.idf
-    WORKING_DIRECTORY  "${CLI_TEST_DIR}/${NON_ASCII_DIRNAME}"
-  )
-
-  add_test(NAME energyplus.TestNonASCIIDirsAndFiles.PythonPlugin.FromOutside
-    COMMAND  energyplus -D -d "${CLI_TEST_DIR}/PythonPlugin.FromOutside/out-${NON_ASCII_DIRNAME}" ${NON_ASCII_DIRNAME}/${TEST_CASE}.idf
-    WORKING_DIRECTORY  "${CLI_TEST_DIR}"
-  )
-
 endif()
 
 if(UNIX AND NOT APPLE)

diff --git a/src/EnergyPlus/CommandLineInterface.cc b/src/EnergyPlus/CommandLineInterface.cc
diff --git a/src/EnergyPlus/CommandLineInterface.hh b/src/EnergyPlus/CommandLineInterface.hh
@@ -50,7 +50,6 @@
 
 // C++ Headers
 #include <string>
-#include <vector>
 
 // EnergyPlus Headers
 #include <EnergyPlus/api/EnergyPlusAPI.h>
@@ -73,7 +72,7 @@ namespace CommandLineInterface {
     };
 
     // Process command line arguments
-    int ENERGYPLUSLIB_API ProcessArgs(EnergyPlusData &state, const std::vector<std::string> &args);
+    int ENERGYPLUSLIB_API ProcessArgs(EnergyPlusData &state, int argc, const char *argv[]);
 
     void ReadINIFile(InputFile &inputFile,               // Unit number of the opened INI file
                      std::string const &Heading,         // Heading for the parameters ('[heading]')

diff --git a/src/EnergyPlus/PluginManager.cc b/src/EnergyPlus/PluginManager.cc
diff --git a/src/EnergyPlus/PluginManager.hh b/src/EnergyPlus/PluginManager.hh
@@ -184,7 +184,8 @@ namespace PluginManagement {
         ~PluginManager();
 
         static int numActiveCallbacks(EnergyPlusData &state);
-        static void addToPythonPath(EnergyPlusData &state, const fs::path &includePath, bool userDefinedPath);
+        static void addToPythonPath(EnergyPlusData &state, const fs::path &path, bool userDefinedPath);
+        static fs::path sanitizedPath(fs::path const &path);
         static void setupOutputVariables(EnergyPlusData &state);
 
         int maxGlobalVariableIndex = -1;
@@ -210,9 +211,6 @@ namespace PluginManagement {
         static bool anyUnexpectedPluginObjects(EnergyPlusData &state);
 
         bool eplusRunningViaPythonAPI = false;
-
-        // For debugging purposes / issuing better error messages
-        static std::vector<std::string> currentPythonPath();
     };
 
     struct PluginTrendVariable

diff --git a/src/EnergyPlus/api/EnergyPlusPgm.cc b/src/EnergyPlus/api/EnergyPlusPgm.cc
@@ -179,9 +179,6 @@
 // C++ Headers
 #include <exception>
 #include <iostream>
-#include <string>
-#include <vector>
-
 #ifndef NDEBUG
 #ifdef __unix__
 #include <cfenv>
@@ -222,7 +219,7 @@
 #include <unistd.h>
 #endif
 
-int EnergyPlusPgm(const std::vector<std::string> &args, std::string const &filepath)
+int EnergyPlusPgm(int argc, const char *argv[], std::string const &filepath)
 {
     EnergyPlus::EnergyPlusData state;
     //// these need to be set early to be used in help and version output messaging
@@ -236,7 +233,7 @@ int EnergyPlusPgm(const std::vector<std::string> &args, std::string const &filep
     }
     state.dataStrGlobals->VerStringVar = EnergyPlus::DataStringGlobals::VerString + "," + state.dataStrGlobals->CurrentDateTime;
 
-    EnergyPlus::CommandLineInterface::ProcessArgs(state, args);
+    EnergyPlus::CommandLineInterface::ProcessArgs(state, argc, argv);
     return RunEnergyPlus(state, filepath);
 }
 
@@ -336,7 +333,9 @@ int initializeEnergyPlus(EnergyPlus::EnergyPlusData &state, std::string const &f
             return EXIT_FAILURE;
         }
         state.dataStrGlobals->ProgramPath = filepath + DataStringGlobals::pathChar;
-        CommandLineInterface::ProcessArgs(state, {"energyplus"});
+        int dummy_argc = 1;
+        const char *dummy_argv[1] = {"energyplus"};
+        CommandLineInterface::ProcessArgs(state, dummy_argc, dummy_argv);
     }
 
     return commonRun(state);
@@ -419,7 +418,7 @@ int RunEnergyPlus(EnergyPlus::EnergyPlusData &state, std::string const &filepath
     return wrapUpEnergyPlus(state);
 }
 
-int runEnergyPlusAsLibrary(EnergyPlus::EnergyPlusData &state, const std::vector<std::string> &args)
+int runEnergyPlusAsLibrary(EnergyPlus::EnergyPlusData &state, int argc, const char *argv[])
 {
     // PROGRAM INFORMATION:
     //       AUTHOR         Linda K. Lawrie, et al
@@ -442,7 +441,7 @@ int runEnergyPlusAsLibrary(EnergyPlus::EnergyPlusData &state, const std::vector<
     if (!std::cerr.good()) std::cerr.clear();
     if (!std::cout.good()) std::cout.clear();
 
-    int return_code = EnergyPlus::CommandLineInterface::ProcessArgs(state, args);
+    int return_code = EnergyPlus::CommandLineInterface::ProcessArgs(state, argc, argv);
     if (return_code == static_cast<int>(EnergyPlus::CommandLineInterface::ReturnCodes::Failure)) {
         return return_code;
     } else if (return_code == static_cast<int>(EnergyPlus::CommandLineInterface::ReturnCodes::SuccessButHelper)) {
@@ -451,9 +450,7 @@ int runEnergyPlusAsLibrary(EnergyPlus::EnergyPlusData &state, const std::vector<
     }
 
     int status = initializeAsLibrary(state);
-    if (status || state.dataGlobal->outputEpJSONConversionOnly) {
-        return status;
-    }
+    if (status || state.dataGlobal->outputEpJSONConversionOnly) return status;
     try {
         EnergyPlus::SimulationManager::ManageSimulation(state);
     } catch (const EnergyPlus::FatalError &e) {

diff --git a/src/EnergyPlus/api/EnergyPlusPgm.hh b/src/EnergyPlus/api/EnergyPlusPgm.hh
@@ -52,7 +52,6 @@
 
 // C++ Headers
 #include <string>
-#include <vector>
 
 namespace EnergyPlus {
 struct EnergyPlusData;
@@ -66,11 +65,11 @@ int initializeEnergyPlus(EnergyPlus::EnergyPlusData &state, std::string const &f
 
 int wrapUpEnergyPlus(EnergyPlus::EnergyPlusData &state);
 
-int ENERGYPLUSLIB_API EnergyPlusPgm(const std::vector<std::string> &args, std::string const &filepath = std::string());
+int ENERGYPLUSLIB_API EnergyPlusPgm(int argc, const char *argv[], std::string const &filepath = std::string());
 
 int ENERGYPLUSLIB_API RunEnergyPlus(EnergyPlus::EnergyPlusData &state, std::string const &filepath = std::string());
 
-int runEnergyPlusAsLibrary(EnergyPlus::EnergyPlusData &state, const std::vector<std::string> &args);
+int runEnergyPlusAsLibrary(EnergyPlus::EnergyPlusData &state, int argc, const char *argv[]);
 
 void ENERGYPLUSLIB_API StoreProgressCallback(EnergyPlus::EnergyPlusData &state, void (*f)(int const));
 

diff --git a/src/EnergyPlus/api/runtime.cc b/src/EnergyPlus/api/runtime.cc
@@ -72,8 +72,7 @@ int energyplus(EnergyPlusState state, int argc, const char *argv[])
         return 1;
     }
     thisState->ready = false;
-    std::vector<std::string> args(argv, std::next(argv, static_cast<std::ptrdiff_t>(argc)));
-    return runEnergyPlusAsLibrary(*thisState, args);
+    return runEnergyPlusAsLibrary(*thisState, argc, argv);
 }
 
 void stopSimulation(EnergyPlusState state)

diff --git a/src/EnergyPlus/main.cc b/src/EnergyPlus/main.cc
@@ -45,24 +45,17 @@
 // OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 // POSSIBILITY OF SUCH DAMAGE.
 
-// EnergyPlus Headers
 #include <EnergyPlus/api/EnergyPlusPgm.hh>
 
-#include <CLI/CLI11.hpp>
-
 #ifdef DEBUG_ARITHM_GCC_OR_CLANG
 #include <EnergyPlus/fenv_missing.h>
 #endif
 
-int main()
+int main(int argc, const char *argv[])
 {
 #ifdef DEBUG_ARITHM_GCC_OR_CLANG
     feenableexcept(FE_DIVBYZERO | FE_INVALID | FE_OVERFLOW);
 #endif
 
-    int const argc = CLI::argc();
-    const char *const *argv = CLI::argv(); // This is going to use CommandLineToArgvW on Windows and **narrow** from wchar_t to char
-
-    const std::vector<std::string> args(argv, std::next(argv, static_cast<std::ptrdiff_t>(argc)));
-    return EnergyPlusPgm(args);
+    return EnergyPlusPgm(argc, argv);
 }