Changeset 435

Timestamp:

Jan 25, 2008, 1:57:34 PM (16 years ago)

Author:

rybkin

Message:

See C.L. 340

Location:

CMT/HEAD

Files:

• ChangeLog (modified) (1 diff)
• source/cmt_parser.cxx (modified) (3 diffs)
• source/cmt_project.cxx (modified) (4 diffs)
• source/cmt_system.cxx (modified) (1 diff)
• source/cmt_system.h (modified) (1 diff)
• source/cmt_use.cxx (modified) (1 diff)

CMT/HEAD/ChangeLog

@@ +1 @@
+2008-01-25    <rybkin@lal.in2p3.fr> 340
+
+        * source/cmt_system.h: Improve the handling of symlinks in the paths
+        * source/cmt_system.cxx: idem
+        * source/cmt_use.cxx: idem
+        * source/cmt_project.cxx: idem
+        * source/cmt_parser.cxx: Comment out a duplicate piece of code
+        
 2008-01-18    <rybkin@lal.in2p3.fr> 339
 

CMT/HEAD/source/cmt_parser.cxx

@@ -923 +923 @@
               if (structuring_style == with_version_directory)
                 {
-                  cerr << "#CMT> warning: " << up_branch << " is not correct version syntax. Assuming it is package name" << endl;
+                  cerr << "#CMT> Warning: " << up_branch << " is not correct version syntax. Assuming it is package name" << endl;
                 }
               // No version descriptor
@@ -7589 +7589 @@
   cmt_string pwd = CmtSystem::pwd ();
 
+  /**
+   * This is already done in
+   void Cmt::configure_current_package ()
+
   if (CmtSystem::test_file ("../cmt/requirements")) Me.m_current_style = cmt_style;
   else if (CmtSystem::test_file ("../mgr/requirements")) Me.m_current_style = mgr_style;
@@ -7602 +7606 @@
       }
   }
+  */
 
   // Prepare computation of the best form for relative path from current directory

CMT/HEAD/source/cmt_project.cxx

@@ -268 +268 @@
   // Figure out if this is the current project
   //
-  if (here.find (pwd) == 0) is_current = true;
+  //  if (here.find (pwd) == 0) is_current = true;
+
+  // In case there are symlinks
+  cmt_string here_real, pwd_real;
+  if (CmtSystem::realpath_ (here, here_real) && CmtSystem::realpath_ (pwd, pwd_real))
+    {
+      if (here_real.find (pwd_real) == 0) is_current = true;
+    }
 
   cmt_string text;
@@ -782 +789 @@
   cmt_string here = CmtSystem::pwd ();
 
+  // In case there are symlinks
+  cmt_string here_real;
+  CmtSystem::realpath_ (here, here_real);
+
   static ProjectVector& Projects = projects ();
 
@@ -795 +806 @@
         }
 
-      if (here.find (p.m_cmtpath) == 0) 
+      // In case there are symlinks
+      //      if (here.find (p.m_cmtpath) == 0) 
+      cmt_string p_real;
+      CmtSystem::realpath_ (p.m_cmtpath, p_real);
+      if (here_real.find (p_real) == 0) 
         {
           result = &p;
@@ -1071 +1086 @@
       if (CmtSystem::test_directory (p))
         {
-          if (path.find (p) != cmt_string::npos)
-            {
-              return (p);
+//        if (path.find (p) != cmt_string::npos)
+//          {
+//            return (p);
+//          }
+
+          // In case there are symlinks
+          cmt_string p_real, path_real;
+          if (CmtSystem::realpath_ (p, p_real) && CmtSystem::realpath_ (path, path_real))
+            {
+              if (path_real.find (p_real) != cmt_string::npos) return (p);
             }
 

CMT/HEAD/source/cmt_system.cxx

@@ -252 +252 @@
       CmtSystem::cd (path);
       result = CmtSystem::pwd ();
+      CmtSystem::cd (here);
+      return true;
+    }
+  return false;
+}
+
+//--------------------------------------------------
+bool CmtSystem::realpath_ (const cmt_string& path, cmt_string& result)
+{
+  if  (test_directory(path))
+    {
+      cmt_string here = CmtSystem::pwd ();
+      CmtSystem::cd (path);
+      //
+      char buffer[256] = "";
+      char* ptr = 0;
+      ptr = getcwd (buffer, sizeof (buffer));
+      const char* t = &buffer[0];
+      result = t;
+      //      cerr << "realpath_> path: " << path << " result: " << result << endl;
+      //
       CmtSystem::cd (here);
       return true;

CMT/HEAD/source/cmt_system.h

@@ -40 +40 @@
   // Resolve symbolic links in a path.
   static bool realpath (const cmt_string& path, cmt_string& result);
+  // Currently the above does not resolve symbolic links in a path.
+  static bool realpath_ (const cmt_string& path, cmt_string& result);
 
   static void dirname (const cmt_string& file_name, cmt_string& result);

CMT/HEAD/source/cmt_use.cxx

@@ -2910 +2910 @@
       static const cmt_string fs = CmtSystem::file_separator ();
       
-      offset = real_path;
-      offset.replace (cmtpath, empty_string);
+      // In case there are symlinks
+      //      offset = real_path;
+      //      offset.replace (cmtpath, empty_string);
+      CmtSystem::realpath_ (real_path, offset);
+      cmt_string cmtpath_real;
+      CmtSystem::realpath_ (cmtpath, cmtpath_real);
+      offset.replace (cmtpath_real, empty_string);
 
       /**