USER or LOGNAME is not defined in a Docker container: on Linux get username with...

[modules/kernel.git] / src / Launcher / Launcher_Job.cxx

diff --git a/src/Launcher/Launcher_Job.cxx b/src/Launcher/Launcher_Job.cxx
index 0c4e3ce7e5dbe41a86e1604dca644275d5f684a7..b724958185a52363ba6549f74f733231b1e643f5 100644 (file)
--- a/src/Launcher/Launcher_Job.cxx
+++ b/src/Launcher/Launcher_Job.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2009-2017  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2009-2022  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -22,6 +22,9 @@
 //#define _DEBUG_
 #include "Launcher_Job.hxx"
 #include "Launcher.hxx"
+
+#include <Basics_DirUtils.hxx>
+
 #include <boost/filesystem.hpp>
 
 #ifdef WITH_LIBBATCH
@@ -29,6 +32,13 @@
 #endif
 
 #include <sstream>
+#ifdef WIN32
+  static const char SEPARATOR = '\\';
+#include <process.h>
+#else
+  static const char SEPARATOR = '/';
+#include <pwd.h>
+#endif
 
 Launcher::Job::Job()
 {
@@ -181,7 +191,16 @@ Launcher::Job::setResourceDefinition(const ParserResourcesType & resource_defini
   std::string user_name = "";
   if (resource_definition.UserName == "")
   {
-    user_name = getenv("USER");
+#ifndef WIN32
+    struct passwd *pwd = getpwuid(getuid());
+    if (pwd) {
+      user_name = std::string(pwd->pw_name);
+    }
+    if (user_name == "")
+      user_name = getenv("USER");
+#else
+    user_name = getenv("USERNAME");
+#endif
     if (user_name == "")
       user_name = getenv("LOGNAME");
     if (user_name == "")
@@ -214,7 +233,7 @@ Launcher::Job::setJobFile(const std::string & job_file)
   }
 
   _job_file = job_file;
-  std::string::size_type p1 = _job_file.find_last_of("/");
+  std::string::size_type p1 = _job_file.find_last_of(SEPARATOR);
   std::string::size_type p2 = _job_file.find_last_of(".");
   _job_file_name_complete = _job_file.substr(p1+1);
   _job_file_name = _job_file.substr(p1+1,p2-p1-1);
@@ -552,7 +571,7 @@ Launcher::Job::getLaunchDate() const
         launch_date[i] == ':' ||
         launch_date[i] == ' ')
       launch_date[i] = '_';
-  launch_date.erase(--launch_date.end()); // Last caracter is a \n
+  launch_date.erase(--launch_date.end()); // Last character is a \n
 
   return launch_date;
 }
@@ -596,7 +615,8 @@ Launcher::Job::common_job_params()
 
   params[Batch::NAME] = getJobName();
   params[Batch::NBPROC] = _resource_required_params.nb_proc;
-  params[Batch::NBPROCPERNODE] = _resource_required_params.nb_proc_per_node;
+  if(_resource_required_params.nb_proc_per_node > 0)
+    params[Batch::NBPROCPERNODE] = _resource_required_params.nb_proc_per_node;
 
   if(_resource_required_params.nb_node > 0)
     params[Batch::NBNODE] = _resource_required_params.nb_node;
@@ -622,14 +642,22 @@ Launcher::Job::common_job_params()
     {
       std::string date_dir = std::string("/job_") + date;
       std::ostringstream str_pid;
+#ifdef WIN32
+         str_pid << _getpid();
+#else
       str_pid << ::getpid();
+#endif
       std::string job_dir = date_dir + "-" + str_pid.str();
 
       _work_directory = _resource_definition.working_directory + job_dir;
     }
     else
     {
+#ifndef WIN32
       _work_directory = std::string("/$HOME/Batch/workdir_");
+#else
+      _work_directory = std::string("%USERPROFILE%\\Batch\\workdir_");
+#endif
       _work_directory += date;
     }
   }
@@ -646,9 +674,9 @@ Launcher::Job::common_job_params()
   params[Batch::LAUNCHER_FILE] = _launcher_file;
   params[Batch::LAUNCHER_ARGS] = _launcher_args;
 
-  // If result_directory is not defined, we use HOME environnement
+  // If result_directory is not defined, we use HOME environment
   if (_result_directory == "")
-    _result_directory = getenv("HOME");
+    _result_directory = Kernel_Utils::HomePath();
 
   // _in_files
   std::list<std::string> in_files(_in_files);
@@ -663,18 +691,26 @@ Launcher::Job::common_job_params()
 
     // local file -> If file is not an absolute path, we apply _local_directory
     std::string local_file;
+#ifndef WIN32
     if (file.substr(0, 1) == std::string("/"))
+#else
+    // On Windows, absolute paths may begin with something like "C:"
+    if (file.substr(1, 1) == std::string(":"))
+#endif
+      local_file = file;
+    else if (file.substr(0, 1) == std::string("-")) // using rsync options
       local_file = file;
     else
 #ifndef WIN32
-      local_file = _local_directory + "/" + file;
+      // '/./' is used by rsync to find the root of the relative path
+      // /a/b/./c/f -> _working_directory/c/f
+      local_file = _local_directory + "/./" + file;
 #else
-      local_file = file;
+      local_file = _local_directory + SEPARATOR + file;
 #endif
 
     // remote file -> get only file name from in_files
-    size_t found = file.find_last_of("/");
-    std::string remote_file = _work_directory + "/" + file.substr(found+1);
+    std::string remote_file = _work_directory + "/";
 
     params[Batch::INFILE] += Batch::Couple(local_file, remote_file);
   }
@@ -692,10 +728,16 @@ Launcher::Job::common_job_params()
       size_t found = file.find_last_of("/");
       local_file = file.substr(found+1);
     }
+    else if (file.substr(0, 1) == std::string("-")) // using rsync options
+    {
+      remote_file = file;
+      local_file = "";
+    }
     else
     {
-      remote_file = _work_directory + "/" + file;
-      local_file = file;
+      // '/./' is used by rsync to find the root of the relative path
+      remote_file = _work_directory + "/./" + file;
+      local_file = "";
     }
 
     params[Batch::OUTFILE] += Batch::Couple(local_file, remote_file);