From ae348f111bfb691046b3a439c889e460234690ca Mon Sep 17 00:00:00 2001 From: Jack Andersen Date: Thu, 29 Sep 2016 17:32:24 -1000 Subject: [PATCH] use of reliable constant rather then iffy macro --- hecl/extern/athena | 2 +- hecl/extern/boo | 2 +- hecl/lib/hecl.cpp | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/hecl/extern/athena b/hecl/extern/athena index a2d040aeb..507438153 160000 --- a/hecl/extern/athena +++ b/hecl/extern/athena @@ -1 +1 @@ -Subproject commit a2d040aeb4c70ad7b62eaa1669bc5cff94710eed +Subproject commit 5074381533f48734d1dd4e887d7185e021e589a9 diff --git a/hecl/extern/boo b/hecl/extern/boo index 9b0355be4..fe9b47568 160000 --- a/hecl/extern/boo +++ b/hecl/extern/boo @@ -1 +1 @@ -Subproject commit 9b0355be45b341e2cd77945eaa24c783e0b96c8b +Subproject commit fe9b47568119ad39f858a6fff6c41f8506260a32 diff --git a/hecl/lib/hecl.cpp b/hecl/lib/hecl.cpp index a33b78063..d2ad43971 100644 --- a/hecl/lib/hecl.cpp +++ b/hecl/lib/hecl.cpp @@ -505,7 +505,7 @@ std::vector> GetSystemLocations() { hecl::Sstat theStat; const char* home = getenv("HOME"); - + if (home) { ret.push_back(NameFromPath(home)); @@ -514,7 +514,7 @@ std::vector> GetSystemLocations() if (!hecl::Stat(desktop.c_str(), &theStat)) ret.push_back(NameFromPath(desktop)); } - + /* Get mounted volumes better method OSX 10.6 and higher, see: */ /*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 */ @@ -525,13 +525,13 @@ std::vector> GetSystemLocations() while (result != kCFURLEnumeratorEnd) { - char defPath[MAXPATHLEN]; + char defPath[1024]; result = CFURLEnumeratorGetNextURL(volEnum, &cfURL, NULL); if (result != kCFURLEnumeratorSuccess) continue; - CFURLGetFileSystemRepresentation(cfURL, false, (UInt8 *)defPath, MAXPATHLEN); + CFURLGetFileSystemRepresentation(cfURL, false, (UInt8 *)defPath, 1024); ret.push_back(NameFromPath(defPath)); }