Merge pull request #19 from ksqsf/master

Add methods to query the directory itself

Author: tailhook

src/dir.rs

@@ -8,7 +8,7 @@ use std::path::{PathBuf};
 
 use libc;
 use metadata::{self, Metadata};
-use list::{DirIter, open_dir};
+use list::{DirIter, open_dir, open_dirfd};
 
 use {Dir, AsPath};
 
@@ -50,11 +50,18 @@ impl Dir {
 
     /// List subdirectory of this dir
     ///
-    /// You can list directory itself if `"."` is specified as path.
+    /// You can list directory itself with `list_self`.
     pub fn list_dir<P: AsPath>(&self, path: P) -> io::Result<DirIter> {
         open_dir(self, to_cstr(path)?.as_ref())
     }
 
+    /// List this dir
+    pub fn list_self(&self) -> io::Result<DirIter> {
+        unsafe {
+            open_dirfd(libc::dup(self.0))
+        }
+    }
+
     /// Open subdirectory
     pub fn sub_dir<P: AsPath>(&self, path: P) -> io::Result<Dir> {
         self._sub_dir(to_cstr(path)?.as_ref())
@@ -378,6 +385,18 @@ impl Dir {
         }
     }
 
+    /// Returns the metadata of the directory itself.
+    pub fn self_metadata(&self) -> io::Result<Metadata> {
+        unsafe {
+            let mut stat = mem::zeroed();
+            let res = libc::fstat(self.0, &mut stat);
+            if res < 0 {
+                Err(io::Error::last_os_error())
+            } else {
+                Ok(metadata::new(stat))
+            }
+        }
+    }
 }
 
 /// Rename (move) a file between directories

src/list.rs

@@ -66,19 +66,23 @@ impl DirIter {
     }
 }
 
+pub fn open_dirfd(fd: libc::c_int) -> io::Result<DirIter> {
+    let dir = unsafe { libc::fdopendir(fd) };
+    if dir == std::ptr::null_mut() {
+        Err(io::Error::last_os_error())
+    } else {
+        Ok(DirIter { dir: dir })
+    }
+}
+
 pub fn open_dir(dir: &Dir, path: &CStr) -> io::Result<DirIter> {
     let dir_fd = unsafe {
         libc::openat(dir.0, path.as_ptr(), libc::O_DIRECTORY|libc::O_CLOEXEC)
     };
     if dir_fd < 0 {
         Err(io::Error::last_os_error())
     } else {
-        let dir = unsafe { libc::fdopendir(dir_fd) };
-        if dir == ptr::null_mut() {
-            Err(io::Error::last_os_error())
-        } else {
-            Ok(DirIter { dir: dir })
-        }
+        open_dirfd(dir_fd)
     }
 }