Changeset 538 for CMT/HEAD

Timestamp:

Mar 30, 2010, 11:14:34 AM (14 years ago)

Author:

rybkin

Message:

See C.L. 425

Location:

CMT/HEAD

Files:

• ChangeLog (modified) (1 diff)
• source/cmt_system.cxx (modified) (1 diff)
• source/cmt_use.cxx (modified) (2 diffs)

CMT/HEAD/ChangeLog

@@ +1 @@
+2010-03-30    <rybkin@lal.in2p3.fr> 425
+
+        * source/cmt_system.cxx: In function CmtSystem::pwd, use strncpy instead of
+        strcpy
+        * source/cmt_use.cxx: In function move_to, minor simplification
+        path first, if it is specified
+        
 2010-03-29    <rybkin@lal.in2p3.fr> 424
 

CMT/HEAD/source/cmt_system.cxx

@@ -75 +75 @@
   if (pwd_env != 0)
     {
-      strcpy (buffer, pwd_env);
+      strncpy (buffer, pwd_env, PATH_MAX - 1);
+      buffer[PATH_MAX - 1] = '\0'; // ensure termination
+      //      strcpy (buffer, pwd_env);
     }
   else

CMT/HEAD/source/cmt_use.cxx

@@ -1925 +1925 @@
   cmt_string expanded_path = path;
 
-  cmt_string here;
-  if (curdir)
-    here = CmtSystem::pwd ();
-
   //
   // If the path specified in this use is a true absolute path,
@@ -1968 +1964 @@
 //     {
 //       if (reach_package ("", native_version))
+
+      cmt_string here = CmtSystem::pwd ();
+
       if (reach_package (here,  native_version))
         {