diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2020-01-22 14:09:54 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-22 14:09:54 +0100 |
| commit | b377bf12580cf0fdd81b0c1ef15ef696e59ffb12 (patch) | |
| tree | 9ea8f0ca5156c41aae7f53113a55b209d1ba3ac4 /src/filemanager.cpp | |
| parent | a95431d8666db9953115a3a824db396f8aa82b52 (diff) | |
| parent | bc31bda210a35e4c584b31e75dad259caed551fb (diff) | |
| download | PROJ-rfc4_dev.tar.gz PROJ-rfc4_dev.zip | |
Merge pull request #1857 from rouault/rfc4_doc_improvementsrfc4_dev
[RFC4_dev] Doc improvements
Diffstat (limited to 'src/filemanager.cpp')
| -rw-r--r-- | src/filemanager.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/filemanager.cpp b/src/filemanager.cpp index 592bada4..005e734b 100644 --- a/src/filemanager.cpp +++ b/src/filemanager.cpp @@ -1156,7 +1156,7 @@ std::string pj_context_get_user_writable_directory(PJ_CONTEXT *ctx, const char *home = getenv("HOME"); if (home) { #if defined(__MACH__) && defined(__APPLE__) - path = std::string(home) + "/Library/Logs"; + path = std::string(home) + "/Library/Application Support"; #else path = std::string(home) + "/.local/share"; #endif @@ -1258,13 +1258,11 @@ static const char *proj_lib_name = nullptr; #endif -static bool ignoreUserWritableDirectory() { +static bool dontReadUserWritableDirectory() { // Env var mostly for testing purposes and being independent from // an existing installation - const char *envVarIgnoreUserWritableDirectory = - getenv("PROJ_IGNORE_USER_WRITABLE_DIRECTORY"); - return envVarIgnoreUserWritableDirectory != nullptr && - envVarIgnoreUserWritableDirectory[0] != '\0'; + const char *envVar = getenv("PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY"); + return envVar != nullptr && envVar[0] != '\0'; } static void * @@ -1336,7 +1334,7 @@ pj_open_lib_internal(projCtx ctx, const char *name, const char *mode, } } - else if (!ignoreUserWritableDirectory() && + else if (!dontReadUserWritableDirectory() && (fid = open_file( ctx, (pj_context_get_user_writable_directory(ctx, false) + DIR_CHAR + name) |