Merge branch 'upstream-openssl' into restricted_routes

This commit is contained in:
Jeff Becker
2016-06-19 16:50:51 -04:00
parent 93deb37c94
commit 63c36e917e
44 changed files with 2523 additions and 148 deletions

11
FS.cpp
View File

@@ -54,10 +54,15 @@ namespace fs {
dataDir = (home != NULL && strlen(home) > 0) ? home : "";
dataDir += "/Library/Application Support/" + appName;
return;
#elif defined(ANDROID)
dataDir = "/sdcard/" + appName; // TODO: might not work for some devices
return;
#else /* other unix */
#if defined(ANDROID)
if (boost::filesystem::exists("/sdcard"))
{
dataDir = "/sdcard/" + appName;
return;
}
// otherwise use /data/files
#endif
char *home = getenv("HOME");
if (isService) {
dataDir = "/var/lib/" + appName;