Changeset 39 for CMT/HEAD

Timestamp:

Apr 21, 2005, 1:14:29 AM (19 years ago)

Author:

arnault

Message:

Fix PATH symbols management with symlinks - See CL 268

Location:

CMT/HEAD

Files:

• ChangeLog (modified) (1 diff)
• source/cmt_project.cxx (modified) (7 diffs)
• source/cmt_symbol.cxx (modified) (1 diff)

CMT/HEAD/ChangeLog

@@ +1 @@
+2005-04-21  Christian Arnault  <arnault@lal.in2p3.fr> 268
+
+        * source/cmt_project.cxx (create_project): Check pwd for finding
+        projects.
+
+        * source/cmt_symbol.cxx (find_path_entry): Look for existing PATH
+        entries by comparing the real path rather than the logical
+        path. Use pwd everywhere.
+
 2005-04-14  Christian Arnault  <arnault@lal.in2p3.fr> 267
 

CMT/HEAD/source/cmt_project.cxx

@@ -211 +211 @@
   CmtSystem::split (cmtprojectpath, sep, items);
 
+  cmt_string here = CmtSystem::pwd ();
+  if (!CmtSystem::cd (compressed_path)) return (0);
+  cmt_string pwd = CmtSystem::pwd ();
+
   static Project::ProjectVector& Projects = Project::projects ();
   
@@ -218 +222 @@
       
       if ((p.get_cmtpath () == compressed_path) ||
-          (p.get_cmtpath_pwd () == compressed_path) ||
+          (p.get_cmtpath_pwd () == pwd) ||
           (specify_name && (p.get_name () == specified_name)))
         {
@@ -243 +247 @@
             }
 
+          CmtSystem::cd (here);
           return (&p);
         }
@@ -253 +258 @@
   bool is_current = false;
   
-  cmt_string here = CmtSystem::pwd ();
-  if (!CmtSystem::cd (compressed_path)) return (0);
-
   cmt_string name = specified_name;
   cmt_string project_name;
@@ -263 +265 @@
   // Figure out if this is the current project
   //
-  cmt_string pwd = CmtSystem::pwd ();
   if (here.find (pwd) == 0) is_current = true;
 
@@ -1419 +1420 @@
   int i;
 
-  /*
   for (i = 0; i < m_parents.size (); i++)
     {
@@ -1433 +1433 @@
       cout << " C=" << p->get_name ();
     }
-  */
 
   cout << endl;

CMT/HEAD/source/cmt_symbol.cxx

@@ -1939 +1939 @@
 {
   static const cmt_string path_separator = CmtSystem::path_separator ();
-  static const cmt_string double_path_separator = path_separator + path_separator;
-
-  cmt_string complete_paths;
-
-  complete_paths = path_separator;
-  complete_paths += paths;
-  complete_paths += path_separator;
-
-  complete_paths.replace_all (double_path_separator, path_separator);
-
-  cmt_string complete_value;
-  complete_value = path_separator;
-  complete_value += value;
-  complete_value += path_separator;
-
-  if (complete_paths.find (complete_value) == cmt_string::npos) return (false);
-  else return (true);
+
+  cmt_string here = CmtSystem::pwd ();
+
+  CmtSystem::cd (value);
+  cmt_string rvalue = CmtSystem::pwd ();
+
+  CmtSystem::cmt_string_vector items;
+  CmtSystem::split (paths, path_separator, items);
+
+  bool found = false;
+
+  for (int i = 0; i < items.size (); i++)
+    {
+      const cmt_string& item = items[i];
+      CmtSystem::cd (item);
+      cmt_string ritem = CmtSystem::pwd ();
+      if (ritem == rvalue)
+        {
+          found = true;
+          break;
+        }
+    }
+
+  CmtSystem::cd (here);
+  return (found);
 }