Changeset 808004bd in OpenModelica

Timestamp:

2022-05-20T15:52:02+02:00 (2 years ago)

Author:

AnHeuermann <andreas.heuermann@…>

Children:

826b68ae

Parents:

c454bc7d

git-author:

AnHeuermann <andreas.heuermann@…> (05/20/22 15:45:23)

git-committer:

AnHeuermann <andreas.heuermann@…> (05/20/22 15:52:02)

Message:

Fixing System_moFiles and System_mocFiles Windows wide chars

• Wide characters as è can now be handled.
• Functions unified in omc_scanDirForPackagePattern.
• Long path not yet supported by omc_scanDirForPackagePattern.

Co-authored-by: mahge <mahge@…>

Location:

OMCompiler

Files:

• Compiler/runtime/System_omc.c (modified) (2 diffs)
• SimulationRuntime/c/util/omc_file.h (modified) (1 diff)

OMCompiler/Compiler/runtime/System_omc.c

@@ -406 +406 @@
 
 #if defined(__MINGW32__) || defined(_MSC_VER)
-void* System_moFiles(const char *directory)
+/**
+ * @brief Scan directory for package files with given pattern except for packageName.
+ *
+ * @param directory     Directory to search in
+ * @param pattern       Pattern to search for, e.g. "*.mo" or "*.moc".
+ * @param packageName   Name of packages, e.g. "package.mo" or "package.moc"
+ * @return void*        List of file names matching pattern.
+ */
+void* omc_scanDirForPackagePattern(const char* directory, const char* pattern, const wchar_t* packageName)
 {
   void *res;
-  WIN32_FIND_DATA FileData;
+  WIN32_FIND_DATAW FileData;
   BOOL more = TRUE;
-  char pattern[1024];
   HANDLE sh;
-  sprintf(pattern, "%s\\*.mo", directory);
+  char pattern_mb[1024];
+
+  // TODO: Use longabspath for path longer than MAX_PATH
+  //wchar_t* unicodeAbsDirectory = longabspath(directory);
+  sprintf(pattern_mb, "%s\\%s", directory, pattern);
+
+  MULTIBYTE_TO_WIDECHAR_LENGTH(pattern_mb, pattern_uc_length);
+  MULTIBYTE_TO_WIDECHAR_VAR(pattern_mb, pattern_uc, pattern_uc_length);
+
   res = mmc_mk_nil();
-  sh = FindFirstFile(pattern, &FileData);
+  sh = FindFirstFileW(pattern_uc, &FileData);
   if (sh != INVALID_HANDLE_VALUE) {
     while(more) {
-      if (strcmp(FileData.cFileName,"package.mo") != 0)
+      if (wcscmp(FileData.cFileName, packageName) != 0)
       {
-        res = mmc_mk_cons(mmc_mk_scon(FileData.cFileName),res);
+        WIDECHAR_TO_MULTIBYTE_LENGTH(FileData.cFileName, file_name_mb_length);
+        WIDECHAR_TO_MULTIBYTE_VAR(FileData.cFileName, file_name_mb, file_name_mb_length);
+
+        res = mmc_mk_cons(mmc_mk_scon(file_name_mb),res);
+        MULTIBYTE_OR_WIDECHAR_VAR_FREE(file_name_mb);
       }
-      more = FindNextFile(sh, &FileData);
+      more = FindNextFileW(sh, &FileData);
     }
     if (sh != INVALID_HANDLE_VALUE) FindClose(sh);
   }
-  return res;
+
+  MULTIBYTE_OR_WIDECHAR_VAR_FREE(pattern_uc);
+
+  return res;
+}
+#endif
+
+/**
+ * @brief Scan directory for .mo files excluding package.mo.
+ *
+ * @param directory   Directory to search in.
+ * @return void*      List of file names.
+ */
+void* System_moFiles(const char *directory)
+#if defined(__MINGW32__) || defined(_MSC_VER)
+{
+  return omc_scanDirForPackagePattern(directory, "*.mo", L"package.mo");
 }
 #else
-void* System_moFiles(const char *directory)
 {
   int i,count;
@@ -447 +481 @@
 #endif
 
+/**
+ * @brief Scan directory for .moc files excluding package.moc.
+ *
+ * @param directory   Directory to search in.
+ * @return void*      List of file names.
+ */
+void* System_mocFiles(const char *directory)
 #if defined(__MINGW32__) || defined(_MSC_VER)
-void* System_mocFiles(const char *directory)
-{
-  void *res;
-  WIN32_FIND_DATA FileData;
-  BOOL more = TRUE;
-  char pattern[1024];
-  HANDLE sh;
-  sprintf(pattern, "%s\\*.moc", directory);
-  res = mmc_mk_nil();
-  sh = FindFirstFile(pattern, &FileData);
-  if (sh != INVALID_HANDLE_VALUE) {
-    while(more) {
-      if (strcmp(FileData.cFileName,"package.moc") != 0)
-      {
-        res = mmc_mk_cons(mmc_mk_scon(FileData.cFileName),res);
-      }
-      more = FindNextFile(sh, &FileData);
-    }
-    if (sh != INVALID_HANDLE_VALUE) FindClose(sh);
-  }
-  return res;
+{
+  return omc_scanDirForPackagePattern(directory, "*.moc", L"package.moc");
 }
 #else
-void* System_mocFiles(const char *directory)
 {
   int i,count;

OMCompiler/SimulationRuntime/c/util/omc_file.h

@@ -103 +103 @@
 
 int omc_unlink(const char *filename);
+wchar_t* longabspath(wchar_t* unicodePath);
 
 #ifdef __cplusplus