- Merging

git-svn-id: https://openmodelica.org/svn/OpenModelica/branches/sjoelund-functiontree@6488 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Oct 20, 2010 · ebc6a51 · ebc6a51
2 parents 5fb9bbe + 20ecc71
commit ebc6a51
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/Compiler/Error.mo b/Compiler/Error.mo
@@ -995,6 +995,7 @@ everyone running the testsuite."
   output String outFilename;
 algorithm
   outFilename := matchcontinue filename
+    case "" then ""; // Absyn.dummyInfo
     case filename
       equation
         true = RTOpts.getRunningTestsuite();

diff --git a/Compiler/runtime/System_rml.c b/Compiler/runtime/System_rml.c
@@ -378,10 +378,20 @@ RML_END_LABEL
 RML_BEGIN_LABEL(System__basename)
 {
   const char *str = RML_STRINGDATA(rmlA0);
+#if defined(__MINGW32__) || defined(_MSC_VER)
+  const char* res = strrchr(str, '\\');
+  if (res == NULL) { res = strrchr(str, '/'); }
+  if (res == NULL) { res = str; } else { ++res; }
+  rmlA0 = (void*) mk_scon(res);
+#else
+  /* The POSIX version uses basename which is a bit more robust.
+   * But it may modify the contents of the pointer.
+   */
   char *copy = strdup(str);
-  char *res = basename(copy); /* basename may modify the contents */
+  char *res = basename(copy);
   rmlA0 = (void*) mk_scon(res);
   free(copy);
+#endif
   RML_TAILCALLK(rmlSC);
 }
 RML_END_LABEL