Merge branch 'develop' into 'main'

New GDX release 7.11.14

See merge request devel/gdx!103

Author: 0x17

.gitlab-ci.yml

@@ -34,20 +34,20 @@ variables:
 build-leg-image:
   extends: .build-leg-image
   script:
-    - docker build -t registry.gams.com/devel/gdx/leg/builder-gdx:latest ci/images/leg
-    - docker push registry.gams.com/devel/gdx/leg/builder-gdx:latest
+    - docker build -t $DEVEL_CONTAINER_REG/gdx/leg/builder-gdx:latest ci/images/leg
+    - docker push $DEVEL_CONTAINER_REG/gdx/leg/builder-gdx:latest
 
 build-leg-analyze-image:
   extends: .build-leg-image
   script:
-    - docker build -t registry.gams.com/devel/gdx/leg/builder-analyze:latest ci/images/leg-analyze
-    - docker push registry.gams.com/devel/gdx/leg/builder-analyze:latest
+    - docker build -t $DEVEL_CONTAINER_REG/gdx/leg/builder-analyze:latest ci/images/leg-analyze
+    - docker push $DEVEL_CONTAINER_REG/gdx/leg/builder-analyze:latest
 
 build-leg-deploy-image:
   extends: .build-leg-image
   script:
-    - docker build -t registry.gams.com/devel/gdx/leg/builder-deploy:latest ci/images/leg-deploy
-    - docker push registry.gams.com/devel/gdx/leg/builder-deploy:latest
+    - docker build -t $DEVEL_CONTAINER_REG/gdx/leg/builder-deploy:latest ci/images/leg-deploy
+    - docker push $DEVEL_CONTAINER_REG/gdx/leg/builder-deploy:latest
 
 #=======================================================================================================================
 
@@ -56,7 +56,7 @@ apigenerator:
   tags: [linux]
   dependencies: []
   image:
-    name: registry.gams.com/devel/gdx/leg/builder-gdx:latest
+    name: $DEVEL_CONTAINER_REG/gdx/leg/builder-gdx:latest
     entrypoint: [ "" ]
   script:
     - mkdir -p apifiles
@@ -420,7 +420,7 @@ leak-check-leg:
   stage: leak-check
   tags: [linux]
   image:
-    name: registry.gams.com/devel/ciscripts/leg/builder-valgrind-codequality:latest
+    name: $DEVEL_CONTAINER_REG/ciscripts/leg/builder-valgrind-codequality:latest
     entrypoint: [""]
   when: manual # FIXME: resolve GLIBC_2.* not found!
   needs: [fetch-ci-scripts,build-debug-leg]
@@ -523,7 +523,7 @@ deploy-gitlab-github:
   tags: [linux]
   needs: [build-leg,build-dac,build-wei,apigenerator]
   image:
-    name: registry.gams.com/devel/gdx/leg/builder-deploy:latest
+    name: $DEVEL_CONTAINER_REG/gdx/leg/builder-deploy:latest
     entrypoint: [""]   # prevent startup.sh
   script:
     - GDX_TAG_NAME="`python3 ci/changelog_head.py tag_name`"

changelog.yaml

@@ -1,4 +1,6 @@
 ---
+- 7.11.14:
+    - Correctly deal with GDX files that have long absolute paths (>260 characters) in GDX library and all tools (`gdxdump`, `gdxdiff`, `gdxmerge`).
 - 7.11.13:
     - Fixed the processing of commands via a text file (`@filename`) in `gdxmerge`.
     - Corrected documentation of `SyNr` argument of `gdxSymbolGetDomain(X)`.

src/gdlib/statlibobj.cpp

