Changeset 1425

Timestamp:

Dec 16, 2011, 5:06:18 AM (11 years ago)

Author:

Peter Johansson

Message:

use posix functions ​http://linux.die.net/man/3/basename

File:

• trunk/lib/utility.cc (modified) (3 diffs)

trunk/lib/utility.cc

@@ -41 +41 @@
 
 #include <iostream>
+
+#include <libgen.h>
 
 namespace theplu{
@@ -117 +119 @@
   std::string directory_name(std::string path)
   {
-    size_t pos = path.find_last_of("/");
-    if (pos==std::string::npos)
-      return ".";
-    if (pos==path.size()-1)
-      return directory_name(path.substr(0,path.size()-2));
-    return path.substr(0,pos+1);
+    return dirname(path.c_str());
   }
 
@@ -128 +125 @@
   std::string file_name(const std::string& full_path)
   {
-    if (full_path.size()<2)
-      return full_path;
-    // exclude last char from search
-    size_t pos = full_path.find_last_of('/', full_path.size()-2);
-    if (pos==std::string::npos)
-      return full_path;
-    return full_path.substr(pos+1);
+    return basename(full_path.c_str());
   }