Changeset 709

Timestamp:

Dec 20, 2006, 10:49:02 PM (17 years ago)

Author:

Jari Häkkinen

Message:

Addresses #1 and #80. Issues fixed, but bogus params to functions exists. cleanup needed.

Location:

trunk/yat/utility

Files:

• FileIO.cc (modified) (3 diffs)
• FileIO.h (modified) (3 diffs)

trunk/yat/utility/FileIO.cc

@@ -26 +26 @@
 #include "FileIO.h"
 
+#include <cerrno>
 #include <iostream>
+#include <string>
+
+#include <sys/stat.h>
 #include <unistd.h>
 
@@ -34 +38 @@
 namespace utility {
 
+
+  FileIO::FileIO(const std::string& path)
+    : no_file_(false), path_(path)
+  {
+    if ( stat(path_.c_str(),&stat_) && !(no_file_=(errno==ENOENT)) )
+        throw IO_error(std::string("stat(2) call failed with errno: "+errno));
+  }
+
+
   int FileIO::access_rights(const std::string& path,
-                            const std::string& bits) const {
-    if (int value=access(path.c_str(),F_OK)) {
-      std::cerr << "access_rights: File '" << path << "' does not exist."
-                << std::endl;
-      return value;
+                            const std::string& bits) const
+  {
+    std::string tryme=path_;
+    if (no_file_) {
+      std::string::size_type pos=path_.find_last_of('/');
+      tryme = ( (pos!=std::string::npos) ? path_.substr(0,pos) : "." );
     }
+
     int mode=0;
     for (u_int i=0; i<bits.length(); i++)
@@ -54 +69 @@
             break;
       }
-    return access(path.c_str(),mode);
+
+    return access(tryme.c_str(),mode);
+  }
+
+
+  bool FileIO::file_exists(const std::string& file) const
+  {
+    return !no_file_;
+  }
+
+
+  const std::string& FileIO::path(void) const
+  {
+    return path_;
   }
 

trunk/yat/utility/FileIO.h

@@ -27 +27 @@
 */
 
+#include "Exception.h"
+
 #include <string>
-
+#include <sys/stat.h>
 #include <unistd.h>
 
@@ -42 +44 @@
 
     ///
+    /// \brief Constructor
+    ///
+    /// \exception IO_error if underlying stat(2) call fails in other
+    /// ways than file does not exist.
+    ///
+    explicit FileIO(const std::string& path);
+
+    ///
+    /// @brief Check file/directory permissions
+    ///
     /// Check if access permissions match \a mode. \a mode must be
     /// given as r, w, x, or combinations of these letters.
+    ///
+    /// @note Checking permissions on a non-existent file will return
+    /// the permissions for the parent directory, but only the parent
+    /// directory. If the parent directory does not exist then fail is
+    /// returned.
     ///
     /// @return On success (all requested permissions granted), zero
@@ -50 +67 @@
     /// is returned, and errno is set appropriately.
     ///
-    /// @see access(2)
-    ///
-    /// @note Checking for write permissions will fail if the file
-    /// does not exists. This should be fixed so that when a file does
-    /// not exist, permissions to create the file should be returned.
-    ///
     int access_rights(const std::string& path,const std::string& bits) const;
 
     ///
-    /// Check whether \a file exists.
+    /// @brief Check whether \a file exists.
     ///
     /// @return True if \a file exists, false otherwise.
     ///
-    /// @see access(2)
+    bool file_exists(const std::string& file) const;
+
     ///
-    /// @todo Probably stat(2) should be used in favour of
-    /// access(2). Change the implementation.
+    /// @brief Get path associated with the object.
     ///
-    inline bool file_exists(const std::string& file) const
-      { return !access(file.c_str(),F_OK); }
+    const std::string& path(void) const;
+
+  private:
+    ///
+    /// \brief The copy constructor, not implemented
+    ///
+    FileIO(const FileIO&);
+
+    bool no_file_;
+    std::string path_;
+    struct stat stat_;
   };