yet another fix attempt, restore original AddExt, use strcat where po…

…ssible
LADSoft · May 12, 2024 · b19fc94 · b19fc94
1 parent c17d77a
commit b19fc94
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 14 deletions.
diff --git a/src/occopt/optmain.cpp b/src/occopt/optmain.cpp
@@ -431,7 +431,7 @@ void SaveFile(std::string& name, SharedMemory* optimizerMem)
         char buf[260];
         strcpy(buf, name.c_str());
         Utils::StripExt(buf);
-        Utils::AddExt(buf, ".icd2");
+        strcat(buf, ".icd2");
         icdFile = fopen(buf, "w");
         if (!icdFile)
             return;
@@ -495,7 +495,7 @@ int main(int argc, char* argv[])
             strcpy(buf, files[1].c_str());
             Utils::StripExt(buf);
             strcat(buf, "_1");
-            Utils::AddExt(buf, ".icf");
+            strcat(buf, ".icf");
             outputFile = buf;
         }
         FILE* fil = fopen(files[1].c_str(), "rb");

diff --git a/src/occparse/occparse.cpp b/src/occparse/occparse.cpp
@@ -659,7 +659,7 @@ int main(int argc, char* argv[])
                 else
                 {
                     Utils::StripExt(buffer);
-                    Utils::AddExt(buffer, ".i");
+                    strcat(buffer, ".i");
                 }
                 strcpy(cppfile, buffer);
 
@@ -673,7 +673,7 @@ int main(int argc, char* argv[])
             if (Optimizer::cparams.prm_errfile)
             {
                 Utils::StripExt(buffer);
-                Utils::AddExt(buffer, ".err");
+                strcat(buffer, ".err");
                 errFile = fopen(buffer, "w");
                 if (!errFile)
                 {
@@ -685,7 +685,7 @@ int main(int argc, char* argv[])
             if (Optimizer::cparams.prm_icdfile)
             {
                 Utils::StripExt(buffer);
-                Utils::AddExt(buffer, ".icd");
+                strcat(buffer, ".icd");
                 Optimizer::icdFile = fopen(buffer, "w");
                 if (!Optimizer::icdFile)
                 {
@@ -716,7 +716,7 @@ int main(int argc, char* argv[])
                     // compile to file
                     strcpy(realOutFile, (const char*)clist->data);
                     Utils::StripExt(realOutFile);
-                    Utils::AddExt(realOutFile, ".icf");
+                    strcat(realOutFile, ".icf");
                     FILE* fil = fopen(realOutFile, "wb");
                     if (!fil)
                         Utils::Fatal("Cannot open '%s' for write", realOutFile);

diff --git a/src/occparse/osutil.cpp b/src/occparse/osutil.cpp
@@ -1010,7 +1010,7 @@ void InsertOneFile(const char* filename, char* path, int drive)
         strcpy(temp, p);
         Utils::StripExt(temp);
         if (!Optimizer::cparams.prm_compileonly && !Optimizer::cparams.prm_assemble)
-            Utils::AddExt(temp, ".exe");
+            strcat(temp, ".exe");
         firstFile = temp;
     }
     inserted = insert_noncompile_file(buffer);
@@ -1100,14 +1100,12 @@ void outputfile(char* buf, const char* orgbuf, const char* ext)
             p = orgbuf;
         strcat(buf, p);
         Utils::StripExt(buf);
-        Utils::AddExt(buf, ext);
+        strcat(buf, ext);
     }
     else if (prm_output.GetExists() && !MakeStubsContinue.GetValue() && !MakeStubsContinueUser.GetValue())
     {
 #if TARGET_OS_WINDOWS
-        char* pos = (char*)strrchr(buf, '.');
-        if (!pos || (*(pos - 1) == '.') || (*(pos + 1) == '\\'))
-            strcat(buf, ext);
+        Utils::AddExt(buf, ext);
 #else
         if( !Utils::HasExt(buf, ext) )
             Utils::AddExt(buf, ext);

diff --git a/src/util/Utils.cpp b/src/util/Utils.cpp
@@ -319,9 +319,9 @@ FILE* Utils::TempName(std::string& name)
  */
 void Utils::AddExt(char* buffer, const char* ext)
 {
-    //char* pos = (char*)strrchr(buffer, '.');
-    //if (!pos || strcmp(pos,ext) != 0 )
-    // NOTE: the strcmp gives no added value; AddExt is always preceded by StripExt
+    // RK: back to the original code
+    char* pos = (char*)strrchr(buffer, '.');
+    if (!pos || (*(pos - 1) == '.') || (*(pos + 1) == '\\'))
         strcat(buffer, ext);
 }