Changeset 2212

Timestamp:

Mar 12, 2010, 4:30:35 AM (14 years ago)

Author:

Peter

Message:

fixes #617

Location:

branches/0.6-stable

Files:

• test/fileutil_test.cc (modified) (2 diffs)
• yat/utility/FileUtil.cc (modified) (2 diffs)

branches/0.6-stable/test/fileutil_test.cc

@@ -4 +4 @@
   Copyright (C) 2006 Jari Häkkinen
   Copyright (C) 2007, 2008 Jari Häkkinen, Peter Johansson
-  Copyright (C) 2009 Peter Johansson
+  Copyright (C) 2009, 2010 Peter Johansson
 
   This file is part of the yat library, http://dev.thep.lu.se/yat
@@ -180 +180 @@
   }
 
+  // checking permissions on non-existence file in `/'
+  try {
+    suite.err() << "FileUtil Test 7" << std::endl;
+     // intermediate dir must be unique!
+    utility::FileUtil file("/theplu_yat_fileutil_test.sdf34DSF");
+    if(!suite.add(file.permissions("r") == 0)) {
+      suite.err() << "  r permission failed on " << file.path() << std::endl;
+    }
+  }
+  catch (utility::IO_error e) {
+    suite.add(false);
+    suite.err() << e.what() << std::endl;
+  }
+
+
   return suite.return_value();
 }

branches/0.6-stable/yat/utility/FileUtil.cc

@@ -6 +6 @@
   Copyright (C) 2006 Jari Häkkinen
   Copyright (C) 2007, 2008 Jari Häkkinen, Peter Johansson
-  Copyright (C) 2009 Peter Johansson
+  Copyright (C) 2009, 2010 Peter Johansson
 
   This file is part of the yat library, http://dev.thep.lu.se/yat
@@ -66 +66 @@
     if (!exists()) {
       std::string::size_type pos=path_.find_last_of('/');
-      tryme = ( (pos!=std::string::npos) ? path_.substr(0,pos) : "." );
+      if (pos == std::string::npos)
+        tryme = ".";
+      else if (pos == 0)
+        tryme = "/";
+      else
+        tryme.resize(pos);
     }