Changeset 22a2bb0 in tol

Timestamp:

Mar 20, 2009, 5:00:58 PM (18 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

d9a156c

Parents:

338cca0

Message:

Using TolAppData() as base of TmpNam() in order to centralize all TOL related directories

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@791 be4846ae-f051-483a-831f-b64e7d08527f

File:

• tol/bbasic/sys.cpp (modified) (18 diffs)

tol/bbasic/sys.cpp

@@ -45 +45 @@
 //--------------------------------------------------------------------
 BTraceInit("sys.cpp");
-#ifdef   UNIX
+#ifdef   UNIX
   BBool BSys::unix_=BTRUE;
   BText BSys::editor_("emacs ");
@@ -80 +80 @@
     BSys::MkDir(tolAppData_+"OIS",          true);
     BSys::MkDir(tolAppData_+"tests_results",true);
+    tolAppData_ = GetStandardAbsolutePath(tolAppData_);
   }
   return(tolAppData_);
@@ -226 +227 @@
       if(!prefix.HasName() || fName.BeginWith(prefix))
       {
-        path = dir.Name()+"/"+fName;
-  //    Std(BText("\n") + n + ") " + dir.FileName(n) + msg);
-        remove(path.String());
+  path = dir.Name()+"/"+fName;
+  //  Std(BText("\n") + n + ") " + dir.FileName(n) + msg);
+  remove(path.String());
       }
     }
@@ -238 +239 @@
 //--------------------------------------------------------------------
 BText BSys::TempNam(const BText& outputDir,
-                    const BText& prefix,
-                    const BText& ext,
-                          BInt   len)
+        const BText& prefix,
+        const BText& ext,
+              BInt   len)
 
 /*! Creates a unique temporal file name in specific directory.
@@ -260 +261 @@
 {
 //InitTotalTime("BSys::TempNam");
-    static BInt fileNumber_ = -1;
-    BText fileName;
-    BText dir = outputDir;
+  static BInt fileNumber_ = -1;
+  BText fileName;
+  BText dir = outputDir;
+//Std(BText("\nBSys::TempNam 1 dir = ")+dir);
+  if(!dir.HasName()) { dir= TolAppData()+"tmp/"; }
+//Std(BText("\nBSys::TempNam 2 dir = ")+dir);
+
 //Std("\nBSys::TempNam("); Std(outputDir+", "+prefix+", "+ext+", "+len+")");
-    if(!(BDir::CheckIsDir(dir)) || (!dir.HasName()) )
-    {
-#     ifdef UNIX
-/* tempnam function was deprecated:
- *      dir = GetFilePath(tempnam("","")); */
-        dir = "/tmp";
-#     else
-        BText tmp = getenv("TMP");
-        if(!tmp.HasName()) { tmp = getenv("TEMP"); }
-        dir = tmp;
-        BText dirTOL = dir+"/TOL";
-        if(!BDir::CheckIsDir(dirTOL))
-        {
-      system(BText("mkdir \"")+dirTOL+"\"");
-        //MkDir(dirTOL,true);
-        }
-        dir = dirTOL;
-#     endif
-    }
-    BInt attempts = 0;
-    BText pathFile;
-    do
-    {
-        attempts ++;
-        if(len<4) { len=4; }
-        
-        BInt base = (BInt)pow(10.0,(double)len); //(BInt)(BDat(10)^BDat(len)).Value();
-        BInt r = LongRandom(base-1);
-        BText number = BText("")+r;
-        if(len<number.Length()) { number = number.SubString(0,len-1); }
-        fileName = prefix+number+"."+ext;
-        pathFile = dir+"/"+fileName;
+  if(!BDir::CheckIsDir(dir))
+  {
+  //Std(BText("\nBSys::TempNam 4 dir = ")+dir);
+    mkdir(dir);
+  }
+//Std(BText("\nBSys::TempNam 5 dir = ")+dir);
+  BInt attempts = 0;
+  BText pathFile;
+  do
+  {
+    attempts ++;
+    if(len<4) { len=4; }
+    BInt base = (BInt)pow(10.0,(double)len); //(BInt)(BDat(10)^BDat(len)).Value();
+    BInt r = LongRandom(base-1);
+    BText number = BText("")+r;
+    if(len<number.Length()) { number = number.SubString(0,len-1); }
+    fileName = prefix+number+"."+ext;
+    pathFile = dir+fileName;
 //  Std(pathFile + " is File " + CheckIsFile(pathFile));
-    }
-    while(CheckIsFile(pathFile));
+  }
+  while(CheckIsFile(pathFile));
 //Std(BText("\nTempNam = ") + fileName + " after " + attempts+ " attempts.");
 //SumPartialTime;
