added castledoor background, worked on door entry level, added small clover to doodads

[supertux.git] / src / file_system.cpp

diff --git a/src/file_system.cpp b/src/file_system.cpp
index 4989540..826d4b7 100644 (file)
--- a/src/file_system.cpp
+++ b/src/file_system.cpp
@@ -3,6 +3,9 @@
 #include "file_system.hpp"
 
 #include <string>
+#include <vector>
+#include <iostream>
+#include <sstream>
 
 namespace FileSystem
 {
@@ -25,5 +28,55 @@ std::string basename(const std::string& filename)
   return filename.substr(p, filename.size()-p);
 }
 
+std::string normalize(const std::string& filename)
+{
+  std::vector<std::string> path_stack;
+
+  const char* p = filename.c_str();
+
+  while(true) {
+    while(*p == '/') {
+      p++;
+      continue;
+    }
+
+    const char* pstart = p;
+    while(*p != '/' && *p != 0) {
+      ++p;
+    }
+
+    size_t len = p - pstart;
+    if(len == 0)
+      break;
+    
+    std::string pathelem(pstart, p-pstart);
+    if(pathelem == ".")
+      continue;
+    
+    if(pathelem == "..") {
+      if(path_stack.empty()) {
+        std::cout << "Invalid '..' in path '" << filename << "'.\n";
+        // push it into the result path so that the users sees his error...
+        path_stack.push_back(pathelem);
+      } else {
+        path_stack.pop_back();
+      }
+    } else {
+      path_stack.push_back(pathelem);
+    }
+  }
+
+  // construct path
+  std::ostringstream result;
+  for(std::vector<std::string>::iterator i = path_stack.begin();
+      i != path_stack.end(); ++i) {
+    result << '/' << *i;
+  }
+  if(path_stack.empty())
+    result << '/';
+
+  return result.str();
+}
+
 }