Changeset 463 for CMT

Timestamp:

Jul 18, 2008, 4:17:43 PM (16 years ago)

Author:

rybkin

Message:

See C.L. 364

Location:

CMT/HEAD

Files:

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

CMT/HEAD/ChangeLog

@@ +1 @@
+2008-07-18    <rybkin@lal.in2p3.fr> 364
+        
+        * source/cmt_system.cxx: In the CmtSystem::compress_path function, add the
+        replacement of "/.." with "/" (one cannot walk down past the root), more
+        careful treatment of some boundary cases
+        * source/cmt_parser.cxx: Add 2 debug level messages in the function
+        Cmt::guess_current_project
+        
 2008-06-25    <rybkin@lal.in2p3.fr> 363
         

CMT/HEAD/source/cmt_parser.cxx

@@ -4565 +4565 @@
           if (!CmtSystem::cd (".."))
             {
+              log << "Cannot cd up..." << log_endl;
               break;
             }
@@ -4570 +4571 @@
           if (CmtSystem::pwd () == pwd)
             {
+              log << "Looks the same pwd..." << log_endl;
               break;
             }

CMT/HEAD/source/cmt_system.cxx

@@ -2138 +2138 @@
 //     xxxx does not contain any macro reference
 //
+// Also replace "/.." with "/". One cannot walk down past the root.
 //----------------------------------------------------------
 void CmtSystem::compress_path (cmt_string& dir)
@@ -2169 +2170 @@
   for (;;)
     {
+      int pos0 (0);
       int pos1;
       int pos2;
       int pos3;
 
-      pos1 = dir.find (pattern);
+      //pos1 = dir.find (pattern);
+      //if (pos1 == cmt_string::npos) break;
+
+      do
+        {
+          pos1 = dir.find (pos0, pattern);
+          if (pos1 == cmt_string::npos) break;
+          pos0 = pos1 + 3;
+        }
+      while (pos0 < dir.size () && dir[pos0] != file_separator ());
+
       if (pos1 == cmt_string::npos) break;
+
+      //
+      // One cannot walk down past the root: "/.." is the same as "/".
+      //
+#ifdef WIN32
+      if (pos1 == 0)
+        {
+          dir.erase (pos1, 3);
+          if (dir == "")
+            dir = file_separator ();
+          continue;
+        }
+      else if (pos1 == 2 && dir[1] == ':')
+        {
+          dir.erase (pos1, 3);
+          if (dir.size () == 2)
+            dir += file_separator ();
+          continue;
+        }
+#else
+      if (pos1 == 0)
+        {
+          dir.erase (pos1, 3);
+          if (dir == "")
+            dir = file_separator ();
+          continue;
+        }
+#endif
 
       //
@@ -2224 +2264 @@
             {
               dir.erase (pos2, pos1 + 3 - pos2);
+#ifdef WIN32
+              if (dir == "")
+                {
+                  dir = file_separator ();
+                }
+              else if (dir.size () == 2 && dir[1] == ':')
+                {
+                  dir += file_separator ();
+                }
+#else
+              if (dir == "")
+                dir = file_separator ();
+#endif
             }
           else