Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-10-07 09:25:34 +03:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

POSIX implementation for valid filename/path character functions

Browse Source
This commit is contained in:
Vas Crabb 2016-07-07 16:50:39 +10:00
parent 630e7a2e98
commit 2c3fdc5221
1 changed files with 50 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/osd/modules/file/posixfile.cpp
View File

@ -39,6 +39,7 @@
// MAME headers // MAME headers
#include "posixfile.h" #include "posixfile.h"
#include "unicode.h"
#include <cassert> #include <cassert>
#include <cerrno> #include <cerrno>
@ -66,7 +67,6 @@ constexpr char PATHSEPCH = '\\';
constexpr char INVPATHSEPCH = '/'; constexpr char INVPATHSEPCH = '/';
#else #else
constexpr char PATHSEPCH = '/'; constexpr char PATHSEPCH = '/';
constexpr char INVPATHSEPCH = '\\';
#endif #endif
@ -164,7 +164,11 @@ private:
bool is_path_separator(char c) bool is_path_separator(char c)
{ {
#if defined(WIN32)
return (c == PATHSEPCH) || (c == INVPATHSEPCH); return (c == PATHSEPCH) || (c == INVPATHSEPCH);
#else
return c == PATHSEPCH;
#endif
} }
@ -176,7 +180,7 @@ osd_file::error create_path_recursive(std::string const &path)
{ {
// if there's still a separator, and it's not the root, nuke it and recurse // if there's still a separator, and it's not the root, nuke it and recurse
auto const sep = path.rfind(PATHSEPCH); auto const sep = path.rfind(PATHSEPCH);
if ((sep != std::string::npos) && (sep > 0) && (path[sep] != ':') && (path[sep - 1] != PATHSEPCH)) if ((sep != std::string::npos) && (sep > 0) && (path[sep - 1] != PATHSEPCH))
{ {
osd_file::error const err = create_path_recursive(path.substr(0, sep)); osd_file::error const err = create_path_recursive(path.substr(0, sep));
if (err != osd_file::error::NONE) if (err != osd_file::error::NONE)
@ -235,8 +239,10 @@ osd_file::error osd_file::open(std::string const &path, std::uint32_t openflags,
// convert the path into something compatible // convert the path into something compatible
dst = path; dst = path;
#if defined(WIN32)
for (auto it = dst.begin(); it != dst.end(); ++it) for (auto it = dst.begin(); it != dst.end(); ++it)
*it = (INVPATHSEPCH == *it) ? PATHSEPCH : *it; *it = (INVPATHSEPCH == *it) ? PATHSEPCH : *it;
#endif
osd_subst_env(dst, dst); osd_subst_env(dst, dst);
// attempt to open the file // attempt to open the file
@ -461,7 +467,48 @@ const char *osd_get_volume_name(int idx)
return "/"; return "/";
else else
return nullptr; return nullptr;
} }
//============================================================
// osd_is_valid_filename_char
//============================================================
bool osd_is_valid_filename_char(unicode_char uchar)
{
// The only one that's actually invalid is the slash
// The other two are just problematic because they're the escape character and path separator
return osd_is_valid_filepath_char(uchar)
#if defined(WIN32)
&& uchar != PATHSEPCH
&& uchar != INVPATHSEPCH
#else
&& uchar != PATHSEPCH
&& uchar != '\\'
#endif
&& uchar != ':';
}
//============================================================
// osd_is_valid_filepath_char
//============================================================
bool osd_is_valid_filepath_char(unicode_char uchar)
{
// One could argue that colon should be in here too because it functions as path separator
return uchar >= 0x20
&& !(uchar >= '\x7F' && uchar <= '\x9F')
#if defined(WIN32)
&& uchar != '<'
&& uchar != '>'
&& uchar != '\"'
&& uchar != '|'
&& uchar != '?'
&& uchar != '*'
#endif
&& uchar_isvalid(uchar);
}
//============================================================ //============================================================