Changeset 599 for CMT/HEAD/source/cmt_system.cxx

Timestamp:

Dec 23, 2011, 5:47:15 PM (13 years ago)

Author:

rybkin

Message:

See C.L. 476

File:

• CMT/HEAD/source/cmt_system.cxx (modified) (12 diffs)

CMT/HEAD/source/cmt_system.cxx

@@ -20 +20 @@
 #define S_IFDIR _S_IFDIR
 #define USE_GETCWD 1
-
+#define cwd_env_var "CD"
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -28 +28 @@
 
 #define stat _stat
+#define unlink _unlink
+#define chmod _chmod
+//#define putenv _putenv
 #define WEXITSTATUS(w) (w)
-#include <stdlib.h>
 #define PATH_MAX _MAX_PATH
 
@@ -40 +42 @@
 #include <sys/utsname.h>
 #include <limits.h> // define PATH_MAX
+#define cwd_env_var "PWD"
 #endif
 
@@ -79 +82 @@
   char* pwd_env = 0;
 
-  pwd_env = ::getenv (cwd_variable ());  
+  pwd_env = ::getenv (cwd_env_var);  
   //  pwd_env = ::getenv ("PWD");  
 
@@ -157 +160 @@
     {
 #ifndef WIN32
-      if (putenv (cwd_variable (), s_dir))
+      if (putenv (cwd_env_var, s_dir))
         //      if (putenv ("PWD", s_dir))
         return (true);
@@ -739 +742 @@
 
 //--------------------------------------------------
+/*
 char CmtSystem::file_separator ()
 {
@@ -747 +751 @@
 #endif
 }
-
+*/
 /**
  *  Transform all / or \ characters in the text into the current file_separator
@@ -773 +777 @@
 
 //--------------------------------------------------
+/*
 char CmtSystem::path_separator ()
 {
@@ -781 +786 @@
 #endif
 }
-
+*/
 //--------------------------------------------------
+ /*
 char CmtSystem::command_separator ()
 {
@@ -791 +797 @@
 #endif
 }
-
+ */
+/*
 //--------------------------------------------------
 const char * CmtSystem::cwd_variable ()
@@ -801 +808 @@
 #endif
 }
-
+*/
 //--------------------------------------------------
 const cmt_string& CmtSystem::ev_open ()
@@ -1550 +1557 @@
     //cerr << "#CmtSystem::putenv> name=" << name << " &v=" << &v << endl;
 
+#ifdef WIN32
+    int status = ::_putenv ((char*) v.c_str ());
+#else
     int status = ::putenv ((char*) v.c_str ());
+#endif
 
     if (status == 0) return (true);