X-Git-Url: https://rtime.felk.cvut.cz/gitweb/l4.git/blobdiff_plain/72f8c5b742f7e0c579f3025c1e736ab5011c10ee..983fe7c4ac262f56d38a143b1efab1e4afb77a52:/l4/pkg/tmpfs/lib/src/fs.cc

diff --git a/l4/pkg/tmpfs/lib/src/fs.cc b/l4/pkg/tmpfs/lib/src/fs.cc
index 9fd893962..1e5383638 100644
--- a/l4/pkg/tmpfs/lib/src/fs.cc
+++ b/l4/pkg/tmpfs/lib/src/fs.cc
@@ -19,7 +19,6 @@
 
 #include <cstdio>
 
-
 namespace {
 
 using namespace L4Re::Vfs;
@@ -138,7 +137,7 @@ public:
   Pers_dir(const char *name, mode_t mode)
     : Node(name, (mode & 0777) | __S_IFDIR) {}
   Ref_ptr<Node> find_path(cxx::String);
-  int add_node(Ref_ptr<Node> const &);
+  bool add_node(Ref_ptr<Node> const &);
 
   typedef Tree::Const_iterator Const_iterator;
   Const_iterator begin() const { return _tree.begin(); }
@@ -150,10 +149,10 @@ Ref_ptr<Node> Pers_dir::find_path(cxx::String path)
   return cxx::ref_ptr(_tree.find_node(path));
 }
 
-int Pers_dir::add_node(Ref_ptr<Node> const &n)
+bool Pers_dir::add_node(Ref_ptr<Node> const &n)
 {
-  int e = _tree.insert(n.ptr()).second;
-  if (!e)
+  bool e = _tree.insert(n.ptr()).second;
+  if (e)
     n->add_ref();
   return e;
 }
@@ -181,41 +180,39 @@ private:
   Pers_dir::Const_iterator _getdents_iter;
 };
 
-class Tmpfs_file : public Be_file
+class Tmpfs_file : public Be_file_pos
 {
 public:
   explicit Tmpfs_file(Ref_ptr<Pers_file> const &f) throw()
-    : Be_file(), _file(f), _pos(0) {}
+    : Be_file_pos(), _file(f) {}
 
-  ssize_t readv(const struct iovec*, int iovcnt) throw();
-  ssize_t writev(const struct iovec*, int iovcnt) throw();
-  off64_t lseek64(off64_t, int) throw();
+  off64_t size() const throw();
   int fstat64(struct stat64 *buf) const throw();
   int ioctl(unsigned long, va_list) throw();
   int utime(const struct utimbuf *) throw();
   int fchmod(mode_t) throw();
 
 private:
+  ssize_t preadv(const struct iovec *v, int iovcnt, off64_t p) throw();
+  ssize_t pwritev(const struct iovec *v, int iovcnt, off64_t p) throw();
   Ref_ptr<Pers_file> _file;
-  off64_t _pos;
 };
 
-ssize_t Tmpfs_file::readv(const struct iovec *v, int iovcnt) throw()
+ssize_t Tmpfs_file::preadv(const struct iovec *v, int iovcnt, off64_t p) throw()
 {
   if (iovcnt < 0)
     return -EINVAL;
 
-
   ssize_t sum = 0;
   for (int i = 0; i < iovcnt; ++i)
     {
-      sum  += _file->data().get(_pos, v[i].iov_len, v[i].iov_base);
-      _pos += v[i].iov_len;
+      sum  += _file->data().get(p, v[i].iov_len, v[i].iov_base);
+      p += v[i].iov_len;
     }
   return sum;
 }
 
-ssize_t Tmpfs_file::writev(const struct iovec *v, int iovcnt) throw()
+ssize_t Tmpfs_file::pwritev(const struct iovec *v, int iovcnt, off64_t p) throw()
 {
   if (iovcnt < 0)
     return -EINVAL;
@@ -223,8 +220,8 @@ ssize_t Tmpfs_file::writev(const struct iovec *v, int iovcnt) throw()
   ssize_t sum = 0;
   for (int i = 0; i < iovcnt; ++i)
     {
-      sum  += _file->data().put(_pos, v[i].iov_len, v[i].iov_base);
-      _pos += v[i].iov_len;
+      sum  += _file->data().put(p, v[i].iov_len, v[i].iov_base);
+      p += v[i].iov_len;
     }
   return sum;
 }
