diff options
author | Johannes Schickel | 2016-01-29 20:09:29 +0100 |
---|---|---|
committer | Johannes Schickel | 2016-02-02 09:16:40 +0100 |
commit | 2622cded72c93f02b9852e77556279a6bc8e5094 (patch) | |
tree | f38a18dcfb7ac181e6c312924a0511dbc14b8714 /backends/fs | |
parent | dde89c36f53558c64c5fce2c87850028b89ca45d (diff) | |
download | scummvm-rg350-2622cded72c93f02b9852e77556279a6bc8e5094.tar.gz scummvm-rg350-2622cded72c93f02b9852e77556279a6bc8e5094.tar.bz2 scummvm-rg350-2622cded72c93f02b9852e77556279a6bc8e5094.zip |
POSIX: Move assureDirectoryExists to posix-fs{.h,.cpp}.
Diffstat (limited to 'backends/fs')
-rw-r--r-- | backends/fs/posix/posix-fs.cpp | 64 | ||||
-rw-r--r-- | backends/fs/posix/posix-fs.h | 14 |
2 files changed, 78 insertions, 0 deletions
diff --git a/backends/fs/posix/posix-fs.cpp b/backends/fs/posix/posix-fs.cpp index 4baf9f14fe..1a6c4e40a5 100644 --- a/backends/fs/posix/posix-fs.cpp +++ b/backends/fs/posix/posix-fs.cpp @@ -38,6 +38,7 @@ #include <sys/stat.h> #include <dirent.h> #include <stdio.h> +#include <errno.h> #ifdef __OS2__ #define INCL_DOS @@ -251,4 +252,67 @@ Common::WriteStream *POSIXFilesystemNode::createWriteStream() { return StdioStream::makeFromPath(getPath(), true); } +namespace Posix { + +bool assureDirectoryExists(const Common::String &dir, const char *prefix) { + struct stat sb; + + // Check whether the prefix exists if one is supplied. + if (prefix) { + if (stat(prefix, &sb) != 0) { + return false; + } else if (!S_ISDIR(sb.st_mode)) { + return false; + } + } + + // Obtain absolute path. + Common::String path; + if (prefix) { + path = prefix; + path += '/'; + path += dir; + } else { + path = dir; + } + + path = Common::normalizePath(path, '/'); + + const Common::String::iterator end = path.end(); + Common::String::iterator cur = path.begin(); + if (*cur == '/') + ++cur; + + do { + if (cur + 1 != end) { + if (*cur != '/') { + continue; + } + + // It is kind of ugly and against the purpose of Common::String to + // insert 0s inside, but this is just for a local string and + // simplifies the code a lot. + *cur = '\0'; + } + + if (mkdir(path.c_str(), 0755) != 0) { + if (errno == EEXIST) { + if (stat(path.c_str(), &sb) != 0) { + return false; + } else if (!S_ISDIR(sb.st_mode)) { + return false; + } + } else { + return false; + } + } + + *cur = '/'; + } while (cur++ != end); + + return true; +} + +} // End of namespace Posix + #endif //#if defined(POSIX) diff --git a/backends/fs/posix/posix-fs.h b/backends/fs/posix/posix-fs.h index bd07749010..0703ac5bf5 100644 --- a/backends/fs/posix/posix-fs.h +++ b/backends/fs/posix/posix-fs.h @@ -81,4 +81,18 @@ private: virtual void setFlags(); }; +namespace Posix { + +/** + * Assure that a directory path exists. + * + * @param dir The path which is required to exist. + * @param prefix An (optional) prefix which should not be created if non existent. + * prefix is prepended to dir if supplied. + * @return true in case the directoy exists (or was created), false otherwise. + */ +bool assureDirectoryExists(const Common::String &dir, const char *prefix = nullptr); + +} // End of namespace Posix + #endif |