- Completed implementation of Settings_omc.cpp

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@7132 f25d12d1-65f4-0310-ae8a-bbce733d8d8e

Author: sjoelund

Compiler/Settings.mo

@@ -44,7 +44,7 @@ end getVersionNr;
 
 public function setCompilePath
   input String inString;
-  external "C" Settings_setCompilePath(inString) annotation(Library = "omcruntime");
+  external "C" SettingsImpl__setCompilePath(inString) annotation(Library = "omcruntime");
 end setCompilePath;
 
 public function getCompilePath
@@ -56,7 +56,7 @@ end getCompilePath;
 public function setCompileCommand
   input String inString;
 
-  external "C" SettingsImpl_setCompileCommand(inString) annotation(Library = "omcruntime");
+  external "C" SettingsImpl__setCompileCommand(inString) annotation(Library = "omcruntime");
 end setCompileCommand;
 
 public function getCompileCommand
@@ -68,7 +68,7 @@ end getCompileCommand;
 public function setTempDirectoryPath
   input String inString;
 
-  external "C" Settings_setTempDirectoryPath(inString) annotation(Library = "omcruntime");
+  external "C" SettingsImpl__setTempDirectoryPath(inString) annotation(Library = "omcruntime");
 end setTempDirectoryPath;
 
 public function getTempDirectoryPath
@@ -95,7 +95,7 @@ end setModelicaPath;
 
 public function getModelicaPath
   output String outString;
-  external "C" outString=Settings__getModelicaPath() annotation(Library = "omcruntime");
+  external "C" outString=Settings_getModelicaPath() annotation(Library = "omcruntime");
 end getModelicaPath;
 
 public function getEcho

Compiler/runtime/Settings_omc.cpp

@@ -70,7 +70,9 @@ extern const char* Settings_getVersionNr()
   return CONFIG_VERSION;
 }
 
-extern const char* Settings_getTempDirectoryPath();
-extern void Settings_setTempDirectoryPath(const char* _inString);
+extern const char* Settings_getTempDirectoryPath()
+{
+  return strdup(SettingsImpl__getTempDirectoryPath());
+}
 
 }

Compiler/runtime/Settings_rml.c

@@ -33,40 +33,6 @@
 
 void Settings_5finit(void)
 {
-
-// On windows, set Temp directory path to Temp directory as returned by GetTempPath,
-// which is usually TMP or TEMP or windows catalogue.
-#ifdef WIN32
-	int numChars;
-	char* str,str1;
-	char tempDirectory[1024];
-		//extract the temp path
-	numChars= GetTempPath(1024, tempDirectory);
-	if (numChars == 1024 || numChars == 0) {
-		printf("Error setting temppath in Kernel\n");
-	} 
-	else {
-	 if (tempDirectoryPath) {
-		free(tempDirectoryPath);
-		tempDirectoryPath=0;
-	 }
-	 // Must do replacement in two steps, since the _replace function can not have similar source as target.
-	 str = _replace(tempDirectory,"\\","/");
-	 tempDirectoryPath= _replace(str,"/","\\\\");
-	 free(str);
-	}
-#else
-  char* str = NULL;
-  str = getenv("TMPDIR");
-  if (str == NULL) {
-    tempDirectoryPath = malloc(sizeof(char)*(strlen("/tmp") + 1));
-    strcpy(tempDirectoryPath, "/tmp");
-  }
-  else {
-    tempDirectoryPath = malloc(sizeof(char)*(strlen(str) + 1));
-    strcpy(tempDirectoryPath, str);
-  }
-#endif
 }
 
 
@@ -122,16 +88,8 @@ RML_END_LABEL
 
 RML_BEGIN_LABEL(Settings__setTempDirectoryPath)
 {
-  char* command = RML_STRINGDATA(rmlA0);
-  if(tempDirectoryPath)
-    free(tempDirectoryPath);
-
-  tempDirectoryPath = (char*)malloc(strlen(command)+1);
-  if (tempDirectoryPath == NULL) {
-    RML_TAILCALLK(rmlFC);
-  }
-  memcpy(tempDirectoryPath,command,strlen(command)+1);
-
+  const char* command = RML_STRINGDATA(rmlA0);
+  SettingsImpl__setTempDirectoryPath(command);
   RML_TAILCALLK(rmlSC);
 }
 RML_END_LABEL

Compiler/runtime/settingsimpl.c

@@ -104,7 +104,8 @@ static const char* SettingsImpl__getCompileCommand()
   return compileCommand;
 }
 
-extern void SettingsImpl__setCompileCommand(const char *command) {
+extern void SettingsImpl__setCompileCommand(const char *command)
+{
   if(compileCommand)
     free(compileCommand);
   compileCommand = strdup(command);
@@ -155,6 +156,43 @@ extern void SettingsImpl__setModelicaPath(const char *value)
   commonSetEnvVar("OPENMODELICALIBRARY",value);
 }
 
+extern void SettingsImpl__setTempDirectoryPath(const char *path)
+{
+  if (tempDirectoryPath)
+    free(tempDirectoryPath);
+  tempDirectoryPath = strdup(path);
+}
+
+extern char* SettingsImpl__getTempDirectoryPath()
+{
+  if (tempDirectoryPath == NULL) {
+  // On windows, set Temp directory path to Temp directory as returned by GetTempPath,
+  // which is usually TMP or TEMP or windows catalogue.
+  #ifdef WIN32
+	  int numChars;
+	  char* str,str1;
+	  char tempDirectory[1024];
+		  //extract the temp path
+	  numChars= GetTempPath(1024, tempDirectory);
+	  if (numChars == 1024 || numChars == 0) {
+		  fprintf(stderr, "Error setting temppath in Kernel\n");
+      exit(1);
+	  } else {
+	    // Must do replacement in two steps, since the _replace function can not have similar source as target.
+	    str = _replace(tempDirectory,"\\","/");
+	    tempDirectoryPath= _replace(str,"/","\\\\");
+	    free(str);
+	  }
+  #else
+    const char* str = getenv("TMPDIR");
+    if (str == NULL)
+      str = "/tmp";
+    tempDirectoryPath = strdup(str);
+  #endif
+  }
+  return tempDirectoryPath;
+}
+
 #ifdef __cplusplus
 }
 #endif