thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

COMMON: conflate : and / in mac names.

Browse source 
When using mounted images on OSX or with fusehfs : and / are swapped.
When using dumper-companion it encodes / in punycode and preserves it.
This commit is contained in:
Vladimir Serbinenko 2022-12-09 06:14:03 +01:00
parent 78b6e60057
commit 4a2e69f990
2 changed files with 22 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

24
common/path.cpp
View file

@ -208,6 +208,24 @@ Path Path::punycodeDecode() const {
return Path(res, DIR_SEPARATOR); return Path(res, DIR_SEPARATOR);
} }
String Path::getIdentifierString() const {
StringTokenizer tok(rawString(), String(DIR_SEPARATOR));
String res;
while (!tok.empty()) {
String part = punycode_decodefilename(tok.nextToken());
for (uint i = 0; i < part.size(); i++)
if (part[i] == '/')
res += ':';
else
res += part[i];
if (!tok.empty())
res += DIR_SEPARATOR;
}
return res;
}
Path Path::punycodeEncode() const { Path Path::punycodeEncode() const {
StringTokenizer tok(rawString(), String(DIR_SEPARATOR)); StringTokenizer tok(rawString(), String(DIR_SEPARATOR));
String res; String res;
@ -230,15 +248,15 @@ bool Path::matchPattern(const Path& pattern) const {
// Prevent wildcards from matching the directory separator. // Prevent wildcards from matching the directory separator.
const char wildcardExclusions[] = { DIR_SEPARATOR, '\0' }; const char wildcardExclusions[] = { DIR_SEPARATOR, '\0' };
return punycodeDecode()._str.matchString(pattern.punycodeDecode()._str, true, wildcardExclusions); return getIdentifierString().matchString(pattern.getIdentifierString(), true, wildcardExclusions);
} }
bool Path::IgnoreCaseAndMac_EqualsTo::operator()(const Path& x, const Path& y) const { bool Path::IgnoreCaseAndMac_EqualsTo::operator()(const Path& x, const Path& y) const {
return x.punycodeDecode()._str.equalsIgnoreCase(y.punycodeDecode()._str); return x.getIdentifierString().equalsIgnoreCase(y.getIdentifierString());
} }
uint Path::IgnoreCaseAndMac_Hash::operator()(const Path& x) const { uint Path::IgnoreCaseAndMac_Hash::operator()(const Path& x) const {
return hashit_lower(x.punycodeDecode()._str.c_str()); return hashit_lower(x.getIdentifierString().c_str());
} }
} // End of namespace Common } // End of namespace Common

1
common/path.h
View file

@ -51,6 +51,7 @@ class Path {
private: private:
String _str; String _str;
String getIdentifierString() const;
public: public:
/** /**
* Hash and comparator for Path with following changes: * Hash and comparator for Path with following changes: