Decode URIs containing % (#9688)

Author: sjoelund

OMCompiler/SimulationRuntime/c/simulation/omc_simulation_util.c

@@ -55,7 +55,11 @@ extern const char* OpenModelica_parseFmuResourcePath(const char *path)
       }
     }
 #endif
-    return path;
+    {
+      char *res = strdup(path);
+      OpenModelica_decode_uri_inplace(res);
+      return res;
+    }
   }
   return NULL;
 }

OMCompiler/SimulationRuntime/c/util/utility.c

@@ -270,7 +270,7 @@ static modelica_string lookupDirectoryFromName(const char *name, void *nameDirAr
   return obj[1];
 }
 
-static void getIdent(const char *str, char *this, const char **next)
+static void getIdent(char *str, char *this, char **next)
 {
   while (*str != 0 && *str != '.' && *str != '/') {
     *(this++) = *(str++);
@@ -279,6 +279,33 @@ static void getIdent(const char *str, char *this, const char **next)
   *next = str;
 }
 
+extern void OpenModelica_decode_uri_inplace(char *src)
+{
+  char *tmp = src;
+  while (*src) {
+    if (*src == '+') *(tmp++) = ' ';
+    else if (*src == '%' && src[1]) {
+      char buf[3];
+      int i;
+      buf[0] = src[1];
+      buf[1] = src[2];
+      buf[2] = '\0';
+      errno = 0;
+      i = strtol(buf,NULL,16);
+      if (errno) {
+        *(tmp++) = *src;
+        errno = 0;
+      } else {
+        *(tmp++) = i;
+        *tmp = 0;
+        src += 2;
+      }
+    } else *(tmp++) = *src;
+    src++;
+  }
+  *tmp = '\0';
+}
+
 extern modelica_string OpenModelica_uriToFilename_impl(threadData_t *threadData, modelica_string uri_om, const char *resourcesDir)
 {
 #if defined(_MSC_VER)
@@ -287,8 +314,10 @@ extern modelica_string OpenModelica_uriToFilename_impl(threadData_t *threadData,
 
   FILE_INFO info = omc_dummyFileInfo;
   char buf[PATH_MAX];
-  const char *uri = MMC_STRINGDATA(uri_om);
+  char uribuf[MMC_STRLEN(uri_om)+1];
+  char *uri = uribuf;
   modelica_string dir;
+  strcpy(uri, MMC_STRINGDATA(uri_om));
   if (0==strncasecmp(uri, "modelica://", 11)) {
     omc_stat_t stat_buf;
     uri += 11;
@@ -315,6 +344,7 @@ extern modelica_string OpenModelica_uriToFilename_impl(threadData_t *threadData,
         }
       }
     }
+    OpenModelica_decode_uri_inplace(uri);
     /* We found where the package is stored */
     while (1) {
       if (*uri == '.') {

OMCompiler/SimulationRuntime/c/util/utility.h

@@ -124,6 +124,8 @@ extern int OpenModelica_regexImpl(const char* str, const char* re, const int max
 extern int OpenModelica_regex(const char* str, const char* re, int maxn, int extended, int sensitive, const char **result);
 #endif
 
+extern void OpenModelica_decode_uri_inplace(char *uri);
+
 extern modelica_string OpenModelica_uriToFilename_impl(threadData_t *threadData, modelica_string uri, const char *resourcesDir);
 #define OpenModelica_uriToFilename(URI) OpenModelica_uriToFilename_impl(threadData, URI, NULL)
 #define OpenModelica__uriToFilename(URI) OpenModelica_uriToFilename(URI)

OMCompiler/SimulationRuntime/fmi/export/openmodelica/fmu2_model_interface.c.inc

@@ -579,6 +579,7 @@ fmi2Component fmi2Instantiate(fmi2String instanceName, fmi2Type fmuType, fmi2Str
   if (fmuResourceLocation) {
     comp->fmuData->modelData->resourcesDir = functions->allocateMemory(1 + strlen(fmuResourceLocation), sizeof(char));
     strcpy(comp->fmuData->modelData->resourcesDir, fmuResourceLocation);
+    free(fmuResourceLocation);
   } else {
     FILTERED_LOG(comp, fmi2OK, LOG_STATUSWARNING, "fmi2Instantiate: Ignoring unknown resource URI: %s", fmuResourceLocation)
   }

testsuite/openmodelica/fmi/ModelExchange/2.0/FMUResourceTest.mos

@@ -8,23 +8,33 @@
 
 loadModel(Modelica, {"3.2.3"}); getErrorString();
 loadFile("./FMUResourceTest/package.mo"); getErrorString();
+mkdir("@");
+echo(false);
+cd("@");
+echo(true);
 translateModelFMU(FMUResourceTest.TestResource, version="2.0"); getErrorString();
 importFMU("FMUResourceTest.TestResource.fmu"); getErrorString();
 loadFile("FMUResourceTest_TestResource_me_FMU.mo"); getErrorString();
-buildModel(FMUResourceTest_TestResource_me_FMU); getErrorString();
-
+echo(false);
+res := simulate(FMUResourceTest_TestResource_me_FMU);
+echo(true);
+getErrorString();
+res.resultFile;
 
 // Result:
 // true
 // ""
 // true
 // ""
+// true
+// true
 // "FMUResourceTest.TestResource.fmu"
 // ""
 // "FMUResourceTest_TestResource_me_FMU.mo"
 // ""
 // true
 // ""
-// {"FMUResourceTest_TestResource_me_FMU","FMUResourceTest_TestResource_me_FMU_init.xml"}
+// true
 // ""
+// "FMUResourceTest_TestResource_me_FMU_res.mat"
 // endResult

testsuite/openmodelica/fmi/ModelExchange/2.0/FMUResourceTest/Resources/table_test_utf8.txt renamed to testsuite/openmodelica/fmi/ModelExchange/2.0/FMUResourceTest/Resources/table_test@utf8.txt

@@ -23,7 +23,7 @@ package FMUResourceTest "Test table resource"
     extends Test0(t_new(
         tableOnFile=true,
         tableName="a",
-        fileName=loadResource("modelica://FMUResourceTest/Resources/table_test_utf8.txt")));
+        fileName=loadResource("modelica://FMUResourceTest/Resources/table_test%40utf8.txt")));
     annotation (experiment(StartTime=0, StopTime=100));
   end TestResource;
 end FMUResourceTest;