@@ -236,21 +233,8 @@ int Tmpfs_file::fstat64(struct stat64 *buf) const throw()
   return 0;
 }
 
-off64_t Tmpfs_file::lseek64(off64_t offset, int whence) throw()
-{
-  switch (whence)
-    {
-    case SEEK_SET: _pos = offset; break;
-    case SEEK_CUR: _pos += offset; break;
-    case SEEK_END: _pos = _file->data().size() + offset; break;
-    default: return -EINVAL;
-    };
-
-  if (_pos < 0)
-    return -EINVAL;
-
-  return _pos;
-}
+off64_t Tmpfs_file::size() const throw()
+{ return _file->data().size(); }
 
 int
 Tmpfs_file::ioctl(unsigned long v, va_list args) throw()
@@ -259,7 +243,7 @@ Tmpfs_file::ioctl(unsigned long v, va_list args) throw()
     {
     case FIONREAD: // return amount of data still available
       int *available = va_arg(args, int *);
-      *available = _file->data().size() - _pos;
+      *available = _file->data().size() - pos();
       return 0;
     };
   return -EINVAL;
@@ -306,9 +290,9 @@ Tmpfs_dir::get_entry(const char *name, int flags, mode_t mode,
     {
       Ref_ptr<Node> node(new Pers_file(n.start(), mode));
       // when ENOENT is return, path is always a directory
-      int e = cxx::ref_ptr_static_cast<Pers_dir>(path)->add_node(node);
-      if (e)
-        return e;
+      bool e = cxx::ref_ptr_static_cast<Pers_dir>(path)->add_node(node);
+      if (!e)
+        return -ENOMEM;
       path = node;
     }
 
@@ -348,6 +332,7 @@ Tmpfs_dir::getdents(char *buf, size_t sz) throw()
         l = sizeof(d->d_name);
 
       unsigned n = offsetof (struct dirent64, d_name) + l;
+      n = (n + sizeof(long) - 1) & ~(sizeof(long) - 1);
 
       if (n > sz)
         break;
@@ -397,8 +382,20 @@ Tmpfs_dir::walk_path(cxx::String const &_s,
 
   while (1)
     {
+      if (s.len() == 0)
+        {
+          *ret = p;
+          return 0;
+        }
+
       cxx::String::Index sep = s.find("/");
 
+      if (sep - s.start() == 1 && *s.start() == '.')
+        {
+          s = s.substr(s.start() + 2);
+          continue;
+        }
+
       n = p->find_path(s.head(sep - s.start()));
 
       if (!n)
@@ -436,6 +433,16 @@ Tmpfs_dir::mkdir(const char *name, mode_t mode) throw()
   cxx::String p = cxx::String(name);
   cxx::String path, last = p;
   cxx::String::Index s = p.rfind("/");
+
+  // trim /'s at the end
+  while (p.len() && s == p.end() - 1)
+    {
+      p.len(p.len() - 1);
+      s = p.rfind("/");
+    }
+
+  //printf("MKDIR '%s' p=%p %p\n", name, p.start(), s);
+
   if (s != p.end())
     {
       path = p.head(s);
@@ -449,10 +456,14 @@ Tmpfs_dir::mkdir(const char *name, mode_t mode) throw()
   if (!node->is_dir())
     return -ENOTDIR;
 
+  // due to path walking we can end up with an empty name
+  if (p.len() == 0 || p == cxx::String("."))
+    return 0;
+
   Ref_ptr<Pers_dir> dnode = cxx::ref_ptr_static_cast<Pers_dir>(node);
 
   Ref_ptr<Pers_dir> dir(new Pers_dir(last.start(), mode));
-  return dnode->add_node(dir);
+  return dnode->add_node(dir) ? 0 : -EEXIST;
 }
 
 int
@@ -494,6 +505,6 @@ public:
   }
 };
 
-static Tmpfs_fs _tmpfs;
+static Tmpfs_fs _tmpfs L4RE_VFS_FILE_SYSTEM_ATTRIBUTE;
 
 }