@@ -717,7 +717,7 @@ bool TGMSStatusStream::checkfile( std::string &msg )
 {
    if( Fstatusopen )
    {
-      fclose(Ffstat);
+      std::fclose(Ffstat);
       Ffstat = nullptr;
       Fstatusopen = false;
       msg.clear();
@@ -901,7 +901,8 @@ bool TGMSStatusStream::StatusDumpNext( std::string &msg )
 
    if( feof(Ffstat) )
    {
-      fclose(Ffstat);
+      std::fclose(Ffstat);
+      Ffstat = nullptr;
       Fstatusopen = false;
       msg.clear();
       return false;
@@ -1017,7 +1018,8 @@ bool TGMSStatusStream::StatusProcessNext( stattypes::tstatusproc &statusproc, st
             case '3':
                statusproc = stattypes::statusEOF;
                msg1 = "End-of-File request";
-               fclose( Ffstat );
+               std::fclose( Ffstat );
+               Ffstat = nullptr;
                Fstatusopen = false;
                return false;
 
@@ -1154,7 +1156,8 @@ bool TGMSStatusStream::StatusProcessNext( stattypes::tstatusproc &statusproc, st
    msg1 = "End-of-File reached";
    msg2.clear();
    num = 0;
-   fclose( Ffstat );
+   std::fclose( Ffstat );
+   Ffstat = nullptr;
    Fstatusopen = false;
    return false;
 }
@@ -1163,7 +1166,8 @@ void TGMSStatusStream::StatusSetFilename( const std::string &fn )
 {
    if( Fstatusopen )
    {
-      fclose( Ffstat );
+      std::fclose( Ffstat );
+      Ffstat = nullptr;
       Fstatusopen = false;
       StatusErrorFree();
    }
@@ -1183,7 +1187,8 @@ bool TGMSStatusStream::StatusDummy( std::string &msg )
    writeln_gf( "**** SOLVER DID NOT WRITE A STATUS FILE ****" );
    writeln_gf( "" );
    writeln_gf( "=3" );
-   fclose( Ffstat );
+   std::fclose( Ffstat );
+   Ffstat = nullptr;
    Fstatusopen = false;
    msg.clear();
    return true;
@@ -1295,7 +1300,8 @@ void TGMSStatusStream::StatusClose()
 {
    if( Fstatusopen )
    {
-      fclose( Ffstat );
+      std::fclose( Ffstat );
+      Ffstat = nullptr;
       Fstatusopen = false;
    }
 }
@@ -1322,19 +1328,22 @@ bool TGMSStatusStream::StatusFileOpen( const tfileaction AAction, std::string &m
       //  012345
       // '**** SOLVER DID NOT WRITE A STATUS FILE'
       newstat = s.substr(5, 14) == "SOLVER DID NOT"s;
-      fclose( Ffstat );
+      std::fclose( Ffstat );
+      Ffstat = nullptr;
+      Fstatusopen = false;
    } else newstat = true;
    //delete Ffstat;
 
    // FIXME: Finish porting!
+   // ...
+   STUBWARN();
+   // TODO: Implement me!
 
    if(!newstat && AAction == forAppend) {
    }
    return false;
 
-   // ...
-   STUBWARN();
-   // TODO: Implement me!
+
 }
 
 void TGMSStatusStream::StatusWriteLn( const std::string &s ) const

src/gdlib/utils.cpp

@@ -586,7 +586,7 @@ void stocp( const std::string &s, char *cp )
 
 int strCompare( const std::string_view S1, const std::string_view S2, const bool caseInsensitive )
 {
-   if( S1.empty() || S2.empty() ) return b2i( !S1.empty() ) - b2i( !S2.empty() );
+   if( S1.empty() || S2.empty() ) return static_cast<int>( !S1.empty() ) - static_cast<int>( !S2.empty() );
    auto L = S1.length();
    if( L > S2.length() ) L = S2.length();
    for( size_t K {}; K < L; K++ )

src/gdlib/utils.hpp

@@ -753,8 +753,6 @@ inline auto ord( const char c )
    return static_cast<unsigned char>( c );
 }
 
-inline auto b2i(const bool x) { return x ? 1 : 0; }
-
 inline int pos( const char c, const std::string &s )
 {
    const auto p { s.find( c ) };

src/rtl/p3utils.cpp

@@ -353,10 +353,9 @@ static inline bool p3IsValidHandle(const Tp3FileHandle h) {
 int p3FileOpen( const std::string &fName, Tp3FileOpenAction mode, Tp3FileHandle &h )
 {
 #if defined(_WIN32)
-   DWORD lowMode;
-   HANDLE hFile;
+   HANDLE hFile {};
 
-   lowMode = mode & 3;
+   const DWORD lowMode = mode & 3;
    if (3 == lowMode) {
       h = INVALID_HANDLE_VALUE;
       return ERROR_INVALID_PARAMETER;
@@ -373,20 +372,30 @@ int p3FileOpen( const std::string &fName, Tp3FileOpenAction mode, Tp3FileHandle
       }
    }
    else
-      hFile = CreateFileA (fName.c_str(), accessMode[lowMode], shareMode[lowMode], nullptr,
+   {
+      bool longAbsPath {};
+#if defined(_WIN32)
+      longAbsPath = fName.length() > MAX_PATH && std::isalpha(fName.front()) && fName[1] == ':';
+#endif
+      if(longAbsPath)
+         hFile = CreateFileA ((R"(\\?\)"+fName).c_str(), accessMode[lowMode], shareMode[lowMode], nullptr,
                           createHow[lowMode], FILE_ATTRIBUTE_NORMAL, nullptr);
-   if (INVALID_HANDLE_VALUE == hFile) {
+      else
+         hFile = CreateFileA (fName.c_str(), accessMode[lowMode], shareMode[lowMode], nullptr,
+                          createHow[lowMode], FILE_ATTRIBUTE_NORMAL, nullptr);
+   }
+   if( INVALID_HANDLE_VALUE == hFile )
+   {
       h = INVALID_HANDLE_VALUE;
-      int result = win2c(static_cast<int>(GetLastError()));
-      if (0 == result) { /* ouch: just pick a likely but non-specific code */
+      int result = win2c( static_cast<int>( GetLastError() ) );
+      if( 0 == result )
+      { /* ouch: just pick a likely but non-specific code */
          result = EACCES;
       }
       return result;
    }
-   else {
-      h = hFile;
-      return 0;
-   }
+   h = hFile;
+   return 0;
 #else
    if (fName.empty()) {
       if (mode == Tp3FileOpenAction::p3OpenRead)

src/rtl/sysutils_p3.cpp

@@ -95,6 +95,9 @@ std::string ExtractFileExt( const std::string &FileName )
 bool FileExists( const std::string &FileName )
 {
 #if defined(_WIN32)
+   // put \\?\ in front of long absolute paths
+   if(FileName.length() > MAX_PATH && std::isalpha(FileName.front()) && FileName[1] == ':')
+      return !_access((R"(\\?\)"+FileName).c_str(), 0);
    return !_access(FileName.c_str(), 0);
 #else
    return !access(FileName.c_str(), F_OK);
@@ -450,7 +453,11 @@ int FindFirst(const std::string &Path, const int Attr, TSearchRec &F )
 #if defined(_WIN32)
    HANDLE fHandle;
    F.FindData = new _WIN32_FIND_DATAA{}; // will be freed in F destructor
-   F.FindHandle = fHandle = FindFirstFileA(Path.c_str(), F.FindData );
+   if(Path.length() > MAX_PATH && std::isalpha(Path.front()) && Path[1] == ':')
+      fHandle = FindFirstFileA((R"(\\?\)"+Path).c_str(), F.FindData );
+   else
+      fHandle = FindFirstFileA(Path.c_str(), F.FindData );
+   F.FindHandle = fHandle;
    if (INVALID_HANDLE_VALUE != fHandle) {
       auto res = FindMatchingFile(F);
       if (res != 0)

src/tests/rtl/sysutilsp3tests.cpp

@@ -31,6 +31,8 @@
 #include <filesystem>
 #include <algorithm>
 
+
+
 using namespace std::literals::string_literals;
 using namespace rtl::sysutils_p3;
 
@@ -193,6 +195,37 @@ TEST_CASE("Test Find{First,Next,Close}")
    }
 }
 
+TEST_CASE( "Test file exists" )
+{
+   char sep = '/';
+#if defined( _WIN32 )
+   sep = '\\';
+#endif
+   std::string foldername( 100, '\0' );
+   for( int i {}; i < static_cast<int>( foldername.length() ); i++ )
+      foldername[i] = static_cast<char>( '0' + i % 10 );
+   std::filesystem::create_directory( foldername );
+   std::filesystem::create_directory( foldername + sep + foldername );
+   std::string gdxFn { GetCurrentDir() + sep + foldername + sep + foldername + sep + foldername + ".gdx"s },
+           longGdxFn { gdxFn };
+#if defined( _WIN32 )
+   longGdxFn = R"(\\?\)" + gdxFn;
+#endif
+   std::ofstream ofs { longGdxFn };
+   ofs.close();
+
+   REQUIRE( FileExists( gdxFn ) );
+
+   std::filesystem::remove( longGdxFn );
+   REQUIRE_FALSE( FileExists( gdxFn ) );
+
+   std::filesystem::remove( foldername + sep + foldername );
+   REQUIRE_FALSE( FileExists( foldername + sep + foldername ) );
+
+   std::filesystem::remove( foldername );
+   REQUIRE_FALSE( FileExists( foldername ) );
+}
+
 TEST_SUITE_END();
 
 }

src/tools/gdxdiff/gdxdiff.cpp

@@ -131,7 +131,7 @@ void CheckGDXError( const gdxHandle_t &PGX )
    }
 }
 
-void OpenGDX( const library::ShortString_t &fn, gdxHandle_t &PGX )
+void OpenGDX( const std::string &fn, gdxHandle_t &PGX )
 {
    if( !rtl::sysutils_p3::FileExists( fn ) )
       FatalError( "Input file not found " + fn, static_cast<int>( ErrorCode_t::ERR_NOFILE ) );
@@ -735,7 +735,7 @@ void Usage( const library::AuditLine_t &AuditLine )
 // Function is empty in Delphi code
 // void CopyAcronyms( const gdxHandle_t &PGX ) {}
 
-void CheckFile( library::ShortString_t &fn )
+void CheckFile( std::string &fn )
 {
    if( !rtl::sysutils_p3::FileExists( fn ) && gdlib::strutilx::ExtractFileExtEx( fn ).empty() )
       fn = gdlib::strutilx::ChangeFileExtEx( fn, ".gdx" );
@@ -744,7 +744,8 @@ void CheckFile( library::ShortString_t &fn )
 int main( const int argc, const char *argv[] )
 {
    int ErrorCode, ErrNr, Dim, iST, StrNr;
-   library::ShortString_t S, ID, InFile1, InFile2, DiffFileName;
+   library::ShortString_t S, ID, DiffFileName;
+   std::string InFile1, InFile2;
    std::map<library::ShortString_t, int> IDTable;
    bool UsingIDE, RenameOK;
    gdxStrIndex_t StrKeys {};

src/tools/gdxdiff/gdxdiff.hpp

@@ -106,7 +106,7 @@ void FatalError2( const std::string &Msg1, const std::string &Msg2, int ErrNr );
 
 void CheckGDXError( const gdxHandle_t &PGX );
 
-void OpenGDX( const library::ShortString_t &fn, gdxHandle_t &PGX );
+void OpenGDX( const std::string &fn, gdxHandle_t &PGX );
 
 void RegisterDiffUELs();
 
@@ -118,7 +118,7 @@ void Usage( const library::AuditLine_t &AuditLine );
 
 // void CopyAcronyms( const gdxHandle_t &PGX );
 
-void CheckFile( library::ShortString_t &fn );
+void CheckFile( std::string &fn );
 
 int main( int argc, const char *argv[] );
 

src/tools/gdxmerge/gdxmerge.cpp

@@ -151,7 +151,8 @@ int SymbolList_t::AddSymbol( const std::string &AName, const int ADim, const gdx
 void SymbolList_t::AddPGXFile( const int FNr, const ProcessPass_t Pass )
 {
    bool FrstError;
-   library::ShortString_t SyName, FileName;
+   library::ShortString_t SyName;
+   std::string FileName;
 
    auto CheckError = [&]( const bool Cnd, const std::string &Msg ) -> bool {
       bool Result { !Cnd };