AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/AxioDL/hecl

This commit is contained in:
Jack Andersen 2016-09-30 12:41:28 -10:00
parent 835976be56 02e74ab68e
commit 45794700f8
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hecl/extern/athena vendored

@ -1 +1 @@
Subproject commit a2d040aeb4c70ad7b62eaa1669bc5cff94710eed Subproject commit 5074381533f48734d1dd4e887d7185e021e589a9

8
hecl/lib/hecl.cpp
View File

@ -505,7 +505,7 @@ std::vector<std::pair<hecl::SystemString, std::string>> GetSystemLocations()
{ {
hecl::Sstat theStat; hecl::Sstat theStat;
const char* home = getenv("HOME"); const char* home = getenv("HOME");
if (home) if (home)
{ {
ret.push_back(NameFromPath(home)); ret.push_back(NameFromPath(home));
@ -514,7 +514,7 @@ std::vector<std::pair<hecl::SystemString, std::string>> GetSystemLocations()
if (!hecl::Stat(desktop.c_str(), &theStat)) if (!hecl::Stat(desktop.c_str(), &theStat))
ret.push_back(NameFromPath(desktop)); ret.push_back(NameFromPath(desktop));
} }
/* Get mounted volumes better method OSX 10.6 and higher, see: */ /* Get mounted volumes better method OSX 10.6 and higher, see: */
/*https://developer.apple.com/library/mac/#documentation/CoreFOundation/Reference/CFURLRef/Reference/reference.html*/ /*https://developer.apple.com/library/mac/#documentation/CoreFOundation/Reference/CFURLRef/Reference/reference.html*/
/* we get all volumes sorted including network and do not relay on user-defined finder visibility, less confusing */ /* we get all volumes sorted including network and do not relay on user-defined finder visibility, less confusing */
@ -525,13 +525,13 @@ std::vector<std::pair<hecl::SystemString, std::string>> GetSystemLocations()
while (result != kCFURLEnumeratorEnd) while (result != kCFURLEnumeratorEnd)
{ {
char defPath[MAXPATHLEN]; char defPath[1024];
result = CFURLEnumeratorGetNextURL(volEnum, &cfURL, NULL); result = CFURLEnumeratorGetNextURL(volEnum, &cfURL, NULL);
if (result != kCFURLEnumeratorSuccess) if (result != kCFURLEnumeratorSuccess)
continue; continue;
CFURLGetFileSystemRepresentation(cfURL, false, (UInt8 *)defPath, MAXPATHLEN); CFURLGetFileSystemRepresentation(cfURL, false, (UInt8 *)defPath, 1024);
ret.push_back(NameFromPath(defPath)); ret.push_back(NameFromPath(defPath));
} }