-    return(pathFile);
+  return(pathFile);
 }
 
@@ -316 +307 @@
 {
   BChar* aux=getenv(envVar.String());
-  BText  tmpName=aux;
+  BText   tmpName=aux;
   return(tmpName);
 }
@@ -336 +327 @@
   {
     Error(BText("\n[")+errno+"]=" + strerror(errno) + "\n" +
-          I2("Cannot execute the command: ",
-             "No se pudo ejecutar el mandato: ") + "\n" + command);
+    I2("Cannot execute the command: ",
+       "No se pudo ejecutar el mandato: ") + "\n" + command);
   }
   return(!err);
@@ -415 +406 @@
 
   if (!CreateProcess(NULL, cmd, NULL, NULL,
-            FALSE, 0, NULL, NULL, &startupInfo,
-            &piProcInfo)) 
+       FALSE, 0, NULL, NULL, &startupInfo,
+       &piProcInfo)) 
   {
     ShowLastError(I2("Creating process \n", 
@@ -529 +520 @@
 /*! Prints a file in the default printer. Operating systems:<ul>
  *      <li>UNIX: print the file with lp command, options:<ul>
- *      <li>-onb: option no banner (don't work).
- *      <li>-s: suppress messages from lp such as: request ID is...
- *      <li>-c: Make copies of the files to be printed immediately when
- *              lp is invoked (and then can be deleted).</ul>
+ *  <li>-onb: option no banner (don't work).
+ *  <li>-s: suppress messages from lp such as: request ID is...
+ *  <li>-c: Make copies of the files to be printed immediately when
+ *            lp is invoked (and then can be deleted).</ul>
  *      <li>WINDOWS: .</ul>
  * \param fileName Name of file to be printed
@@ -539 +530 @@
 //--------------------------------------------------------------------
 {
-#ifdef   UNIX
+#ifdef   UNIX
   BText command("lp -c ");
   return(BSys::System(command+fileName));
 #else // WINDOWS
   ShellExecute(
-    0,                 // handle to parent window
+    0,                 // handle to parent window
     "print",           // string that specifies operation to perform
     fileName.String(), // filename string
@@ -582 +573 @@
 //--------------------------------------------------------------------
 {
-#ifdef   UNIX
+#ifdef   UNIX
   BText copyCom("cp ");
 #else // WINDOWS
@@ -679 +670 @@
 {
   if(!BSys::Editor().HasName()) { return(BFALSE); }
-#ifdef   UNIX
+#ifdef   UNIX
   return(BSys::System(BSys::Editor()+" "+fileName+" &"));
 #else // WINDOWS
@@ -715 +706 @@
 {
   if(!BSys::Editor().HasName()) { return(BFALSE); }
-#ifdef   UNIX
+#ifdef   UNIX
   return(Edit(fileName,0));
 #else // WINDOWS
@@ -740 +731 @@
 {
   if(!BSys::Editor().HasName()) { return(BFALSE); }
-#ifdef   UNIX
+#ifdef   UNIX
   return(Edit(fileName,0));
 #else // WINDOWS
@@ -780 +771 @@
 //--------------------------------------------------------------------
 {
-#ifdef   UNIX
+#ifdef   UNIX
   return(BSys::System(BSys::Editor()+fileName));
 #else // WINDOWS
@@ -889 +880 @@
   (
     GetCurrentThread(), // handle to the thread
-    &lpExitCode               // address to receive termination status
+    &lpExitCode          // address to receive termination status
   );
   ExitThread(lpExitCode);
@@ -901 +892 @@
 //--------------------------------------------------------------------
 {
-#ifndef   UNIX
+#ifndef    UNIX
 
 //Std(BText("\nClient Question : \n")+command+"\n");
 
-  SECURITY_ATTRIBUTES     sa =
+  SECURITY_ATTRIBUTES    sa =
   {
     sizeof(SECURITY_ATTRIBUTES),   // structure size
-    0,                             // No security descriptor
+    0,                             // No security descriptor
     TRUE,                          // Thread handle is inheritable
   };
   char* arg = new char[command.Length()+1];
   strncpy(arg, command.String(), command.Length()+1);
-  DWORD   threadId;
+  DWORD    threadId;
   HANDLE hThread = (HANDLE)CreateThread
   (
     &sa,                    // Thread security
     4096,                   // Thread stack size
-    threadMain,             // Thread starting address
+    threadMain,              // Thread starting address
     (void *)arg,            // Thread start argument
     CREATE_SUSPENDED,       // Create in suspended state
@@ -927 +918 @@
   {
     //MessageBox(0, "Thread Creation Failed", "Error", MB_OK);
-        Error("Thread Creation Failed");
+  Error("Thread Creation Failed");
     return(BFALSE);
   }