Changeset 117 for trunk/bin/Parameter.cc

Timestamp:

Jun 30, 2006, 2:46:22 PM (17 years ago)

Author:

Peter Johansson

Message:

fixed bug with root and target

File:

• trunk/bin/Parameter.cc (modified) (2 diffs)

trunk/bin/Parameter.cc

@@ -85 +85 @@
   {
 
+    // making root absolute
+    std::string workdir(pwd());
+    chdir(root_.c_str());
+    root_ = pwd();
+    // remove trailing '/'
+    if (*root_.rbegin()=='/')
+      root_.erase(root_.begin()+root_.size()-1);
+    chdir(workdir.c_str());
+
+    // making targetdir absolute
+    chdir(targetdir_.c_str());
+    targetdir_ = pwd();
+    // remove trailing '/'
+    if (*targetdir_.rbegin()=='/')
+      root_.erase(targetdir_.begin()+targetdir_.size()-1);
+    chdir(workdir.c_str());
+
     struct stat buf;
     // check that root directory exists
@@ -95 +112 @@
                                ": No such directory.");
     }
-      
-    // making root absolute
-    std::string workdir(pwd());
-    chdir(root_.c_str());
-    root_ = pwd();
-    // remove trailing '/'
-    if (*root_.rbegin()=='/')
-      root_.erase(root_.begin()+root_.size()-1);
-
-    // making targetdir absolute
-    chdir(targetdir_.c_str());
-    targetdir_ = pwd();
-    // remove trailing '/'
-    if (*targetdir_.rbegin()=='/')
-      root_.erase(targetdir_.begin()+targetdir_.size()-1);
-
-    chdir(workdir.c_str());
 
   }